[PATCH net-next 0/2] dt-bindings: net: dsa: b53: Add YAML bindings

[PATCH net-next 0/2] dt-bindings: net: dsa: b53: Add YAML bindings

[Kurt Kanzenbach]

Hi,

the DSA device tree bindings have been converted to YAML. Let's start
using them. Convert the b53 bindings as suggested by Florian Fainelli.

Kurt Kanzenbach (2):
  dt-bindings: net: dsa: b53: Add YAML bindings
  dt-bindings: net: dsa: b53: Drop old bindings

 .../devicetree/bindings/net/dsa/b53.txt       | 149 -----------
 .../devicetree/bindings/net/dsa/b53.yaml      | 249 ++++++++++++++++++
 MAINTAINERS                                   |   2 +-
 3 files changed, 250 insertions(+), 150 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/net/dsa/b53.txt
 create mode 100644 Documentation/devicetree/bindings/net/dsa/b53.yaml

-- 
2.26.2

[PATCH net-next 1/2] dt-bindings: net: dsa: b53: Add YAML bindings

[Kurt Kanzenbach]

Convert the b53 DSA device tree bindings to YAML in order to allow
for automatic checking and such.

Suggested-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
---
 .../devicetree/bindings/net/dsa/b53.yaml      | 249 ++++++++++++++++++
 1 file changed, 249 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/net/dsa/b53.yaml

