From patchwork Sat Dec 10 03:30:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Colin Foster X-Patchwork-Id: 13070220 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 6578AC4332F for ; Sat, 10 Dec 2022 03:33:14 +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=X/TIqTShjbWa1mWyNBqiKEOuINIQd+Cz4T1Euo6JbAM=; b=elvB59ikaGsJr4 3+WDVAgU4FVcVcHSm1q2JTa42jqPVMIK6KJ5BLV5HhuGr9j17Qgo4nexNZIHpmQ9RZy7fTiQs4Pt3 D1+v6f7zlfBpZqE52wx4ONKOB4rJdypgOa+bJp+UeBRe/xTnSC+0/DfJEtvXxH/bjJB30TtNoZTJN 1tL+bQc52Ag+qb14TkgS5DJaVlLY94craARW8mhqYdpOt89WA0L67imXWQgEXAoGJlTNVIH6mxkgW 66qjZobROGLwCcTfj+4OynkSVq6kS3hlGQXC09PdI7ijkgL4wtqeJpZ+FHnHx0L1+vlCz4cPyVomJ 2sbtbZirTM+yPyZa289g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1p3qah-00DpuJ-6y; Sat, 10 Dec 2022 03:31:55 +0000 Received: from mail-dm6nam11on2114.outbound.protection.outlook.com ([40.107.223.114] helo=NAM11-DM6-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1p3qZs-00DpXH-FM; Sat, 10 Dec 2022 03:31:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bDVnwCkmyeJ16fXo2BtWkSgch5iUPPSS7n9QSGMq2fokq8OqbAR3fO2hy4U5U+GI2VM3QowtRfRICy+1NLFqIrcafa9De7ib9XL+7qkUET8MA/ub+vTIVOS4Jl1Z/oE7xY+1JOJ4cUtaeIcMI5oSG7dZW9ydRTHmtdDM438lI9c7zTmhNnz2ZtwkB3GrL6JDxdTXwY3rQsyba3cEGTvlS5b1pdUsy/D+uPrmq/SMyhhvX8K3vEsyy2VUoYYDNtQSVGgWi698rBYJTUKBolyNH4ALHPHPH8qI2nD9G/Z8/ZeGCyFb4H28JEA+/k2fvRNRsLzRvitb2j5m5rhak53azg== 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=mTbaH0DsX36iDid8qD8cG/g7DcgpzwDTpXFm4J3I05w=; b=MVZlTuSS/5ry+LPz9TbEglkH6tSjTxL4oT2Nr++u3btG32iyCvWBqyTRntUcNA9EvmPKUFREPVVGPMNs0PCpnvOqxuJxnuS2LmemW6XmTcZVVgegGVvI2NsioXPCZVELvu5gX2CLBT24aPHbXwIOKbHYZKM/Y5bt6XE+71Y5GGm36fb0d04FcH2q8DP+WxVZHU1s7m2VoBmJMq16+5jcUeJvsU4Ihplu2juLSmfiVh05hedlT7xX/dGN3ysuqXS1fYhiuV9D+ad7asBnqsNGoQQAlQZrozoQd80Y8ElmxAUzWN+11McqLUteTcR7M4n8vBkKaYlzY4JWGUfTiUeNVg== 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=mTbaH0DsX36iDid8qD8cG/g7DcgpzwDTpXFm4J3I05w=; b=FM+M1ERXpHJYb6zhu+ooAgTmtG7EINiWsH4B1S4oxiYd2exfikwcGYTMMmWCFrk5Uid3V0vB6M3X+HCIma5fQOniElrP02NHm9Ob1LF46NeHE42dr7xvLwIpCtqLFaEpXNTv1cjRltcIiTyM+NVqvBLUUlFzK6t2p/ID6aMyVgg= 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 SA2PR10MB4779.namprd10.prod.outlook.com (2603:10b6:806:11f::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5880.19; Sat, 10 Dec 2022 03:30:57 +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.5880.014; Sat, 10 Dec 2022 03:30:57 +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 v5 net-next 04/10] dt-bindings: net: dsa: utilize base definitions for standard dsa switches Date: Fri, 9 Dec 2022 19:30:27 -0800 Message-Id: <20221210033033.662553-5-colin.foster@in-advantage.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221210033033.662553-1-colin.foster@in-advantage.com> References: <20221210033033.662553-1-colin.foster@in-advantage.com> X-ClientProxiedBy: BY5PR13CA0002.namprd13.prod.outlook.com (2603:10b6:a03:180::15) To MWHPR1001MB2351.namprd10.prod.outlook.com (2603:10b6:301:35::37) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWHPR1001MB2351:EE_|SA2PR10MB4779:EE_ X-MS-Office365-Filtering-Correlation-Id: d2c65dba-f780-4f8b-3431-08dada5ef321 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4U/Hw97c+ytos/lWRsVqLB2vqW4U2o5spDT29Q5VYmDWxQyXrY/QeFgX05tGlMHa2pu8w9X/BXyE+FoahtqE9icYmoTQgw9gviaDy8oiTw+V82+nZlf1TuwIIaw6ELWyX0KTmLTlD4+X8vVB0k965QjY59lvWJkfChdknltslHAhCeHcmxy/hEisgt89kN8GdZ/wqngvsfsa28sSjqXSaV+knJ62kidjnt992bxCv2pBc68RTlqKqIA7t174Xblh0NAwEpueuoRuUXVz49d9/WhI0et0cn2zf2pxpugKWFvfRy756z2pDU/6lpcccVRgMP/7v5MZYgeIsVSc+f7TllgSmxI4f68cmK0XPCPsgWlAftjKfolFyK6WDg1PauzMNI7CRrdAZN9+DKQn8+5E3Bk5gn/ThHyJDWdAhEpUoWVuxLZIWjiUNF7hgYK/yW8BNgQnH9VPRaoso3yezrmbZlMC8DGqoSTevGug0zs+t99xIS9q0JJ0hNcrYla5OKAbvUtpCAN+12CYWUotvUp5eECqotpySRhtAeLLQHcUhHrXv3BHwRP6MxaP4zY1RJcVw63EcnDyl9iVmH8WnvgoDlb6AJ0sNBR7+41E00LlGus3U7cPkVaryl2NspD7DWf55IdTr6+AevZZvW7VNkytmhcvBPwLjJWcXOOFn+JFsI7xb8XAGnY4qJXlCi0B4PNT3ijq2Qd+AJy9Vs2W96KwKHlH4UaGzVL80R9fJukGw8c= 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)(376002)(346002)(396003)(39830400003)(451199015)(6486002)(966005)(478600001)(52116002)(2906002)(6506007)(6666004)(86362001)(36756003)(6512007)(26005)(44832011)(186003)(7406005)(7416002)(8936002)(5660300002)(38100700002)(1076003)(38350700002)(2616005)(4326008)(41300700001)(83380400001)(54906003)(66476007)(66556008)(8676002)(66946007)(316002);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?q?CwjHtif8SkffAXrNRSXb1fEYhkoU?= =?utf-8?q?5UgjsoTV8qg8Bkpeg83KsEpn3Wo5L5mOCFWqkP3zCzW+Ge3ucHLScGcnpmUHEnRc4?= =?utf-8?q?h7dnnibkoyzv2/3C5BDzDlNOxGRfImH9dinEGxZhdoeA6CZuUQedRIeU1ROyCptDI?= =?utf-8?q?1pvwLUDiYBVGelOK8h6mLZUE8baLgrdSiPtdJEwNoCq7gfFm8z6SVJcQakhrfRHs1?= =?utf-8?q?0lVuYo78/ed4miuDyJV1AjmmCK1Zuk7eaM1j57DV0YdHCn1y7rxoO7jPiKyo66gj3?= =?utf-8?q?GmnkeuB5zCdBhcDsoEvzGdyemkPS41rXYT8tO52Gwgr9fwedk5yU6PkEm5BPnCPMP?= =?utf-8?q?npPZnK5acn5qYp2tjKuJ9+WCNOBeektG1gaqIMcUquWFG1yX+gV4b/piWkakHA9z/?= =?utf-8?q?8Ttf19arw1/Z5Ri3BoyimdOSEBmWB5tspzDKqAB500YaaTcig0xoaXoEJwHl/YOSF?= =?utf-8?q?M781O5hFmtYMOl4MJAqTsaFYKUTckYtcTYeMzIiphplKpySQ1wSsrZ9h8GBuqO4VW?= =?utf-8?q?ZK4XxPedcR28IodZmyjyl40RQhB5vd1NZ3/ATWzRD9ZKvWb0n7sLPiIRJlUHnmI/5?= =?utf-8?q?YVKUXa9yBkFztChgZcGWZQqv+X60MKQ6ImE27z9yme3oHi8jTdlMhhd8adMAWlAgL?= =?utf-8?q?TRa+PWeHRtXgi9VVdNZm35tguQwF23spk4yaN+9mJZ5rhpk1M6u5uoakMY8vXl52z?= =?utf-8?q?ib0BI7Z75Fu7QU5LLE/ZAOD5pWsGQdlgb9ptFjeU3EoLr8mPWW8M6sjjC9SFUZ1aq?= =?utf-8?q?q06KRoNCLiD70TIPr2ImBswJzGY3tW1w6vmAl938vI2Nob6mB/X+O0/8SVdPqLBDM?= =?utf-8?q?ebt/tJh7fDfZESDDfRchL11jNdZZA3aoh+n3qgaK8dfkxQfQj6pPeZhPR4veo7IGp?= =?utf-8?q?nbO+RtR/STM0XkLke8QaSLoPTueikTuCyrZUvJMZw4kPRy1YFP+MsqZOK2dn7WcAE?= =?utf-8?q?BQKR6Ym2u9xzOn8IOTO9pH+D/x4iTErX6s9YOHzSsUS8PlxmwHKJeIIyIv0ZsNp3V?= =?utf-8?q?aUCoVnhMPJGXlwaRqwNUozQ3/rDYDz8LNAJVPwf6Me38aDOxVVCgOdjdkpZ5ucCz9?= =?utf-8?q?edXEPgJHSha3+7pb1at9ROaoE5JnfGJPbUNgeL388rSFPnWtM/zcAqx2IARBJry5Y?= =?utf-8?q?ssSMzLfR09Jxldgp9ivKSQkBCEu1T/qT7QCHxByXIrbtVnReBlN0UGWo6s4kFKDA3?= =?utf-8?q?PxxWaGqADSST4EB+Cm7i3Mnrljg6f2YsCwSfPvTmC9y/GO17JekJfEty8YfrH80U0?= =?utf-8?q?a9Xw8uRqVnwR/hJrtedzxIdhifOa+HCITeDRn89YJI+1R5Nl6cEbZaAq5lEBiMlWA?= =?utf-8?q?+IQQJEw3biKIufJYWFdeYGlYB7oqmuXnRzwPcxmCt/p5j1jvn75lMqAmCbhIUqBtR?= =?utf-8?q?8EQVJsgMWRYnGLA4D1kyqmyUbNjB9SLI5crqapgGhbxuAlnTz8wOuSlMMgsmW6yrc?= =?utf-8?q?merkHVxVeS/q7qkZTTeA2MPb7E4Tpb3HQAAu8R0CncImVEL8HNWpjT0sGN27uqZio?= =?utf-8?q?Y8HrVRABkHkBfbbU3D4F41gRbV/4CnvJAg=3D=3D?= X-OriginatorOrg: in-advantage.com X-MS-Exchange-CrossTenant-Network-Message-Id: d2c65dba-f780-4f8b-3431-08dada5ef321 X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Dec 2022 03:30:56.8885 (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: xyZlhB8hzN6IFfQaqyz8zYQxueILpbE1H8krTFovvPPYemSvlJ2qhdU/daiUV1vxK2Vb17UmTD+4DEW/TcL6vfgP6KEFb9BM5Us0F7/Ggp0= X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR10MB4779 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221209_193104_597942_0A24F076 X-CRM114-Status: GOOD ( 12.34 ) 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 switches 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 definitions 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 Reviewed-by: Rob Herring Acked-by: Alvin Šipraga # realtek Acked-by: Arınç ÜNAL Reviewed-by: Vladimir Oltean --- v4 -> v5 * Add Rob Reviewed, Arınç Acked * Defer the removal of "^(ethernet-)?switch(@.*)?$" in dsa.yaml until a later patch * Undo the move of ethernet switch ports description in mediatek,mt7530.yaml * Fix typos in commit message 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 | 22 +++++++++++++++++++ .../net/dsa/hirschmann,hellcreek.yaml | 2 +- .../bindings/net/dsa/mediatek,mt7530.yaml | 5 +---- .../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, 32 insertions(+), 13 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 5efc0ee8edcb..9375cdcfbf96 100644 --- a/Documentation/devicetree/bindings/net/dsa/dsa.yaml +++ b/Documentation/devicetree/bindings/net/dsa/dsa.yaml @@ -58,4 +58,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..20312f5d1944 100644 --- a/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml +++ b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml @@ -157,9 +157,6 @@ patternProperties: patternProperties: "^(ethernet-)?port@[0-9]+$": type: object - description: Ethernet switch ports - - unevaluatedProperties: false properties: reg: @@ -238,7 +235,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: