From patchwork Fri Nov 4 04:52:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Foster X-Patchwork-Id: 13031311 X-Patchwork-Delegate: kuba@kernel.org Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC5F7C433FE for ; Fri, 4 Nov 2022 04:52:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231222AbiKDEwm (ORCPT ); Fri, 4 Nov 2022 00:52:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60810 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231134AbiKDEwf (ORCPT ); Fri, 4 Nov 2022 00:52:35 -0400 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2121.outbound.protection.outlook.com [40.107.244.121]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B000C27CF6; Thu, 3 Nov 2022 21:52:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JfzDJTF9mQVQ+D7XFdZl2Zct0VIQlvubQ4mnYwFfDxv4HLvfrnCvGJD5mnpXogmJggRcle0E/gHvm9MnrnHxHmu3LVTTMDay9i4D7OlOqc5PpwEXRXAgKKQy+f2ZUBVPydzqP1rxaFuJEDG/DrwnHduRsyO9yYpqnQeZEMz1d3g9hMmxzYhxTVnDmwcmk5Vn8HtfXxiVSUfYfjlAhkUZ7iygNGG2ghZJTEximmTMeZIdv9RvMirDPinHX68kcpqVd1dpp2LGF/H1WJQpsn6qEXt7WrJdStzWQxDb30hkTdMA0XaUl/iYI/+1Q7MoFPz4WZcMugz4NBrKtAI5G60w3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YficV6/27d5Ko/XmkrRhmfOs6plp6V0bvdu4M23diZ8=; b=WrVbnDqjLYsp9pcpAQv/RoYYTfJQAVSxrmgmBvOncewrdelxMhponuWPy4rxOzsJ2lQ1OnRng90fMzRjSv4NxnSWhk2XDEOqfMjidBmwZVtNhviQpbxYLpODmkmAvrpp8vJM7hfNDtCm9Y4+iuJ0OAHD/OgxgcyS8BNADLaia6WR/2LBrDfWHLl46pYALx+Okgejui2iKYsH6z1idwM7u/c3NzQUdVLGtpUhSfagMJ9URajSdVLOngE/ByvRpldtNOVP9LvJl0TwWiRrNnMBREv3gkQvRzDS9JD9VN76n/guM9nK6EsdNKwBN9XvARr2JXy7FaWeJqw1Dc9Qom8+yA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=in-advantage.com; dmarc=pass action=none header.from=in-advantage.com; dkim=pass header.d=in-advantage.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inadvantage.onmicrosoft.com; s=selector2-inadvantage-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=YficV6/27d5Ko/XmkrRhmfOs6plp6V0bvdu4M23diZ8=; b=HDJvP7y18AoUrnj9RIkV+M99vm4hlTLBO7aORUHFigm/dXEsmuDU91FLRfQavd4dWo/1qPN2ZjOodAp1wmYTPInr7E5209pyyhIx5GtBCZ3O89loWr5AJm1Oi+wyRSLlAQtOqSg7oMIFglIn+DynNpyflKSXbvxJEjsOnfwfKaE= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=in-advantage.com; Received: from MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) by CY5PR10MB5986.namprd10.prod.outlook.com (2603:10b6:930:2a::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5769.22; Fri, 4 Nov 2022 04:52:26 +0000 Received: from MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::a8ed:4de9:679e:9d36]) by MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::a8ed:4de9:679e:9d36%4]) with mapi id 15.20.5769.021; Fri, 4 Nov 2022 04:52:25 +0000 From: Colin Foster To: linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Alexandre Belloni , Claudiu Manoil , John Crispin , Sean Wang , DENG Qingfang , Landen Chao , =?utf-8?b?bsOnIMOcTkFM?= , Matthias Brugger , Paolo Abeni , Jakub Kicinski , Eric Dumazet , "David S. Miller" , Vladimir Oltean , Florian Fainelli , Vivien Didelot , Andrew Lunn , Krzysztof Kozlowski , Rob Herring Subject: [PATCH v2 net-next 6/6] dt-bindings: net: mscc,vsc7514-switch: utilize generic ethernet-switch.yaml Date: Thu, 3 Nov 2022 21:52:04 -0700 Message-Id: <20221104045204.746124-7-colin.foster@in-advantage.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221104045204.746124-1-colin.foster@in-advantage.com> References: <20221104045204.746124-1-colin.foster@in-advantage.com> X-ClientProxiedBy: BY3PR03CA0023.namprd03.prod.outlook.com (2603:10b6:a03:39a::28) To MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2351:EE_|CY5PR10MB5986:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b34eb9f-ca8d-42a6-3229-08dabe205e38 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: whJjC17Ox+ik38k32m4wwHBJyVnZNchI2Th9HiF7//QOOKsfnDeOWc2cEeIUtGSEjTX+ShibvFnFHHQ3kvOU2NST+NFhxqFZMrsnzrE5obalDZi/Ldbtj9nFcN/RMbc1VkbSOlp8hvvZAT8Dj4jaL57rQzPwOIZYhiY+O8eSHzKpOSc82JjA0JQ/xUP8em3Tq+Tbl2/zA5GfG3nBE9hipq775ZrkkeA8wV0xAmgQ8jIGFnKnGxOvqRRMKf/V2r8LCS3qMNE0Sob9taxLvWCBdj6AlKbgGNvnXvX//8aShC0+s9CzXr2nt82yUytWsF+4cS2jXFQ9GNJ7rDo33N4s3rHYlCQcQaGhDr8XCfY8sf3lXgLE5teAdGOsxh44Qzvvyxr9suNIgz9qYULZ/JCvQum19ABhAwKbDlVrbEb5qoAQF1nYtawueP2QGu7SF9MwP5zro+dTivHsnm/v1xDwXM6rw0WbPbzjiLRArk/Xi5JTY8lKHt+gZqT3XW5GG5vNk2qmTLWjYCCU5SxOh4rm5QZr6u5HZBtqk8VMIGwgW3Ijl604tRQ58YWmnzYcg07FB8+Thkw9EjNdLImepG7p/79QzCoE1gnBlz84zzPTPvRoNpuZzqPw3Csge2ebM6IIX2YWXoY5/N2/btuPJiP4mu4CXcmK0UEMtEIg6MJ+CoIBe8IjFoiqDWD9N4VqkWcWpMUxoruRlAtx21/BMTSV7SR81IA1Kal+qz9SWfQkTyozn3q822RQIEa/Q55oRSGnCH8eQRNh19yw/D9crfUwqN80NfAKoJY4JGvnav1bVMk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1001MB2351.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(376002)(346002)(396003)(136003)(39840400004)(366004)(451199015)(86362001)(36756003)(316002)(38350700002)(38100700002)(6666004)(8676002)(2616005)(6506007)(66946007)(478600001)(54906003)(52116002)(66476007)(44832011)(6486002)(2906002)(5660300002)(7416002)(186003)(8936002)(4326008)(6512007)(83380400001)(1076003)(66556008)(26005)(41300700001)(41533002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: T1p9KNxSGFjOkCKYz0LnIiO9oORwPtytYSGNFDjRQUFc3/Fz2X0apV0GYKiJViqQvembxLwsW1t73kipYPrk6PjR3MTKD/fDksDT21ilSDwhj2YGOAVVDq3J7QaFONG9RDn8hn4t7nKkMQV+6++YXeL6w8sAzcrhraXRDAxguLpYInHQTE0tKme+d4NcvwWwnKQc3ripFO9L2Nh+A3r+kQ2lb9pTqQ9WpAw5DzSVflAmXNmuk46/qN1WsA9aK21H1BiEP0nTQcZWzkBnnk5Bo60Pqes7fNPiDIBkru4fUFcmQ6ewDK5HeO/Y/ioBhc2hoqTeopQRu7P2bwkqAxIpP3RezSURjSKzt/ImB/n1zKesYpHoZCl2wJozXpeisX1VMirRN4eN6igf49J8ueG65HtHZYA8rnWFzfjcwaXZhLRlrPz30AeIOrzx6dhI81qZaZl3Xx4LofnBiQJVQvA6qTnKdsZLZo1qdCz3BD02xop5kIut6tOUcpiinRUSctKWIuUtAdSR6YH2DVfTFnVaorC8PNeTPXgID2A37MHoPVGy0rTNwuQJrKXpPPl4lFxuRW4NupTHje7tUysuYF+pcXK4sWu5xbiI/n2Hw9BuTxqUwtDZjlkyPtzyjmOEK/m80nZmU6O+56C7lyD5Rna4sJFYaeGfXTPTf83vu2IQ9SIxe1ykCnyJacxU0nqA/MdJ/trbRpyHhykBAya62xe1Ce/ieyLo23f/rdG6PP84cQC92vrG3BgYPI9zAwmFZ9FbCUjRDXxfnG/ZGhW9zAEmnFXAUBwcfUYme26U/cIgNhSHLmP5cr3wetIoXS1F3g5s1j0flTaDoSGL2EayH+C81r2O/WQY5iXERtday/yx+tvhdMrLRZjxXhaIiHbeqJx9S5s38oMkT+Tc/J5OiwrOUKbFwidw7tN6mmmhjiFHF0fHaFY1gYlT7tHKUOu1yGpEWVW1e73oqm4XulybBT0n7pWnnWhsR9KBIhJ2nyEu99fkYQ3mFKAZ/1nvsufxnyGit6laWv/4oiG1wM8mU2odtgPAqMhb5YduTu03oR3HOWJZ/LGrUyMsW763PrxNhUrdzjc/P/v+7pU/3TP29LIKzbO579wj+FVDgsIVTwjg9owhxmeGxgXmaBqW1PBYumstR2wkzqFSrRD4zyMz5vx2r29tlMGLnNWdapJG0ZTX7nnH8oQFa6fpkrH3wHNzsejTUCcYdOItQhQmRJTr9KCVEcQbs352gs+ElP6n/HF76aGu4bgXysUwYXqphx68Dp0aN1/2ow3HxsRo/+qN2g3Y03z+EiUUZh4C3z40jG0AUgUvB1icDPh3mzTjtR9bszFGHub8qtoD2aMnSjI0YeC0ZhHVmiFX3qHq5KIHy3SA4zCKe37cC5s6UbrPH1LV9bZSON68CQLm1U/U1QnK23D3a59H/xLSZ7HXjYefxQ0VaoNa2ECoLpy3diY89RdFReBK1ln2eRgST+HiSkgWPdc9vmRgGWuic50O9sVgxG1xLpWMhOLMgMwPK2R8SmfdjnTBFXcZFGMCumpa3dP/dlHM7QhrJZmHLdqoTR2T7S9c7NLc82nTmsP0dadDmIOZyVHaZFmyfXBelM+PovKn67huqa5hL2a9tx1TWR2vSPN/SlY= X-OriginatorOrg: in-advantage.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b34eb9f-ca8d-42a6-3229-08dabe205e38 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Nov 2022 04:52:25.8130 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 48e842ca-fbd8-4633-a79d-0c955a7d3aae X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: Ftm0SBB74TuBDYj+GgMYGfclBFvPOvdgE3CUC4eSfSKS/b1vykfBPGtQi0cqXAmN9DNAS9seXhXQcz3ncFLXP0P3B7kE8fiq0hzckMUs9vo= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY5PR10MB5986 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org X-Patchwork-Delegate: kuba@kernel.org Several bindings for ethernet switches are available for non-dsa switches by way of ethernet-switch.yaml. Remove these duplicate entries and utilize the common bindings for the VSC7514. Signed-off-by: Colin Foster Suggested-by: Vladimir Oltean --- v1 -> v2: * Fix "$ref: ethernet-switch.yaml" placement. Oops. * Add "unevaluatedProperties: true" to ethernet-ports layer so it can correctly read into ethernet-switch.yaml * Add "unevaluatedProperties: true" to ethernet-port layer so it can correctly read into ethernet-controller.yaml --- .../bindings/net/mscc,vsc7514-switch.yaml | 40 ++----------------- 1 file changed, 4 insertions(+), 36 deletions(-) diff --git a/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml b/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml index ee0a504bdb24..3f3f9fd548cf 100644 --- a/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml +++ b/Documentation/devicetree/bindings/net/mscc,vsc7514-switch.yaml @@ -18,10 +18,9 @@ description: | packets using CPU. Additionally, PTP is supported as well as FDMA for faster packet extraction/injection. -properties: - $nodename: - pattern: "^switch@[0-9a-f]+$" +$ref: ethernet-switch.yaml# +properties: compatible: const: mscc,vsc7514-switch @@ -88,46 +87,15 @@ properties: - const: fdma ethernet-ports: - type: object - - properties: - '#address-cells': - const: 1 - '#size-cells': - const: 0 - additionalProperties: false + unevaluatedProperties: true patternProperties: "^port@[0-9a-f]+$": - type: object - description: Ethernet ports handled by the switch $ref: ethernet-controller.yaml# - unevaluatedProperties: false - - properties: - reg: - description: Switch port number - - phy-handle: true - - phy-mode: true - - fixed-link: true - - mac-address: true - - required: - - reg - - phy-mode - - oneOf: - - required: - - phy-handle - - required: - - fixed-link + unevaluatedProperties: true required: - compatible