diff --git a/Documentation/devicetree/bindings/net/dsa/b53.yaml b/Documentation/devicetree/bindings/net/dsa/b53.yaml
new file mode 100644
index 000000000000..4fcbac1de95b
--- /dev/null
+++ b/Documentation/devicetree/bindings/net/dsa/b53.yaml
@@ -0,0 +1,249 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/net/dsa/b53.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Broadcom BCM53xx Ethernet switches
+
+allOf:
+  - $ref: dsa.yaml#
+
+maintainers:
+  - Florian Fainelli <f.fainelli@gmail.com>
+
+description:
+  Broadcom BCM53xx Ethernet switches
+
+properties:
+  compatible:
+    oneOf:
+      - const: brcm,bcm5325
+      - const: brcm,bcm53115
+      - const: brcm,bcm53125
+      - const: brcm,bcm53128
+      - const: brcm,bcm5365
+      - const: brcm,bcm5395
+      - const: brcm,bcm5389
+      - const: brcm,bcm5397
+      - const: brcm,bcm5398
+      - items:
+          - const: brcm,bcm11360-srab
+          - const: brcm,cygnus-srab
+      - items:
+          - enum:
+              - brcm,bcm53010-srab
+              - brcm,bcm53011-srab
+              - brcm,bcm53012-srab
+              - brcm,bcm53018-srab
+              - brcm,bcm53019-srab
+          - const: brcm,bcm5301x-srab
+      - items:
+          - enum:
+              - brcm,bcm11404-srab
+              - brcm,bcm11407-srab
+              - brcm,bcm11409-srab
+              - brcm,bcm58310-srab
+              - brcm,bcm58311-srab
+              - brcm,bcm58313-srab
+          - const: brcm,omega-srab
+      - items:
+          - enum:
+              - brcm,bcm58522-srab
+              - brcm,bcm58523-srab
+              - brcm,bcm58525-srab
+              - brcm,bcm58622-srab
+              - brcm,bcm58623-srab
+              - brcm,bcm58625-srab
+              - brcm,bcm88312-srab
+          - const: brcm,nsp-srab
+      - items:
+          - enum:
+              - brcm,bcm3384-switch
+              - brcm,bcm6328-switch
+              - brcm,bcm6368-switch
+          - const: brcm,bcm63xx-switch
+
+required:
+  - compatible
+  - reg
+
+# BCM585xx/586xx/88312 SoCs
+if:
+  properties:
+    compatible:
+      contains:
+        enum:
+          - brcm,bcm58522-srab
+          - brcm,bcm58523-srab
+          - brcm,bcm58525-srab
+          - brcm,bcm58622-srab
+          - brcm,bcm58623-srab
+          - brcm,bcm58625-srab
+          - brcm,bcm88312-srab
+then:
+  properties:
+    reg:
+      minItems: 3
+      maxItems: 3
+    reg-names:
+      items:
+        - const: srab
+        - const: mux_config
+        - const: sgmii_config
+    interrupts:
+      minItems: 13
+      maxItems: 13
+    interrupt-names:
+      items:
+        - const: link_state_p0
+        - const: link_state_p1
+        - const: link_state_p2
+        - const: link_state_p3
+        - const: link_state_p4
+        - const: link_state_p5
+        - const: link_state_p7
+        - const: link_state_p8
+        - const: phy
+        - const: ts
+        - const: imp_sleep_timer_p5
+        - const: imp_sleep_timer_p7
+        - const: imp_sleep_timer_p8
+  required:
+    - interrupts
+else:
+  properties:
+    reg:
+      maxItems: 1
+
+unevaluatedProperties: false
+
+examples:
+  - |
+    mdio {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        switch@1e {
+            compatible = "brcm,bcm53125";
+            reg = <30>;
+
+            ethernet-ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                port@0 {
+                    reg = <0>;
+                    label = "lan1";
+                };
+
+                port@1 {
+                    reg = <1>;
+                    label = "lan2";
+                };
+
+                port@5 {
+                    reg = <5>;
+                    label = "cable-modem";
+                    phy-mode = "rgmii-txid";
+                    fixed-link {
+                        speed = <1000>;
+                        full-duplex;
+                    };
+                };
+
+                port@8 {
+                    reg = <8>;
+                    label = "cpu";
+                    phy-mode = "rgmii-txid";
+                    ethernet = <&eth0>;
+                    fixed-link {
+                        speed = <1000>;
+                        full-duplex;
+                    };
+                };
+            };
+        };
+    };
+  - |
+    #include <dt-bindings/interrupt-controller/arm-gic.h>
+    #include <dt-bindings/interrupt-controller/irq.h>
+
+    axi {
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        switch@36000 {
+            compatible = "brcm,bcm58623-srab", "brcm,nsp-srab";
+            reg = <0x36000 0x1000>,
+                  <0x3f308 0x8>,
+                  <0x3f410 0xc>;
+            reg-names = "srab", "mux_config", "sgmii_config";
+            interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,
+                         <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
+            interrupt-names = "link_state_p0",
+                              "link_state_p1",
+                              "link_state_p2",
+                              "link_state_p3",
+                              "link_state_p4",
+                              "link_state_p5",
+                              "link_state_p7",
+                              "link_state_p8",
+                              "phy",
+                              "ts",
+                              "imp_sleep_timer_p5",
+                              "imp_sleep_timer_p7",
+                              "imp_sleep_timer_p8";
+
+            ethernet-ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                port@0 {
+                    label = "port0";
+                    reg = <0>;
+                };
+
+                port@1 {
+                    label = "port1";
+                    reg = <1>;
+                };
+
+                port@2 {
+                    label = "port2";
+                    reg = <2>;
+                };
+
+                port@3 {
+                    label = "port3";
+                    reg = <3>;
+                };
+
+                port@4 {
+                    label = "port4";
+                    reg = <4>;
+                };
+
+                port@8 {
+                    ethernet = <&amac2>;
+                    label = "cpu";
+                    reg = <8>;
+                    fixed-link {
+                        speed = <1000>;
+                        full-duplex;
+                    };
+                };
+            };
+        };
+    };
-- 
2.26.2

[PATCH net-next 2/2] dt-bindings: net: dsa: b53: Drop old bindings

[Kurt Kanzenbach]

The device tree bindings have been converted to YAML. No need to keep
the text file around. Update MAINTAINERS file accordingly.

Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
---
 .../devicetree/bindings/net/dsa/b53.txt       | 149 ------------------
 MAINTAINERS                                   |   2 +-
 2 files changed, 1 insertion(+), 150 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/net/dsa/b53.txt

