From patchwork Fri Dec 2 20:45:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Colin Foster X-Patchwork-Id: 13063245 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id ADAAFC4332F for ; Fri, 2 Dec 2022 20:49:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xQxCGoVe9I9w5RwLcluif0ahb4t4edxceCzmtdWrCCM=; b=sZc08lA61z/CXv 8uNKVLfCMCw7stFLt6IqGzfRUrzeSe9oGdxEG0QqTETHYaShACU4A3HHMQEJR1on141BxLO5d6rFy wXu9fQqS5e+JESnh6OsqVcy8piP0sjZf0blOu4cYmOgu0uVgWeYwp79oZqPF0vYVMbxCnps1kyYJm 3wKG0i3P5PS1cJen1G7/OWm/nz4RGfFIX59yY1C+WITtLNXhq3CtGHR0UELX3/gJyxH/Q8a6D9e+S R1Id9F0GDnJm21bq++vgeeCkghH78LK7OPOk86OBZt/fKe8rIhege95I4qUImqip9M2zSkQOxFe1C y03vs8MyvHSICKqmjPeQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p1CxU-001DWW-4y; Fri, 02 Dec 2022 20:48:32 +0000 Received: from mail-mw2nam10on20720.outbound.protection.outlook.com ([2a01:111:f400:7e89::720] helo=NAM10-MW2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p1CvS-001CeB-5o; Fri, 02 Dec 2022 20:46:28 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yq7MPRoleqCoh+GT7Tdeg++XJPO77E43nt0NZLSMZyahWBiNmHUq65ErCIvtjQWoPYBOILR55ZZxApjtAMex9DuM+QlNohPpWAM5t+7+oMwfqbjbJHhJEkBQMA6BwGTgolqXIcMdz/l0SSVht41QwMTZFft2C3QtrzuYke234AL1H2qUd0TuS+lB0dnrBPpHUipwKuSU7WcDmyb9py1ZDWHqDWjSx/r3fGZAbXkPQ0q2LCjkFcrFUW3wnO7rynvJEr3WELYtgwn7BUwgmMbhcyd9pfSeC16SVqJgcjZ/qbxBqNUvRvsfn7JJ1wYUclD2DVViZNFUi8yJIXH+KQvGuA== 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=qYbz0ScqR0u+Wgwm+mP3P9fH0olF7XMLqKQkE7hunes=; b=RJhnL0qvIe6b0s+Ng8Gi82Khte9BWgGRXPexeC9qt5hkOnrIAy2PPp9MhoxoCkS3pXYFdbEoCj5ERRDs1gqhYggEIJC9McoLJ8+NixL5rCJAvQB60EnogzhL2vHWCrHaTmBgxsuxs5b9SEJr2EEUTZF4KfQg763TgsQbNRhvHqu52NdfCYrb+zZLd4dmz5/y/i1EiXaWglWzwuwwvFJz2H2d7QRfZNznooDQAw85zI7cgVJ3YwQfTI1bgX4qZC1vUAZlt/nzMf/u/nUWUQNTjZTzAvMImUCFmYl2zPuEUO9r0XacgBAB1UPDyPJdvQ1gjj7eRc/TKS1PF2XDOHy7nw== 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=qYbz0ScqR0u+Wgwm+mP3P9fH0olF7XMLqKQkE7hunes=; b=EEJMZsfeBYMKQBD9kWaI8pwa2aiG1+8bOFZiXCCEnL1qal2KukljcsM2phcUat8LqKV8HLr6K6kZ7eDDn1+gWzFWsZJkbyCKZzHCTamT1Y2OYz4h/i1g0/GSvhz87tCWlCJtG4xzKa6tj64qj0yRvfz7qCp1GXsFuePSj2iakrM= 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 PH0PR10MB5547.namprd10.prod.outlook.com (2603:10b6:510:da::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.10; Fri, 2 Dec 2022 20:46:16 +0000 Received: from MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::45b5:a860:9cea:a74c]) by MWHPR1001MB2351.namprd10.prod.outlook.com ([fe80::45b5:a860:9cea:a74c%4]) with mapi id 15.20.5857.023; Fri, 2 Dec 2022 20:46:16 +0000 From: Colin Foster To: linux-renesas-soc@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, netdev@vger.kernel.org Cc: John Crispin , Alexandre Belloni , Claudiu Manoil , Marek Vasut , Sean Wang , DENG Qingfang , Landen Chao , =?utf-8?b?bsOnIMOcTkFM?= , Vivien Didelot , =?utf-8?b?Q2zDqW1lbnQgTMOpZ2Vy?= , =?utf-8?q?Alv?= =?utf-8?q?in_=C5=A0ipraga?= , Linus Walleij , UNGLinuxDriver@microchip.com, Woojung Huh , Matthias Brugger , Kurt Kanzenbach , Krzysztof Kozlowski , Rob Herring , Paolo Abeni , Jakub Kicinski , Eric Dumazet , "David S. Miller" , Vladimir Oltean , Florian Fainelli , Andrew Lunn , George McCollister , Rob Herring Subject: [PATCH v4 net-next 3/9] dt-bindings: net: dsa: utilize base definitions for standard dsa switches Date: Fri, 2 Dec 2022 12:45:53 -0800 Message-Id: <20221202204559.162619-4-colin.foster@in-advantage.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221202204559.162619-1-colin.foster@in-advantage.com> References: <20221202204559.162619-1-colin.foster@in-advantage.com> X-ClientProxiedBy: MW4PR03CA0201.namprd03.prod.outlook.com (2603:10b6:303:b8::26) To MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2351:EE_|PH0PR10MB5547:EE_ X-MS-Office365-Filtering-Correlation-Id: 63e64de8-d2dd-4232-df2a-08dad4a64126 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GXTAC4t4BVpkBJLSscTmkbVey5sv6gnoaSOdV4EVHIaTJl561GblievAgsHbbYOER55Q4rj0fpsXziA0UP2mct4R9au59UBLbiNEU6dv0Vg925JbBJuTT+8XEK77i+PBaCKRAjEPZ/8BW59nxJA0e5awYbg2ua6lHwIpW4BqqN8Cw7otWX6K2KwYUculIcAjXUFS6myTbgiT09+mOPJGXAIN1EDC+15Mj8ZPK+wtqms1WNVLTC6XqMTsObv2yP3DtGfG9KZNF843/17iepcG/bmwVbSmL/OSFPYc1bZeqf6RduSR5ZA7tQojKJMyqR2lXe0nQxhXh6YVSQhGiAzGgT/iIcOsra6zCWeG5sZAeVWHd9iYNzgXYKRJsSpMzNuF31yx2pxViiK8pnN0Gn4qFPRbV65NCF2mOI5S/00+ii1kuXGuW+7kBS4pbs5gaCAcgYpQdIEoWC7bdRqubPgS6PJthy9inJ5pB0rNjr6wvu33mkMsBAp2T2cZAXwXwOHqc5YPlAlEIEb4/F5X3TnQznnUuOBECae3N3BIPU/ETskWyjBkyVTU7wqgMWe+oocxHzkexI4bmwWuk1W2bGC7XHXszJAoAIp70O0ZstSNJ1yrtcr+yB+TPu838f41AK1vXoinGSYxCeOEnXs5oj5WRuY7hJz8Oc8xYj/YmB/GI8TWdMj38t2w1LbMKI5mLDxlg1di1zx3J4QZHOmuDyXLajlukt0WazYW13nxo6Lsq08= 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)(136003)(366004)(396003)(376002)(39830400003)(346002)(451199015)(54906003)(316002)(66556008)(8936002)(44832011)(7416002)(2906002)(7406005)(38350700002)(41300700001)(5660300002)(4326008)(8676002)(66476007)(186003)(66946007)(38100700002)(2616005)(1076003)(83380400001)(966005)(52116002)(478600001)(6486002)(86362001)(26005)(6512007)(6506007)(6666004)(36756003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?Z+N64wDgNp6OEWwKwRIderyqdA8G?= =?utf-8?q?2HjZCxRvY5taKoc9Ild66utahsuPdecZzxkKiqFb4k0+QRf0gHVjIjGq3F+k9q20Y?= =?utf-8?q?tnS7iJsn2dVh/b75Hm3klUfJdmVJEsxEnEJqCNFsphb/uw4VEFIgGHjk4akSryNmi?= =?utf-8?q?J8lkjot2FstEaVu2biCk2K681HLT3R7n94GPf2eJd8RST0Yb0X0ZBaztV7lhYYe2R?= =?utf-8?q?B2LbSqUxL1KAoj9rabmNnkcKVW8VPfJjfAshsOczdQPspcx38mFQkpJLJPSG2RwNH?= =?utf-8?q?RTeSF5Od9wtCNuHCbDKOMI0WK5jBI7Sf09eZJOckLUaeiff3snxBttSuGj+e+PsEY?= =?utf-8?q?XPpre4zscEHZ+m4MTg1dqetcPsDOQKFdSzV19NlG2Voxi+X0olnq+J+Rad0dweNPW?= =?utf-8?q?ttKncter6+ParCKsjn50N6cVJNtMNQQRaFvuoig0SbexZ1Tme4Itm8WPl2lZGHco+?= =?utf-8?q?P6QdWTsrvWwr3EXxqOibSRs58K2w4nPCda92atDpqkl6LxMD1bis/v1dKcw5FuBDR?= =?utf-8?q?h1BXJe7RmVQC4UR/6HIN1ubi5JFBdaPTiw1ZPpu7u0zx0C7HxM4FaiMql2KpBYjBY?= =?utf-8?q?CwIfei0/IPJ1FKyJsDwBfDF0mpt8nRTdT1CDeTjSnHQDQli6nxTjXdB5TM4aD3sNO?= =?utf-8?q?6suGse6M6/sKcCjWgZnw7HpHaQSx4ddbwam35NqNcdVFmA+3CVp6Ur8ljOcvTpOdO?= =?utf-8?q?ek4ps/LVZuIVX5PPgW+/hX4QWlr1hCuFZdA1YNs39t8w/18VqcIxUJYSSXxrXnddP?= =?utf-8?q?IdYsKKADc0g35/cjcFmfzkBUD0G6i6GgqkPi4ZMAmZtdeBQKrbkaq7LsHGMvF4z0A?= =?utf-8?q?g1ydCkgaUP7a9N3P+Tu4PfPt3AxiGE1VOLxYgR87bQM9wMoBMreBZMRc+ajACfWlh?= =?utf-8?q?o3qtoVYTNwSXC12gwGUcnYWD42NRtk4aC9KcYNAn7oXbpm8sRxvoMOjFHXZ07EwDI?= =?utf-8?q?GYq48UxuXJc8lt15w1C+gGnt8daC0YQ7C855Gp7fNGnSsOWpcSnTtkfkqM9IQwve9?= =?utf-8?q?EFx/jrYIOlPjoEEbjoQ7yMN02WVb3PQnY+2C2wVkYoY2V4XYSW5mz2CWXTog8KgEQ?= =?utf-8?q?jtgxMEeQLJvcPd5VHMI8+l2qQdfl5uqUtcLseKqhOekHHRPHTX9MqabhEW5TCAb8K?= =?utf-8?q?YtLKWaPpUBBTiZDfWTp1p4netGHt7RQotcrAZ+I3Fuu/+Edk1PFBRa+KhyZdNR67T?= =?utf-8?q?Lrcb1TMDLwpQ1yLZJeQ4hzfbazyFV9adFdodUtU0woU53rCtH9lORjHV/EYxWmn6F?= =?utf-8?q?TwbZ6bjYgOZuhqkIEGa4zwHZqvQK6Doktfg58pwD6BiyB4nltXGhS9Tuu4KvjGAC6?= =?utf-8?q?5Q2Z9eZgf5tIwV7kvp8rCNK9hfMLzcwcyQOiObH17Fjomip5Ltid1UnSvHxn/RRpg?= =?utf-8?q?2Km5xda25kEIAY97T5PdUgiEyAitAKJ2cWYl5vi7XotxEWIz6lBV9lGGKyafdbYry?= =?utf-8?q?3enIHBS5I9CwL2Q8siSL59VivZA+QuoZWlcjBeBRRxhHy7i/xeBYAZBxEBRlFCKB/?= =?utf-8?q?27pKXwJVxo7j15f/7zxMXnHIyVVSVQpw5A=3D=3D?= X-OriginatorOrg: in-advantage.com X-MS-Exchange-CrossTenant-Network-Message-Id: 63e64de8-d2dd-4232-df2a-08dad4a64126 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2022 20:46:15.1416 (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: EHUNTYqiTwvQI6RpWJ8tg12STAdmEZmAhOOh4cy7s/CJjlow+Nb9r6Orx89dZaM0vX6F76GnZlpUX82sf6+EfH5WzPenaNa5Lf0Cde4Ml6g= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR10MB5547 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221202_124626_260640_849521CD X-CRM114-Status: GOOD ( 14.25 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DSA switches can fall into one of two categories: switches where all ports follow standard '(ethernet-)?port' properties, and switches that have additional properties for the ports. The scenario where DSA ports are all standardized can be handled by swtiches with a reference to the new 'dsa.yaml#/$defs/ethernet-ports'. The scenario where DSA ports require additional properties can reference '$dsa.yaml#' directly. This will allow switches to reference these standard defitions of the DSA switch, but add additional properties under the port nodes. Suggested-by: Rob Herring Signed-off-by: Colin Foster Reviewed-by: Linus Walleij Reviewed-by: Florian Fainelli Acked-by: Alvin Šipraga # realtek Acked-by: Arınç ÜNAL Reviewed-by: Rob Herring --- v3 -> v4 * Rename "$defs/base" to "$defs/ethernet-ports" to avoid implication of a "base class" and fix commit message accordingly * Add the following to the common etherent-ports node: "additionalProperties: false" "#address-cells" property "#size-cells" property * Fix "etherenet-ports@[0-9]+" to correctly be "ethernet-port@[0-9]+" * Remove unnecessary newline * Apply changes to mediatek,mt7530.yaml that were previously in a separate patch * Add Reviewed and Acked tags v3 * New patch --- .../bindings/net/dsa/arrow,xrs700x.yaml | 2 +- .../devicetree/bindings/net/dsa/brcm,b53.yaml | 2 +- .../devicetree/bindings/net/dsa/dsa.yaml | 25 ++++++++++++++++--- .../net/dsa/hirschmann,hellcreek.yaml | 2 +- .../bindings/net/dsa/mediatek,mt7530.yaml | 16 +++--------- .../bindings/net/dsa/microchip,ksz.yaml | 2 +- .../bindings/net/dsa/microchip,lan937x.yaml | 2 +- .../bindings/net/dsa/mscc,ocelot.yaml | 2 +- .../bindings/net/dsa/nxp,sja1105.yaml | 2 +- .../devicetree/bindings/net/dsa/realtek.yaml | 2 +- .../bindings/net/dsa/renesas,rzn1-a5psw.yaml | 2 +- 11 files changed, 35 insertions(+), 24 deletions(-) diff --git a/Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml b/Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml index 259a0c6547f3..5888e3a0169a 100644 --- a/Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml +++ b/Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Arrow SpeedChips XRS7000 Series Switch Device Tree Bindings allOf: - - $ref: dsa.yaml# + - $ref: dsa.yaml#/$defs/ethernet-ports maintainers: - George McCollister diff --git a/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml b/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml index 1219b830b1a4..5bef4128d175 100644 --- a/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml +++ b/Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml @@ -66,7 +66,7 @@ required: - reg allOf: - - $ref: dsa.yaml# + - $ref: dsa.yaml#/$defs/ethernet-ports - if: properties: compatible: diff --git a/Documentation/devicetree/bindings/net/dsa/dsa.yaml b/Documentation/devicetree/bindings/net/dsa/dsa.yaml index b9d48e357e77..b9e366e46aed 100644 --- a/Documentation/devicetree/bindings/net/dsa/dsa.yaml +++ b/Documentation/devicetree/bindings/net/dsa/dsa.yaml @@ -19,9 +19,6 @@ description: select: false properties: - $nodename: - pattern: "^(ethernet-)?switch(@.*)?$" - dsa,member: minItems: 2 maxItems: 2 @@ -58,4 +55,26 @@ oneOf: additionalProperties: true +$defs: + ethernet-ports: + description: A DSA switch without any extra port properties + $ref: '#/' + + patternProperties: + "^(ethernet-)?ports$": + type: object + additionalProperties: false + + properties: + '#address-cells': + const: 1 + '#size-cells': + const: 0 + + patternProperties: + "^(ethernet-)?port@[0-9]+$": + description: Ethernet switch ports + $ref: dsa-port.yaml# + unevaluatedProperties: false + ... diff --git a/Documentation/devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml b/Documentation/devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml index 73b774eadd0b..748ef9983ce2 100644 --- a/Documentation/devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml +++ b/Documentation/devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Hirschmann Hellcreek TSN Switch Device Tree Bindings allOf: - - $ref: dsa.yaml# + - $ref: dsa.yaml#/$defs/ethernet-ports maintainers: - Andrew Lunn diff --git a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml index f2e9ff3f580b..b815272531fa 100644 --- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml +++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml @@ -156,17 +156,6 @@ patternProperties: patternProperties: "^(ethernet-)?port@[0-9]+$": - type: object - description: Ethernet switch ports - - unevaluatedProperties: false - - properties: - reg: - description: - Port address described must be 5 or 6 for CPU port and from 0 to 5 - for user ports. - allOf: - $ref: dsa-port.yaml# - if: @@ -174,6 +163,9 @@ patternProperties: then: properties: reg: + description: + Port address described must be 5 or 6 for CPU port and from + 0 to 5 for user ports enum: - 5 - 6 @@ -238,7 +230,7 @@ $defs: - sgmii allOf: - - $ref: dsa.yaml# + - $ref: dsa.yaml#/$defs/ethernet-ports - if: required: - mediatek,mcm diff --git a/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml b/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml index 4da75b1f9533..a4b53434c85c 100644 --- a/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml +++ b/Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml @@ -11,7 +11,7 @@ maintainers: - Woojung Huh allOf: - - $ref: dsa.yaml# + - $ref: dsa.yaml#/$defs/ethernet-ports - $ref: /schemas/spi/spi-peripheral-props.yaml# properties: diff --git a/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml b/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml index 630bf0f8294b..4aee3bf4c2f4 100644 --- a/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml +++ b/Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml @@ -10,7 +10,7 @@ maintainers: - UNGLinuxDriver@microchip.com allOf: - - $ref: dsa.yaml# + - $ref: dsa.yaml#/$defs/ethernet-ports properties: compatible: diff --git a/Documentation/devicetree/bindings/net/dsa/mscc,ocelot.yaml b/Documentation/devicetree/bindings/net/dsa/mscc,ocelot.yaml index 8d93ed9c172c..85014a590a35 100644 --- a/Documentation/devicetree/bindings/net/dsa/mscc,ocelot.yaml +++ b/Documentation/devicetree/bindings/net/dsa/mscc,ocelot.yaml @@ -78,7 +78,7 @@ required: - reg allOf: - - $ref: dsa.yaml# + - $ref: dsa.yaml#/$defs/ethernet-ports - if: properties: compatible: diff --git a/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml b/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml index 1e26d876d146..826e2db98974 100644 --- a/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml +++ b/Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml @@ -13,7 +13,7 @@ description: depends on the SPI bus master driver. allOf: - - $ref: "dsa.yaml#" + - $ref: dsa.yaml#/$defs/ethernet-ports - $ref: /schemas/spi/spi-peripheral-props.yaml# maintainers: diff --git a/Documentation/devicetree/bindings/net/dsa/realtek.yaml b/Documentation/devicetree/bindings/net/dsa/realtek.yaml index 1a7d45a8ad66..cfd69c2604ea 100644 --- a/Documentation/devicetree/bindings/net/dsa/realtek.yaml +++ b/Documentation/devicetree/bindings/net/dsa/realtek.yaml @@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: Realtek switches for unmanaged switches allOf: - - $ref: dsa.yaml# + - $ref: dsa.yaml#/$defs/ethernet-ports maintainers: - Linus Walleij diff --git a/Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml b/Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml index 0a0d62b6c00e..833d2f68daa1 100644 --- a/Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml +++ b/Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml @@ -14,7 +14,7 @@ description: | handles 4 ports + 1 CPU management port. allOf: - - $ref: dsa.yaml# + - $ref: dsa.yaml#/$defs/ethernet-ports properties: compatible: