Broadcom b53 YAML bindings
Subsystems (6)
v2 cover Broadcom b53 YAML bindings
Hi,
This patch series fixes the various Broadcom SoCs DTS files and the existing YAML binding for missing properties before adding a proper b53 switch YAML binding from Kurt.
If this all looks good, given that there are quite a few changes to the DTS files, it might be best if I take them through the upcoming Broadcom ARM SoC pull requests. Let me know if you would like those patches to be applied differently.
Thanks!
Changes in v2:
- collected Reviewed-by and Acked-by tags from Vladimir and Rob
- corrected BCM5301X default compatibles based on data provided by Rafal on his different devices
- updated strategy for NSP to tackle each board separately
- provide both a ports {} container node and its #address-cells and #size-cells properties
- renamed binding from b53.yaml to brcm,b53.yaml
Florian Fainelli (9):
dt-bindings: net: dsa: Extend switch nodes pattern
dt-bindings: net: dsa: Document sfp and managed properties
ARM: dts: BCM5301X: Update Ethernet switch node name
ARM: dts: BCM5301X: Add a default compatible for switch node
ARM: dts: BCM5301X: Provide defaults ports container node
ARM: dts: NSP: Update ethernet switch node name
ARM: dts: NSP: Fix Ethernet switch SGMII register name
ARM: dts: NSP: Add a SRAB compatible string for each board
ARM: dts: NSP: Provide defaults ports container node
Kurt Kanzenbach (1):
dt-bindings: net: dsa: b53: Add YAML bindings
.../devicetree/bindings/net/dsa/b53.txt | 149 ----------- .../devicetree/bindings/net/dsa/brcm,b53.yaml | 249 ++++++++++++++++++ .../devicetree/bindings/net/dsa/dsa.yaml | 6 +- MAINTAINERS | 2 +- arch/arm/boot/dts/bcm-nsp.dtsi | 8 +- arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 - arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 - arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 - arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 - arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 - arch/arm/boot/dts/bcm4709.dtsi | 4 + .../boot/dts/bcm47094-linksys-panamera.dts | 3 - arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 3 - arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 3 - arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 - .../boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 3 - arch/arm/boot/dts/bcm47094.dtsi | 4 + arch/arm/boot/dts/bcm5301x.dtsi | 8 +- arch/arm/boot/dts/bcm953012er.dts | 3 - arch/arm/boot/dts/bcm958522er.dts | 4 + arch/arm/boot/dts/bcm958525er.dts | 4 + arch/arm/boot/dts/bcm958525xmc.dts | 4 + arch/arm/boot/dts/bcm958622hr.dts | 3 - arch/arm/boot/dts/bcm958623hr.dts | 3 - arch/arm/boot/dts/bcm958625hr.dts | 3 - arch/arm/boot/dts/bcm958625k.dts | 3 - arch/arm/boot/dts/bcm988312hr.dts | 3 - 27 files changed, 287 insertions(+), 203 deletions(-) delete mode 100644 Documentation/devicetree/bindings/net/dsa/b53.txt create mode 100644 Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 1/10 dt-bindings: net: dsa: Extend switch nodes pattern
Upon discussion with Kurt, Rob and Vladimir it appears that we should be allowing ethernet-switch as a node name, update dsa.yaml accordingly.
--- Documentation/devicetree/bindings/net/dsa/dsa.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/devicetree/bindings/net/dsa/dsa.yaml +1 -1
@@ -20,7 +20,7 @@ select: false properties: $nodename: - pattern: "^switch(@.*)?$" + pattern: "^(ethernet-)?switch(@.*)?$" dsa,member: minItems: 2
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 2/10 dt-bindings: net: dsa: Document sfp and managed properties
In reply to Florian FainelliThe 'sfp' and 'managed' properties are commonly used to describe Ethernet switch ports connecting to SFP/SFF cages, describe these two properties as valid that we inherit from ethernet-controller.yaml.
--- Documentation/devicetree/bindings/net/dsa/dsa.yaml | 4 ++++ 1 file changed, 4 insertions(+)
Documentation/devicetree/bindings/net/dsa/dsa.yaml +4 -0
@@ -78,6 +78,10 @@ patternProperties: mac-address: true + sfp: true + + managed: true + required: - reg
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 3/10 ARM: dts: BCM5301X: Update Ethernet switch node name
In reply to Florian FainelliUpdate the switch unit name from srab to ethernet-switch, allowing us to fix warnings such as:
CHECK arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dt.yamlarch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dt.yaml:
srab@18007000: $nodename:0: 'srab@18007000' does not match '^(ethernet-)?switch(@.*)?$'
From schema:Documentation/devicetree/bindings/net/dsa/b53.yaml
--- arch/arm/boot/dts/bcm5301x.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/bcm5301x.dtsi +1 -1
@@ -483,7 +483,7 @@ thermal: thermal@2c0 { }; }; - srab: srab@18007000 { + srab: ethernet-switch@18007000 { compatible = "brcm,bcm5301x-srab"; reg = <0x18007000 0x1000>;
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 4/10 ARM: dts: BCM5301X: Add a default compatible for switch node
In reply to Florian FainelliProvide a default compatible string which is based on the 53011 SRAB compatible by default. The 4709 and 47094 default to the 53012 SRAB compatible.
This allows us to have sane defaults and silences the following warnings:
arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dt.yaml:
ethernet-switch@18007000: compatible: 'oneOf' conditional failed, one must be fixed:
['brcm,bcm5301x-srab'] is too short
'brcm,bcm5325' was expected
'brcm,bcm53115' was expected
'brcm,bcm53125' was expected
'brcm,bcm53128' was expected
'brcm,bcm5365' was expected
'brcm,bcm5395' was expected
'brcm,bcm5389' was expected
'brcm,bcm5397' was expected
'brcm,bcm5398' was expected
'brcm,bcm11360-srab' was expected
'brcm,bcm5301x-srab' is not one of ['brcm,bcm53010-srab',
'brcm,bcm53011-srab', 'brcm,bcm53012-srab', 'brcm,bcm53018-srab',
'brcm,bcm53019-srab']
'brcm,bcm5301x-srab' is not one of ['brcm,bcm11404-srab',
'brcm,bcm11407-srab', 'brcm,bcm11409-srab', 'brcm,bcm58310-srab',
'brcm,bcm58311-srab', 'brcm,bcm58313-srab']
'brcm,bcm5301x-srab' is not one of ['brcm,bcm58522-srab',
'brcm,bcm58523-srab', 'brcm,bcm58525-srab', 'brcm,bcm58622-srab',
'brcm,bcm58623-srab', 'brcm,bcm58625-srab', 'brcm,bcm88312-srab']
'brcm,bcm5301x-srab' is not one of ['brcm,bcm3384-switch','brcm,bcm6328-switch', 'brcm,bcm6368-switch']
From schema:Documentation/devicetree/bindings/net/dsa/b53.yaml
--- arch/arm/boot/dts/bcm4709.dtsi | 4 ++++ arch/arm/boot/dts/bcm47094.dtsi | 4 ++++ arch/arm/boot/dts/bcm5301x.dtsi | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-)
arch/arm/boot/dts/bcm4709.dtsi +4 -0
@@ -9,3 +9,7 @@ &uart0 { clock-frequency = <125000000>; status = "okay"; }; + +&srab { + compatible = "brcm,bcm53012-srab", "brcm,bcm5301x-srab"; +};
arch/arm/boot/dts/bcm47094.dtsi +4 -0
@@ -25,3 +25,7 @@ &uart0 { clock-frequency = <125000000>; status = "okay"; }; + +&srab { + compatible = "brcm,bcm53012-srab", "brcm,bcm5301x-srab"; +};
arch/arm/boot/dts/bcm5301x.dtsi +1 -1
@@ -484,7 +484,7 @@ thermal: thermal@2c0 { }; srab: ethernet-switch@18007000 { - compatible = "brcm,bcm5301x-srab"; + compatible = "brcm,bcm53011-srab", "brcm,bcm5301x-srab"; reg = <0x18007000 0x1000>; status = "disabled";
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 04/10] ARM: dts: BCM5301X: Add a default compatible for switch node
Quoted 7 lines · Florian Fainelli
Provide a default compatible string which is based on the 53011 SRAB compatible by default. The 4709 and 47094 default to the 53012 SRAB compatible.
(...)
Signed-off-by Florian Fainelli <[email protected]>
Looks good, thanks!
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 5/10 ARM: dts: BCM5301X: Provide defaults ports container node
In reply to Florian FainelliProvide an empty 'ports' container node with the correct #address-cells and #size-cells properties. This silences the following warning:
arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dt.yaml:
ethernet-switch@18007000: 'oneOf' conditional failed, one must be fixed:
'ports' is a required property
'ethernet-ports' is a required property
From schema:Documentation/devicetree/bindings/net/dsa/b53.yaml
--- arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts | 3 --- arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts | 3 --- arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts | 3 --- arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts | 3 --- arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts | 3 --- arch/arm/boot/dts/bcm47094-linksys-panamera.dts | 3 --- arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts | 3 --- arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts | 3 --- arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts | 3 --- arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts | 3 --- arch/arm/boot/dts/bcm5301x.dtsi | 4 ++++ arch/arm/boot/dts/bcm953012er.dts | 3 --- 12 files changed, 4 insertions(+), 33 deletions(-)
arch/arm/boot/dts/bcm4708-luxul-xap-1510.dts +0 -3
@@ -65,9 +65,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "poe";
arch/arm/boot/dts/bcm4708-luxul-xwc-1000.dts +0 -3
@@ -72,9 +72,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@4 { reg = <4>; label = "lan";
arch/arm/boot/dts/bcm4708-smartrg-sr400ac.dts +0 -3
@@ -122,9 +122,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "lan4";
arch/arm/boot/dts/bcm47081-luxul-xap-1410.dts +0 -3
@@ -65,9 +65,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@4 { reg = <4>; label = "poe";
arch/arm/boot/dts/bcm47081-luxul-xwr-1200.dts +0 -3
@@ -113,9 +113,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "lan4";
arch/arm/boot/dts/bcm47094-linksys-panamera.dts +0 -3
@@ -201,9 +201,6 @@ &srab { dsa,member = <0 0>; ports { - #address-cells = <1>; - #size-cells = <0>; - port@1 { reg = <1>; label = "lan7";
arch/arm/boot/dts/bcm47094-luxul-xap-1610.dts +0 -3
@@ -59,9 +59,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "poe";
arch/arm/boot/dts/bcm47094-luxul-xwc-2000.dts +0 -3
@@ -57,9 +57,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "lan";
arch/arm/boot/dts/bcm47094-luxul-xwr-3100.dts +0 -3
@@ -108,9 +108,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "lan4";
arch/arm/boot/dts/bcm47094-luxul-xwr-3150-v1.dts +0 -3
@@ -79,9 +79,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "lan4";
arch/arm/boot/dts/bcm5301x.dtsi +4 -0
@@ -490,6 +490,10 @@ srab: ethernet-switch@18007000 { status = "disabled"; /* ports are defined in board DTS */ + ports { + #address-cells = <1>; + #size-cells = <0>; + }; }; rng: rng@18004000 {
arch/arm/boot/dts/bcm953012er.dts +0 -3
@@ -69,9 +69,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { reg = <0>; label = "port0";
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 05/10] ARM: dts: BCM5301X: Provide defaults ports container node
Quoted 11 lines · Florian Fainelli
Provide an empty 'ports' container node with the correct #address-cells and #size-cells properties. This silences the following warning:
arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dt.yaml:
ethernet-switch@18007000: 'oneOf' conditional failed, one must be fixed:
'ports' is a required property
'ethernet-ports' is a required property
From schema:Documentation/devicetree/bindings/net/dsa/b53.yamlSigned-off-by Florian Fainelli <[email protected]>
Nice!
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 6/10 ARM: dts: NSP: Update ethernet switch node name
In reply to Florian FainelliUpdate the switch unit name from srab to ethernet-switch, allowing us to fix warnings such as:
CHECK arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dt.yaml
arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dt.yaml:
srab@18007000: $nodename:0: 'srab@18007000' does not match
'^(ethernet-)?switch(@.*)?$'
From schema:
Documentation/devicetree/bindings/net/dsa/b53.yaml--- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/bcm-nsp.dtsi +1 -1
@@ -385,7 +385,7 @@ ccbtimer1: timer@35000 { clock-names = "apb_pclk"; }; - srab: srab@36000 { + srab: ethernet-switch@36000 { compatible = "brcm,nsp-srab"; reg = <0x36000 0x1000>, <0x3f308 0x8>,
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 7/10 ARM: dts: NSP: Fix Ethernet switch SGMII register name
In reply to Florian FainelliThe register name should be "sgmii_config", not "sgmii", this is not a functional change since no code is currently looking for that register by name (or at all).
--- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/bcm-nsp.dtsi +1 -1
@@ -390,7 +390,7 @@ srab: ethernet-switch@36000 { reg = <0x36000 0x1000>, <0x3f308 0x8>, <0x3f410 0xc>; - reg-names = "srab", "mux_config", "sgmii"; + 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>,
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
PATCH v2 8/10 ARM: dts: NSP: Add a SRAB compatible string for each board
In reply to Florian FainelliProvide a valid compatible string for the Ethernet switch node based on the board including the switch. This allows us to have sane defaults and silences the following warnings:
arch/arm/boot/dts/bcm958522er.dt.yaml:
ethernet-switch@36000: compatible: 'oneOf' conditional failed,
one
must be fixed:
['brcm,bcm5301x-srab'] is too short
'brcm,bcm5325' was expected
'brcm,bcm53115' was expected
'brcm,bcm53125' was expected
'brcm,bcm53128' was expected
'brcm,bcm5365' was expected
'brcm,bcm5395' was expected
'brcm,bcm5389' was expected
'brcm,bcm5397' was expected
'brcm,bcm5398' was expected
'brcm,bcm11360-srab' was expected
'brcm,bcm5301x-srab' is not one of ['brcm,bcm53010-srab',
'brcm,bcm53011-srab', 'brcm,bcm53012-srab', 'brcm,bcm53018-srab',
'brcm,bcm53019-srab']
'brcm,bcm5301x-srab' is not one of ['brcm,bcm11404-srab',
'brcm,bcm11407-srab', 'brcm,bcm11409-srab', 'brcm,bcm58310-srab',
'brcm,bcm58311-srab', 'brcm,bcm58313-srab']
'brcm,bcm5301x-srab' is not one of ['brcm,bcm58522-srab',
'brcm,bcm58523-srab', 'brcm,bcm58525-srab', 'brcm,bcm58622-srab',
'brcm,bcm58623-srab', 'brcm,bcm58625-srab', 'brcm,bcm88312-srab']
'brcm,bcm5301x-srab' is not one of ['brcm,bcm3384-switch',
'brcm,bcm6328-switch', 'brcm,bcm6368-switch']
From schema:
Documentation/devicetree/bindings/net/dsa/b53.yaml--- arch/arm/boot/dts/bcm958522er.dts | 4 ++++ arch/arm/boot/dts/bcm958525er.dts | 4 ++++ arch/arm/boot/dts/bcm958525xmc.dts | 4 ++++ 3 files changed, 12 insertions(+)
arch/arm/boot/dts/bcm958522er.dts +4 -0
@@ -178,3 +178,7 @@ &usb3_phy { &xhci { status = "okay"; }; + +&srab { + compatible = "brcm,bcm58522-srab", "brcm,nsp-srab"; +};
arch/arm/boot/dts/bcm958525er.dts +4 -0
@@ -190,3 +190,7 @@ &usb3_phy { &xhci { status = "okay"; }; + +&srab { + compatible = "brcm,bcm58525-srab", "brcm,nsp-srab"; +};
arch/arm/boot/dts/bcm958525xmc.dts +4 -0
@@ -210,3 +210,7 @@ &usb3_phy { &xhci { status = "okay"; }; + +&srab { + compatible = "brcm,bcm58525-srab", "brcm,nsp-srab"; +};
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 08/10] ARM: dts: NSP: Add a SRAB compatible string for each board
Quoted 33 lines · Florian Fainelli
Provide a valid compatible string for the Ethernet switch node based on the board including the switch. This allows us to have sane defaults and silences the following warnings:
arch/arm/boot/dts/bcm958522er.dt.yaml:
ethernet-switch@36000: compatible: 'oneOf' conditional failed,
onemust be fixed: ['brcm,bcm5301x-srab'] is too short 'brcm,bcm5325' was expected 'brcm,bcm53115' was expected 'brcm,bcm53125' was expected 'brcm,bcm53128' was expected 'brcm,bcm5365' was expected 'brcm,bcm5395' was expected 'brcm,bcm5389' was expected 'brcm,bcm5397' was expected 'brcm,bcm5398' was expected 'brcm,bcm11360-srab' was expected 'brcm,bcm5301x-srab' is not one of ['brcm,bcm53010-srab', 'brcm,bcm53011-srab', 'brcm,bcm53012-srab', 'brcm,bcm53018-srab', 'brcm,bcm53019-srab'] 'brcm,bcm5301x-srab' is not one of ['brcm,bcm11404-srab', 'brcm,bcm11407-srab', 'brcm,bcm11409-srab', 'brcm,bcm58310-srab', 'brcm,bcm58311-srab', 'brcm,bcm58313-srab'] 'brcm,bcm5301x-srab' is not one of ['brcm,bcm58522-srab', 'brcm,bcm58523-srab', 'brcm,bcm58525-srab', 'brcm,bcm58622-srab', 'brcm,bcm58623-srab', 'brcm,bcm58625-srab', 'brcm,bcm88312-srab'] 'brcm,bcm5301x-srab' is not one of ['brcm,bcm3384-switch', 'brcm,bcm6328-switch', 'brcm,bcm6368-switch'] From schema: Documentation/devicetree/bindings/net/dsa/b53.yaml
Quoted 2 lines
Signed-off-by Florian Fainelli <[email protected]>---
PATCH v2 9/10 ARM: dts: NSP: Provide defaults ports container node
In reply to Florian FainelliProvide an empty 'ports' container node with the correct #address-cells and #size-cells properties. This silences the following warning:
arch/arm/boot/dts/bcm958522er.dt.yaml:
ethernet-switch@36000: 'oneOf' conditional failed, one must be fixed:
'ports' is a required property 'ethernet-ports' is a required property
From schema:Documentation/devicetree/bindings/net/dsa/b53.yaml
--- arch/arm/boot/dts/bcm-nsp.dtsi | 4 ++++ arch/arm/boot/dts/bcm958622hr.dts | 3 --- arch/arm/boot/dts/bcm958623hr.dts | 3 --- arch/arm/boot/dts/bcm958625hr.dts | 3 --- arch/arm/boot/dts/bcm958625k.dts | 3 --- arch/arm/boot/dts/bcm988312hr.dts | 3 --- 6 files changed, 4 insertions(+), 15 deletions(-)
arch/arm/boot/dts/bcm-nsp.dtsi +4 -0
@@ -420,6 +420,10 @@ srab: ethernet-switch@36000 { status = "disabled"; /* ports are defined in board DTS */ + ports { + #address-cells = <1>; + #size-cells = <0>; + }; }; i2c0: i2c@38000 {
arch/arm/boot/dts/bcm958622hr.dts +0 -3
@@ -176,9 +176,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { label = "port0"; reg = <0>;
arch/arm/boot/dts/bcm958623hr.dts +0 -3
@@ -180,9 +180,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { label = "port0"; reg = <0>;
arch/arm/boot/dts/bcm958625hr.dts +0 -3
@@ -195,9 +195,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { label = "port0"; reg = <0>;
arch/arm/boot/dts/bcm958625k.dts +0 -3
@@ -216,9 +216,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { label = "port0"; reg = <0>;
arch/arm/boot/dts/bcm988312hr.dts +0 -3
@@ -184,9 +184,6 @@ &srab { status = "okay"; ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { label = "port0"; reg = <0>;
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v2 09/10] ARM: dts: NSP: Provide defaults ports container node
Quoted 10 lines · Florian Fainelli
Provide an empty 'ports' container node with the correct #address-cells and #size-cells properties. This silences the following warning:
arch/arm/boot/dts/bcm958522er.dt.yaml:
ethernet-switch@36000: 'oneOf' conditional failed, one must be fixed:
'ports' is a required property 'ethernet-ports' is a required property
From schema:Documentation/devicetree/bindings/net/dsa/b53.yaml
Quoted 2 lines
Signed-off-by Florian Fainelli <[email protected]>---
So 'ports' is not going away and getting bulk-replaced with 'ethernet-ports'. Good.
PATCH v2 10/10 dt-bindings: net: dsa: b53: Add YAML bindings
In reply to Florian FainelliFrom: Kurt Kanzenbach <[email protected]>
Convert the b53 DSA device tree bindings to YAML in order to allow for automatic checking and such.
--- .../devicetree/bindings/net/dsa/b53.txt | 149 ----------- .../devicetree/bindings/net/dsa/brcm,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/brcm,b53.yaml
Documentation/devicetree/bindings/net/dsa/b53.txt deleted +0 -149
@@ -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 = <ð0>; - }; - }; - }; - };
Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml new file +249 -0
249 lines not on this page · raw message
MAINTAINERS +1 -1
@@ -3380,7 +3380,7 @@ M: Florian Fainelli <[email protected]> L: [email protected] L: [email protected] (subscribers-only) S: Supported -F: Documentation/devicetree/bindings/net/dsa/b53.txt +F: Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml F: drivers/net/dsa/b53/* F: include/linux/platform_data/b53.h
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Quoted 6 lines · Florian Fainelli
Hi,
This patch series fixes the various Broadcom SoCs DTS files and the existing YAML binding for missing properties before adding a proper b53 switch YAML binding from Kurt.
Quoted 6 lines
If this all looks good, given that there are quite a few changes to the DTS files, it might be best if I take them through the upcoming Broadcom ARM SoC pull requests. Let me know if you would like those patches to be applied differently.
Thanks!
Series applied to devicetree/next, thanks everyone.
Signature · 1 line
Florian