diff --git a/Documentation/devicetree/bindings/net/dsa/b53.txt b/Documentation/devicetree/bindings/net/dsa/b53.txt
deleted file mode 100644
index f1487a751b1a..000000000000
--- a/Documentation/devicetree/bindings/net/dsa/b53.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-Broadcom BCM53xx Ethernet switches
-==================================
-
-Required properties:
-
-- compatible: For external switch chips, compatible string must be exactly one
-  of: "brcm,bcm5325"
-      "brcm,bcm53115"
-      "brcm,bcm53125"
-      "brcm,bcm53128"
-      "brcm,bcm5365"
-      "brcm,bcm5395"
-      "brcm,bcm5389"
-      "brcm,bcm5397"
-      "brcm,bcm5398"
-
-  For the BCM11360 SoC, must be:
-      "brcm,bcm11360-srab" and the mandatory "brcm,cygnus-srab" string
-
-  For the BCM5310x SoCs with an integrated switch, must be one of:
-      "brcm,bcm53010-srab"
-      "brcm,bcm53011-srab"
-      "brcm,bcm53012-srab"
-      "brcm,bcm53018-srab"
-      "brcm,bcm53019-srab" and the mandatory "brcm,bcm5301x-srab" string
-
-  For the BCM5831X/BCM1140x SoCs with an integrated switch, must be one of:
-      "brcm,bcm11404-srab"
-      "brcm,bcm11407-srab"
-      "brcm,bcm11409-srab"
-      "brcm,bcm58310-srab"
-      "brcm,bcm58311-srab"
-      "brcm,bcm58313-srab" and the mandatory "brcm,omega-srab" string
-
-  For the BCM585xx/586XX/88312 SoCs with an integrated switch, must be one of:
-      "brcm,bcm58522-srab"
-      "brcm,bcm58523-srab"
-      "brcm,bcm58525-srab"
-      "brcm,bcm58622-srab"
-      "brcm,bcm58623-srab"
-      "brcm,bcm58625-srab"
-      "brcm,bcm88312-srab" and the mandatory "brcm,nsp-srab string
-
-  For the BCM63xx/33xx SoCs with an integrated switch, must be one of:
-      "brcm,bcm3384-switch"
-      "brcm,bcm6328-switch"
-      "brcm,bcm6368-switch" and the mandatory "brcm,bcm63xx-switch"
-
-Required properties for BCM585xx/586xx/88312 SoCs:
-
- - reg: a total of 3 register base addresses, the first one must be the
-   Switch Register Access block base, the second is the port 5/4 mux
-   configuration register and the third one is the SGMII configuration
-   and status register base address.
-
- - interrupts: a total of 13 interrupts must be specified, in the following
-   order: port 0-5, 7-8 link status change, then the integrated PHY interrupt,
-   then the timestamping interrupt and the sleep timer interrupts for ports
-   5,7,8.
-
-Optional properties for BCM585xx/586xx/88312 SoCs:
-
-  - reg-names: a total of 3 names matching the 3 base register address, must
-    be in the following order:
-	"srab"
-	"mux_config"
-	"sgmii_config"
-
-  - interrupt-names: a total of 13 names matching the 13 interrupts specified
-    must be in the following order:
-	"link_state_p0"
-	"link_state_p1"
-	"link_state_p2"
-	"link_state_p3"
-	"link_state_p4"
-	"link_state_p5"
-	"link_state_p7"
-	"link_state_p8"
-	"phy"
-	"ts"
-	"imp_sleep_timer_p5"
-	"imp_sleep_timer_p7"
-	"imp_sleep_timer_p8"
-
-See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of additional
-required and optional properties.
-
-Examples:
-
-Ethernet switch connected via MDIO to the host, CPU port wired to eth0:
-
-	eth0: ethernet@10001000 {
-		compatible = "brcm,unimac";
-		reg = <0x10001000 0x1000>;
-
-		fixed-link {
-			speed = <1000>;
-			full-duplex;
-		};
-	};
-
-	mdio0: mdio@10000000 {
-		compatible = "brcm,unimac-mdio";
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		switch0: ethernet-switch@1e {
-			compatible = "brcm,bcm53125";
-			reg = <30>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-
-			ports {
-				#address-cells = <1>;
-				#size-cells = <0>;
-
-				port0@0 {
-					reg = <0>;
-					label = "lan1";
-				};
-
-				port1@1 {
-					reg = <1>;
-					label = "lan2";
-				};
-
-				port5@5 {
-					reg = <5>;
-					label = "cable-modem";
-					fixed-link {
-						speed = <1000>;
-						full-duplex;
-					};
-					phy-mode = "rgmii-txid";
-				};
-
-				port8@8 {
-					reg = <8>;
-					label = "cpu";
-					fixed-link {
-						speed = <1000>;
-						full-duplex;
-					};
-					phy-mode = "rgmii-txid";
-					ethernet = <&eth0>;
-				};
-			};
-		};
-	};
diff --git a/MAINTAINERS b/MAINTAINERS
index 14c2b168e077..79dca6ec803d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3393,7 +3393,7 @@ M:	Florian Fainelli <f.fainelli@gmail.com>
 L:	netdev@vger.kernel.org
 L:	openwrt-devel@lists.openwrt.org (subscribers-only)
 S:	Supported
