Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Colin Foster <colin.foster@in-advantage.com>
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 <alexandre.belloni@bootlin.com>,
        Claudiu Manoil <claudiu.manoil@nxp.com>,
        John Crispin <john@phrozen.org>,
        Sean Wang <sean.wang@mediatek.com>,
        DENG Qingfang <dqfext@gmail.com>,
        Landen Chao <Landen.Chao@mediatek.com>,
        =?UTF-8?q?n=C3=A7=20=C3=9CNAL?= <arinc.unal@arinc9.com>,
        Matthias Brugger <matthias.bgg@gmail.com>,
        Paolo Abeni <pabeni@redhat.com>,
        Jakub Kicinski <kuba@kernel.org>,
        Eric Dumazet <edumazet@google.com>,
        "David S. Miller" <davem@davemloft.net>,
        Vladimir Oltean <olteanv@gmail.com>,
        Florian Fainelli <f.fainelli@gmail.com>,
        Vivien Didelot <vivien.didelot@gmail.com>,
        Andrew Lunn <andrew@lunn.ch>,
        Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
        Rob Herring <robh+dt@kernel.org>, Lee Jones <lee@kernel.org>
Subject: [PATCH v1 net-next 6/7] dt-bindings: net: add generic ethernet-switch-port binding
Date:   Mon, 24 Oct 2022 22:03:54 -0700
Message-Id: <20221025050355.3979380-7-colin.foster@in-advantage.com>
In-Reply-To: <20221025050355.3979380-1-colin.foster@in-advantage.com>
References: <20221025050355.3979380-1-colin.foster@in-advantage.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?4dRLb926lQ6Vkne39Zn7QUIKPq9zFsvjWgnVsOTsXEqdhzFvFWiv82WanTnp?=
 =?us-ascii?Q?XBAWOWUGWp35UxaeD64F+XRdZRlLk9Sz3WORNpulSHiu8LZsq1uspd0njrnB?=
 =?us-ascii?Q?OEh2XHAJD2DFTIjtGx0HkCRt7fVZur3OlVj/p25gK2FGbonLUFTHRoYALZ01?=
 =?us-ascii?Q?dn8cUTqO8H6/ReYK990X6L7XmDDH6mjmKrxBAdQi2l6MKLy/cpErta7HVppj?=
 =?us-ascii?Q?Ya9j641mebU2AvtOl1J34AtHIy/KgJ6VtNRCVA3ZeuPy6wrzaWMxRDBf99Bu?=
 =?us-ascii?Q?Y5rxY8raQpsX2niowG/8hNTX5E2Tn2HhmFh2JXNtFq5fPWZSUBtFiO0nlEle?=
 =?us-ascii?Q?a2MnK8QmzIaVXlZJf+19rfE/lFCj20YRAK3OPFuck7SM9gE8R3pdY78l889Q?=
 =?us-ascii?Q?XZLashr+BzZrGk8DfcmkWPkWQDW3cyk4Zh0BX6mWhqgTz1XyRvJIue7vSIxk?=
 =?us-ascii?Q?wOj+lmsNJKc41uNweIYhKS1p8/pgQn/Sncnof2cmyZGVgKzCqz9xt5uFDi4P?=
 =?us-ascii?Q?+RXoROc8GKWxWBFVvKkoMy7MUqM9hOMBLaqcC20jDCMMDdmz2IVAyWhc8wrh?=
 =?us-ascii?Q?h3OFMtTG++WmpQbnbq1MAqp81co8oxFQs7IVy4bW0IRMS7kiFIaoUySC5XTw?=
 =?us-ascii?Q?qGVhuoHwgjAPUUHm/uUIj3lUsnXPnbq5Dvk2c225C3roxjIBxMUmxG8V3wlN?=
 =?us-ascii?Q?u/8dpw9DHlWBr+yOEEUi6l4e1zarf0FvYduqn2fhEO5ZW04nY0w3zIzQosto?=
 =?us-ascii?Q?9lLz3NUbPfiY/QmZIw+Q8cFLFlQRbiVLSAmXpHt3m16m5kx21I85C84X66RB?=
 =?us-ascii?Q?34DQXFSJrrUxmf9z6eoPlZ3k5VTc72bkiN2mb+keoArX8I7ZaYsYUDwKXkIV?=
 =?us-ascii?Q?f4qcTLRoYdnslocwKr/tAN7j+zYPm/P2qk76j2pa0aoOVWKC0JEeWMJ94K2u?=
 =?us-ascii?Q?pLe8ttjSfX7JmLQCk+lSeyLV48PPip1Y9ifRmFZ0gKBfhqWhmPuLMmtxQ8RO?=
 =?us-ascii?Q?dSA6qRoJsfrBrzFaMT9er8RGKwmMuT5c2rH8EoR7KFC1aNbGFbGSldVCB9oD?=
 =?us-ascii?Q?AHMpOOJcgZJj7e94Fg2DtLVT2nKV8p2R7dTMXXndM/s2c4JytxoZztDgMMgU?=
 =?us-ascii?Q?KE30VFJL9XwbkwJlTTDbcotXHeL/ZhcnsaqeFYMRgUo35NQph9RnIHbvf4b5?=
 =?us-ascii?Q?4HPYdTlX2MQw+XI8aiUgNpcOzucoZ2NqmLr0gRLR1oO+gFIQORmbrXElEL3K?=
 =?us-ascii?Q?N5tjIs9u9TgF6r5s6gZeAB7hRQEM9sLOcIT1uOq+Btod0uXiXTa7MXZzEuD7?=
 =?us-ascii?Q?Kp4lAZSvVK4EyqVsvjDpUEN7yPf8RsVnWs8f0dheITyZ+b3e1mEaUoscA6iQ?=
 =?us-ascii?Q?no8BjQjNUTfM725rPctxd3UX/nPt+tPSfxBHXLJTWY5zIaAcBsOuxZC40c7M?=
 =?us-ascii?Q?MlyuZtftLqgUU77PPOeawzMSDdAY9Vfx+xieiQmn7X9NYnakj1ul4qDr69wX?=
 =?us-ascii?Q?UmbCYqPW4jAw+o9NcNU3wu5wnJxWNHcLPM+d4YrpaPs0QV4G3ZmdndeeJe21?=
 =?us-ascii?Q?1mGTl8MlXVt+43hsTE3TWphkJt0FhLbXPRATxs5ZbusXAUre+vqgJ4X6ZA6/?=
 =?us-ascii?Q?jg=3D=3D?=