-F:	Documentation/devicetree/bindings/net/dsa/b53.txt
+F:	Documentation/devicetree/bindings/net/dsa/b53.yaml
 F:	drivers/net/dsa/b53/*
 F:	include/linux/platform_data/b53.h
 
-- 
2.26.2

Re: [PATCH net-next 1/2] dt-bindings: net: dsa: b53: Add YAML bindings

[Florian Fainelli]

On 10/10/2020 9:46 AM, Kurt Kanzenbach wrote:
> Convert the b53 DSA device tree bindings to YAML in order to allow
> for automatic checking and such.
> 
> Suggested-by: Florian Fainelli <f.fainelli@gmail.com>
> Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>

Thanks for making this change, there are quite a few warnings that are 
going to show up because the binding was defined in a way that it would 
define chip compatible strings, which not all DTS files are using. I 
don't know if Rob would be comfortable with taking this until we resolve 
all warnings first.
-- 
Florian

Re: [PATCH net-next 1/2] dt-bindings: net: dsa: b53: Add YAML bindings

[Kurt Kanzenbach]

[-- Attachment #1: Type: text/plain, Size: 1572 bytes --]

On Sat Oct 10 2020, Florian Fainelli wrote:
> On 10/10/2020 9:46 AM, Kurt Kanzenbach wrote:
>> Convert the b53 DSA device tree bindings to YAML in order to allow
>> for automatic checking and such.
>> 
>> Suggested-by: Florian Fainelli <f.fainelli@gmail.com>
>> Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
>
> Thanks for making this change, there are quite a few warnings that are 
> going to show up because the binding was defined in a way that it would 
> define chip compatible strings, which not all DTS files are using.

Oh, I didn't know there is a second make command for doing the actual
check against the dtbs. I've just used `make dt_binding_check'.

So, it seems like a lot of the errors are caused by the include files
such as

[linux]/arch/arm/boot/dts/bcm5301x.dtsi

	srab: srab@18007000 {
		compatible = "brcm,bcm5301x-srab";
		reg = <0x18007000 0x1000>;

		status = "disabled";

		/* ports are defined in board DTS */
	};

The nodename should be "switch" not "srab" as enforced by
dsa.yaml. Furthermore, some DTS files are not adding the chip specific
compatible strings and the ports leading to more errors.

There are also some minor errors regarding the reg-names and such for
specific instances.

How should we proceed? Adding the missing compatible strings and ports
to the DTS files? Or adjusting the include files?

> I don't know if Rob would be comfortable with taking this until we
> resolve all warnings first.

Probably not. We should fix the existing device trees first.

Thanks,
Kurt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 865 bytes --]

Re: [PATCH net-next 1/2] dt-bindings: net: dsa: b53: Add YAML bindings

[Florian Fainelli]

On 10/11/2020 1:32 AM, Kurt Kanzenbach wrote:
> On Sat Oct 10 2020, Florian Fainelli wrote:
>> On 10/10/2020 9:46 AM, Kurt Kanzenbach wrote:
>>> Convert the b53 DSA device tree bindings to YAML in order to allow
>>> for automatic checking and such.
>>>
>>> Suggested-by: Florian Fainelli <f.fainelli@gmail.com>
>>> Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
>>
>> Thanks for making this change, there are quite a few warnings that are
>> going to show up because the binding was defined in a way that it would
>> define chip compatible strings, which not all DTS files are using.
> 
> Oh, I didn't know there is a second make command for doing the actual
> check against the dtbs. I've just used `make dt_binding_check'.
> 
> So, it seems like a lot of the errors are caused by the include files
> such as
> 
> [linux]/arch/arm/boot/dts/bcm5301x.dtsi
> 
> 	srab: srab@18007000 {
> 		compatible = "brcm,bcm5301x-srab";
> 		reg = <0x18007000 0x1000>;
> 
> 		status = "disabled";
> 
> 		/* ports are defined in board DTS */
> 	};
> 
> The nodename should be "switch" not "srab" as enforced by
> dsa.yaml. Furthermore, some DTS files are not adding the chip specific
> compatible strings and the ports leading to more errors.
> 
> There are also some minor errors regarding the reg-names and such for
> specific instances.
> 
> How should we proceed? Adding the missing compatible strings and ports
> to the DTS files? Or adjusting the include files?

The include is correct as it provides the fallback family string which 
is what the driver will be looking for unless we do not provide a chip 
compatible. The various DTS should be updated to contain both the chip 
compatible and the fallback family (brcm,bcm5301x-srab) string, I will 
update the various DTS and submit these for review later next week.

Then we could imagine me taking this YAML change through the Broadcom 
ARM SoC pull requests that way no new regressions are introduced.

Sounds good?
-- 
Florian

Re: [PATCH net-next 1/2] dt-bindings: net: dsa: b53: Add YAML bindings

[Kurt Kanzenbach]