X-OriginatorOrg: in-advantage.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 983e5af6-59ff-4fcd-898c-08dab6465ee4
X-MS-Exchange-CrossTenant-AuthSource: MWHPR1001MB2351.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2022 05:04:18.5004
 (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: 79DADlt1HsT8pb18/jnm1AZjN1Icj2TJKPQJW4cPKP9ljVrnRenFWO67Fy3NaVKyhGCZCJuZaK6U8hGyNcUh/hkh7xlcUVN/4xfpU2xO+L0=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR10MB4989
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The dsa-port.yaml binding had several references that can be common to all
ethernet ports, not just dsa-specific ones. Break out the generic bindings
to ethernet-switch-port.yaml they can be used by non-dsa drivers.

Signed-off-by: Colin Foster <colin.foster@in-advantage.com>
Suggested-by: Vladimir Oltean <olteanv@gmail.com>
---
 .../devicetree/bindings/net/dsa/dsa-port.yaml | 26 +----------
 .../bindings/net/ethernet-switch-port.yaml    | 44 +++++++++++++++++++
 .../bindings/net/ethernet-switch.yaml         |  4 +-
 MAINTAINERS                                   |  1 +
 4 files changed, 50 insertions(+), 25 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/net/ethernet-switch-port.yaml

diff --git a/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml b/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml
index 10ad7e71097b..c5144e733511 100644
--- a/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml
+++ b/Documentation/devicetree/bindings/net/dsa/dsa-port.yaml
@@ -4,7 +4,7 @@
 $id: http://devicetree.org/schemas/net/dsa/dsa-port.yaml#
 $schema: http://devicetree.org/meta-schemas/core.yaml#
 
-title: Ethernet Switch port Device Tree Bindings
+title: DSA Switch port Device Tree Bindings
 
 maintainers:
   - Andrew Lunn <andrew@lunn.ch>
@@ -15,12 +15,9 @@ description:
   Ethernet switch port Description
 
 allOf:
-  - $ref: /schemas/net/ethernet-controller.yaml#
+  - $ref: /schemas/net/ethernet-switch-port.yaml#
 
 properties:
-  reg:
-    description: Port number
-
   label:
     description:
       Describes the label associated with this port, which will become
@@ -57,25 +54,6 @@ properties:
       - rtl8_4t
       - seville
 
-  phy-handle: true
-
-  phy-mode: true
-
-  fixed-link: true
-
-  mac-address: true
-
-  sfp: true
-
-  managed: true
-
-  rx-internal-delay-ps: true
-
-  tx-internal-delay-ps: true
-
-required:
-  - reg
-
 # CPU and DSA ports must have phylink-compatible link descriptions
 if:
   oneOf:
diff --git a/Documentation/devicetree/bindings/net/ethernet-switch-port.yaml b/Documentation/devicetree/bindings/net/ethernet-switch-port.yaml
new file mode 100644
index 000000000000..cb1e5e12bf0a
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/ethernet-switch-port.yaml
@@ -0,0 +1,44 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/ethernet-switch-port.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Ethernet Switch port Device Tree Bindings
+
+maintainers:
+  - Andrew Lunn <andrew@lunn.ch>
+  - Florian Fainelli <f.fainelli@gmail.com>
+  - Vivien Didelot <vivien.didelot@gmail.com>
+
+description:
+  Ethernet switch port Description
+
+$ref: ethernet-controller.yaml#
+
+properties:
+  reg:
+    description: Port number
+
+  phy-handle: true
+
+  phy-mode: true
+
+  fixed-link: true
+
+  mac-address: true
+
+  sfp: true
+
+  managed: true
+
+  rx-internal-delay-ps: true
+
+  tx-internal-delay-ps: true
+
+required:
+  - reg
+
+additionalProperties: true
+
+...
diff --git a/Documentation/devicetree/bindings/net/ethernet-switch.yaml b/Documentation/devicetree/bindings/net/ethernet-switch.yaml
index fbaac536673d..f698857619da 100644
--- a/Documentation/devicetree/bindings/net/ethernet-switch.yaml
+++ b/Documentation/devicetree/bindings/net/ethernet-switch.yaml
@@ -36,7 +36,9 @@ patternProperties:
         type: object
         description: Ethernet switch ports
 
-        $ref: /schemas/net/dsa/dsa-port.yaml#
+        allOf:
+          - $ref: /schemas/net/dsa/dsa-port.yaml#
+          - $ref: ethernet-switch-port.yaml#
 
 oneOf:
   - required:
diff --git a/MAINTAINERS b/MAINTAINERS
index 3b6c3989c419..d98fc1962874 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14326,6 +14326,7 @@ M:	Florian Fainelli <f.fainelli@gmail.com>
 M:	Vladimir Oltean <olteanv@gmail.com>
 S:	Maintained
 F:	Documentation/devicetree/bindings/net/dsa/
+F:	Documentation/devicetree/bindings/net/ethernet-switch-port.yaml
 F:	Documentation/devicetree/bindings/net/ethernet-switch.yaml
 F:	drivers/net/dsa/
 F:	include/linux/dsa/
-- 
2.25.1