[-- Attachment #1: Type: text/plain, Size: 1063 bytes --]

On Sun Oct 11 2020, Florian Fainelli wrote:
> On 10/11/2020 1:32 AM, Kurt Kanzenbach wrote:
>> How should we proceed? Adding the missing compatible strings and ports
>> to the DTS files? Or adjusting the include files?
>
> The include is correct as it provides the fallback family string which 
> is what the driver will be looking for unless we do not provide a chip 
> compatible. The various DTS should be updated to contain both the chip 
> compatible and the fallback family (brcm,bcm5301x-srab) string, I will 
> update the various DTS and submit these for review later next week.

OK. It's not just the compatible strings, there are other issues as
well. You can check with `make dtbs_check DT_SCHEMA_FILES=path/to/b53.yaml'.

>
> Then we could imagine me taking this YAML change through the Broadcom 
> ARM SoC pull requests that way no new regressions are introduced.
>
> Sounds good?

Sounds like a plan. But, Rob or other device tree maintainers should
have a look at the YAML file to spot issues in there first.

Thanks,
Kurt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: [PATCH net-next 2/2] dt-bindings: net: dsa: b53: Drop old bindings

[Rob Herring]

On Sat, Oct 10, 2020 at 06:46:27PM +0200, Kurt Kanzenbach wrote:
> The device tree bindings have been converted to YAML. No need to keep
> the text file around. Update MAINTAINERS file accordingly.

You can squash this into the previous patch.

> 
> Signed-off-by: Kurt Kanzenbach <kurt@kmk-computers.de>
> ---
>  .../devicetree/bindings/net/dsa/b53.txt       | 149 ------------------
>  MAINTAINERS                                   |   2 +-
>  2 files changed, 1 insertion(+), 150 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/net/dsa/b53.txt
> 
> diff --git a/Documentation/devicetree/bindings/net/dsa/b53.txt b/Documentation/devicetree/bindings/net/dsa/b53.txt
> deleted file mode 100644
> index f1487a751b1a..000000000000
> --- a/Documentation/devicetree/bindings/net/dsa/b53.txt
> +++ /dev/null
> @@ -1,149 +0,0 @@
> -Broadcom BCM53xx Ethernet switches
> -==================================
> -
> -Required properties:
> -
> -- compatible: For external switch chips, compatible string must be exactly one
> -  of: "brcm,bcm5325"
> -      "brcm,bcm53115"
> -      "brcm,bcm53125"
> -      "brcm,bcm53128"
> -      "brcm,bcm5365"
> -      "brcm,bcm5395"
> -      "brcm,bcm5389"
> -      "brcm,bcm5397"
> -      "brcm,bcm5398"
> -
> -  For the BCM11360 SoC, must be:
> -      "brcm,bcm11360-srab" and the mandatory "brcm,cygnus-srab" string
> -
> -  For the BCM5310x SoCs with an integrated switch, must be one of:
> -      "brcm,bcm53010-srab"
> -      "brcm,bcm53011-srab"
> -      "brcm,bcm53012-srab"
> -      "brcm,bcm53018-srab"
> -      "brcm,bcm53019-srab" and the mandatory "brcm,bcm5301x-srab" string
> -
> -  For the BCM5831X/BCM1140x SoCs with an integrated switch, must be one of:
> -      "brcm,bcm11404-srab"
> -      "brcm,bcm11407-srab"
> -      "brcm,bcm11409-srab"
> -      "brcm,bcm58310-srab"
> -      "brcm,bcm58311-srab"
> -      "brcm,bcm58313-srab" and the mandatory "brcm,omega-srab" string
> -
> -  For the BCM585xx/586XX/88312 SoCs with an integrated switch, must be one of:
> -      "brcm,bcm58522-srab"
> -      "brcm,bcm58523-srab"
> -      "brcm,bcm58525-srab"
> -      "brcm,bcm58622-srab"
> -      "brcm,bcm58623-srab"
> -      "brcm,bcm58625-srab"
> -      "brcm,bcm88312-srab" and the mandatory "brcm,nsp-srab string
> -
> -  For the BCM63xx/33xx SoCs with an integrated switch, must be one of:
> -      "brcm,bcm3384-switch"
> -      "brcm,bcm6328-switch"
> -      "brcm,bcm6368-switch" and the mandatory "brcm,bcm63xx-switch"
> -
> -Required properties for BCM585xx/586xx/88312 SoCs:
> -
> - - reg: a total of 3 register base addresses, the first one must be the
> -   Switch Register Access block base, the second is the port 5/4 mux
> -   configuration register and the third one is the SGMII configuration
> -   and status register base address.
> -
> - - interrupts: a total of 13 interrupts must be specified, in the following
> -   order: port 0-5, 7-8 link status change, then the integrated PHY interrupt,
> -   then the timestamping interrupt and the sleep timer interrupts for ports
> -   5,7,8.
> -
> -Optional properties for BCM585xx/586xx/88312 SoCs:
> -
> -  - reg-names: a total of 3 names matching the 3 base register address, must
> -    be in the following order:
> -	"srab"
> -	"mux_config"
> -	"sgmii_config"
> -
> -  - interrupt-names: a total of 13 names matching the 13 interrupts specified
> -    must be in the following order:
> -	"link_state_p0"
> -	"link_state_p1"
> -	"link_state_p2"
> -	"link_state_p3"
> -	"link_state_p4"
> -	"link_state_p5"
> -	"link_state_p7"
> -	"link_state_p8"
> -	"phy"
> -	"ts"
> -	"imp_sleep_timer_p5"
> -	"imp_sleep_timer_p7"
> -	"imp_sleep_timer_p8"
> -
> -See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of additional
> -required and optional properties.
> -
> -Examples:
> -
> -Ethernet switch connected via MDIO to the host, CPU port wired to eth0:
> -
> -	eth0: ethernet@10001000 {
> -		compatible = "brcm,unimac";
> -		reg = <0x10001000 0x1000>;
> -
> -		fixed-link {
> -			speed = <1000>;
> -			full-duplex;
> -		};
> -	};
> -
> -	mdio0: mdio@10000000 {
> -		compatible = "brcm,unimac-mdio";
> -		#address-cells = <1>;
> -		#size-cells = <0>;
> -
> -		switch0: ethernet-switch@1e {
> -			compatible = "brcm,bcm53125";
> -			reg = <30>;
> -			#address-cells = <1>;
> -			#size-cells = <0>;
> -
> -			ports {
> -				#address-cells = <1>;
> -				#size-cells = <0>;
> -
> -				port0@0 {
> -					reg = <0>;
> -					label = "lan1";
> -				};
> -
> -				port1@1 {
> -					reg = <1>;
> -					label = "lan2";
> -				};
> -
> -				port5@5 {
> -					reg = <5>;
> -					label = "cable-modem";
> -					fixed-link {
> -						speed = <1000>;
> -						full-duplex;
> -					};
> -					phy-mode = "rgmii-txid";
> -				};
> -
> -				port8@8 {
> -					reg = <8>;
> -					label = "cpu";
> -					fixed-link {
> -						speed = <1000>;
> -						full-duplex;
> -					};
> -					phy-mode = "rgmii-txid";
> -					ethernet = <&eth0>;
> -				};
> -			};
> -		};
> -	};
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 14c2b168e077..79dca6ec803d 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3393,7 +3393,7 @@ M:	Florian Fainelli <f.fainelli@gmail.com>
>  L:	netdev@vger.kernel.org
>  L:	openwrt-devel@lists.openwrt.org (subscribers-only)
>  S:	Supported
> -F:	Documentation/devicetree/bindings/net/dsa/b53.txt
> +F:	Documentation/devicetree/bindings/net/dsa/b53.yaml
>  F:	drivers/net/dsa/b53/*
>  F:	include/linux/platform_data/b53.h
>  
> -- 
> 2.26.2
> 

Re: [PATCH net-next 1/2] dt-bindings: net: dsa: b53: Add YAML bindings

[Rob Herring]

On Mon, Oct 12, 2020 at 07:45:10AM +0200, Kurt Kanzenbach wrote:
> On Sun Oct 11 2020, Florian Fainelli wrote:
> > On 10/11/2020 1:32 AM, Kurt Kanzenbach wrote:
> >> How should we proceed? Adding the missing compatible strings and ports
> >> to the DTS files? Or adjusting the include files?
> >
> > The include is correct as it provides the fallback family string which 
> > is what the driver will be looking for unless we do not provide a chip 
> > compatible. The various DTS should be updated to contain both the chip 
> > compatible and the fallback family (brcm,bcm5301x-srab) string, I will 
> > update the various DTS and submit these for review later next week.
> 
> OK. It's not just the compatible strings, there are other issues as
> well. You can check with `make dtbs_check DT_SCHEMA_FILES=path/to/b53.yaml'.
> 
> >
> > Then we could imagine me taking this YAML change through the Broadcom 
> > ARM SoC pull requests that way no new regressions are introduced.
> >
> > Sounds good?
> 
> Sounds like a plan. But, Rob or other device tree maintainers should
> have a look at the YAML file to spot issues in there first.

Looks pretty good to me.

Rob

Re: [PATCH net-next 2/2] dt-bindings: net: dsa: b53: Drop old bindings

[Kurt Kanzenbach]

[-- Attachment #1: Type: text/plain, Size: 346 bytes --]

On Mon Oct 12 2020, Rob Herring wrote:
> On Sat, Oct 10, 2020 at 06:46:27PM +0200, Kurt Kanzenbach wrote:
>> The device tree bindings have been converted to YAML. No need to keep
>> the text file around. Update MAINTAINERS file accordingly.
>
> You can squash this into the previous patch.

OK, sure.

@Florian: Should I send a v2?

Thanks,
Kurt

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

Re: [PATCH net-next 2/2] dt-bindings: net: dsa: b53: Drop old bindings

[Florian Fainelli]

On 10/15/2020 12:05 AM, Kurt Kanzenbach wrote:
> On Mon Oct 12 2020, Rob Herring wrote:
>> On Sat, Oct 10, 2020 at 06:46:27PM +0200, Kurt Kanzenbach wrote:
>>> The device tree bindings have been converted to YAML. No need to keep
>>> the text file around. Update MAINTAINERS file accordingly.
>>
>> You can squash this into the previous patch.
> 
> OK, sure.
> 
> @Florian: Should I send a v2?

I don't think that is necessary, I will do the clean-up of arch/arm/ and 
arch/arm64 and merge your two patches and submit everything as a series 
once completed. There is no rush here AFAICT.
-- 
Florian