ARM: dts: NSP: Add bcm958623hr board name to dts
Subsystems (2)
PATCH v2 1/5 ARM: dts: NSP: Add bcm958623hr board name to dts
This board was previously added to Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml however the dts file was not updated to reflect this change. This patch corrects bcm958623hr.dts by adding the board name to the compatible.
--- arch/arm/boot/dts/bcm958623hr.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/bcm958623hr.dts +1 -1
@@ -37,7 +37,7 @@ / { model = "NorthStar Plus SVK (BCM958623HR)"; - compatible = "brcm,bcm58623", "brcm,nsp"; + compatible = "brcm,bcm958623hr", "brcm,bcm58623", "brcm,nsp"; chosen { stdout-path = "serial0:115200n8";
Signature · 1 line
2.27.0
PATCH v2 2/5 ARM: dts: NSP: Fix mpcore, mmc node names
Running dtbs_check yielded the issues with bcm-nsp.dtsi.
Firstly this patch fixes the following message by appending "-bus" to
the mpcore node name:
mpcore@19000000: $nodename:0: 'mpcore@19000000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$'
Secondly mmc node name. The label name can remain as is. sdhci@21000: $nodename:0: 'sdhci@21000' does not match '^mmc(@.*)?$'
--- arch/arm/boot/dts/bcm-nsp.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/bcm-nsp.dtsi +2 -2
@@ -77,7 +77,7 @@ pmu { interrupt-affinity = <&cpu0>, <&cpu1>; }; - mpcore@19000000 { + mpcore-bus@19000000 { compatible = "simple-bus"; ranges = <0x00000000 0x19000000 0x00023000>; #address-cells = <1>;
@@ -219,7 +219,7 @@ dma: dma@20000 { status = "disabled"; }; - sdio: sdhci@21000 { + sdio: mmc@21000 { compatible = "brcm,sdhci-iproc-cygnus"; reg = <0x21000 0x100>; interrupts = <GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>;
Signature · 1 line
2.27.0
Florian Fainelli
AppliedRe: [PATCH v2 2/5] ARM: dts: NSP: Fix mpcore, mmc node names
Quoted 11 lines · Matthew Hagan
Running
dtbs_checkyielded the issues withbcm-nsp.dtsi.Firstly this patch fixes the following message by appending "-bus" to
the mpcore node name:
mpcore@19000000: $nodename:0: 'mpcore@19000000' does not match '^([a-z][a-z0-9\\-]+-bus|bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$'Secondly mmc node name. The label name can remain as is. sdhci@21000: $nodename:0: 'sdhci@21000' does not match '^mmc(@.*)?$'
Signed-off-by Matthew Hagan <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian
PATCH v2 3/5 ARM: dts: NSP: Fix MDIO mux node names
In reply to Matthew HaganWhile functional, the mdio-mux-mmioreg binding does not conform to Documentation/devicetree/bindings/net/mdio-mux-mmioreg.yaml in that an mdio-mux compatible is also required. Without this the following output is observed when running dtbs_check:
mdio-mux@32000: compatible: ['mdio-mux-mmioreg'] is too short
This change brings conformance to this requirement and corresponds likewise to Rafal Milecki's change to the BCM5301x platform[1].
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/T/
--- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/bcm-nsp.dtsi +1 -1
@@ -371,7 +371,7 @@ mdio: mdio@32000 { }; mdio-mux@32000 { - compatible = "mdio-mux-mmioreg"; + compatible = "mdio-mux-mmioreg", "mdio-mux"; reg = <0x32000 0x4>; mux-mask = <0x200>; #address-cells = <1>;
arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi +1 -1
@@ -72,7 +72,7 @@ led-5 { }; mdio-mii-mux { - compatible = "mdio-mux-mmioreg"; + compatible = "mdio-mux-mmioreg", "mdio-mux"; reg = <0x1803f1c0 0x4>; mux-mask = <0x2000>; mdio-parent-bus = <&mdio_ext>;
Signature · 1 line
2.27.0
Re: [PATCH v2 3/5] ARM: dts: NSP: Fix MDIO mux node names
Quoted 5 lines · Matthew Hagan
While functional, the mdio-mux-mmioreg binding does not conform to
Documentation/devicetree/bindings/net/mdio-mux-mmioreg.yamlin that an mdio-mux compatible is also required. Without this the following output is observed when runningdtbs_check:
Quoted 8 lines
mdio-mux@32000: compatible: ['mdio-mux-mmioreg'] is too short
This change brings conformance to this requirement and corresponds likewise to Rafal Milecki's change to the BCM5301x platform[1].
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/T/
Signed-off-by Matthew Hagan <[email protected]>
Thanks for the expanded commit message.
Andrew
Florian Fainelli
AppliedRe: [PATCH v2 3/5] ARM: dts: NSP: Fix MDIO mux node names
In reply to Matthew HaganQuoted 7 lines · Matthew Hagan
While functional, the mdio-mux-mmioreg binding does not conform to
Documentation/devicetree/bindings/net/mdio-mux-mmioreg.yamlin that an mdio-mux compatible is also required. Without this the following output is observed when runningdtbs_check:mdio-mux@32000: compatible: ['mdio-mux-mmioreg'] is too short
Quoted 7 lines
This change brings conformance to this requirement and corresponds likewise to Rafal Milecki's change to the BCM5301x platform[1].
[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/T/
Signed-off-by Matthew Hagan <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian
PATCH v2 4/5 ARM: dts: NSP: Fix MX64/MX65 eeprom node name
In reply to Matthew HaganRunning dtbs_check yields the following message when checking the MX64/MX65 devicetree:
at24@50: $nodename:0: 'at24@50' does not match '^eeprom@[0-9a-f]{1,2}$'
This patch fixes the issue by renaming the at24 node appropriately.
--- arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi +1 -1
@@ -48,7 +48,7 @@ &ehci0 { &i2c0 { status = "okay"; - at24@50 { + eeprom@50 { compatible = "atmel,24c64"; reg = <0x50>; pagesize = <32>;
Signature · 1 line
2.27.0
Florian Fainelli
AppliedRe: [PATCH v2 4/5] ARM: dts: NSP: Fix MX64/MX65 eeprom node name
Quoted 8 lines · Matthew Hagan
Running
dtbs_checkyields the following message when checking the MX64/MX65 devicetree:
at24@50: $nodename:0: 'at24@50' does not match '^eeprom@[0-9a-f]{1,2}$'This patch fixes the issue by renaming the at24 node appropriately.
Signed-off-by Matthew Hagan <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian
PATCH v2 5/5 ARM: dts: NSP: Fix MX65 MDIO mux warnings
In reply to Matthew HaganThe naming of this node is based upon that of the initial EA9500 dts[1]. However this does not conform with the mdio-mux format, yielding the following message when running dtbs_check:
mdio-mii-mux: $nodename:0: 'mdio-mii-mux' does not match '^mdio-mux[\\-@]?'
Secondly, this node should be moved to within the axi node and given the appropriate unit address. This also requires exposing the axi node via a
label in bcm-nsp.dtsi. This fixes the following warning:
Warning (unit_address_vs_reg): /mdio-mii-mux: node has a reg or ranges property, but no unit name
[1]https://patchwork.ozlabs.org/project/linux-imx/patch/[email protected]/#1941353
--- arch/arm/boot/dts/bcm-nsp.dtsi | 2 +- arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-)
arch/arm/boot/dts/bcm-nsp.dtsi +1 -1
@@ -166,7 +166,7 @@ periph_clk: periph_clk { }; }; - axi@18000000 { + axi: axi@18000000 { compatible = "simple-bus"; ranges = <0x00000000 0x18000000 0x0011c40c>; #address-cells = <1>;
arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi +4 -2
@@ -70,10 +70,12 @@ led-5 { gpios = <&gpioa 31 GPIO_ACTIVE_HIGH>; }; }; +}; - mdio-mii-mux { +&axi { + mdio-mux@3f1c0 { compatible = "mdio-mux-mmioreg", "mdio-mux"; - reg = <0x1803f1c0 0x4>; + reg = <0x3f1c0 0x4>; mux-mask = <0x2000>; mdio-parent-bus = <&mdio_ext>; #address-cells = <1>;
Signature · 1 line
2.27.0
Florian Fainelli
AppliedRe: [PATCH v2 5/5] ARM: dts: NSP: Fix MX65 MDIO mux warnings
Quoted 10 lines · Matthew Hagan
The naming of this node is based upon that of the initial EA9500 dts[1]. However this does not conform with the mdio-mux format, yielding the following message when running
dtbs_check:
mdio-mii-mux: $nodename:0: 'mdio-mii-mux' does not match '^mdio-mux[\\-@]?'Secondly, this node should be moved to within the axi node and given the appropriate unit address. This also requires exposing the axi node via a
label inbcm-nsp.dtsi. This fixes the following warning:
Warning (unit_address_vs_reg): /mdio-mii-mux: node has a reg or ranges property, but no unit name
Quoted 4 lines
[1]https://patchwork.ozlabs.org/project/linux-imx/patch/[email protected]/#1941353
Signed-off-by Matthew Hagan <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian
Florian Fainelli
AppliedQuoted 7 lines · Matthew Hagan
This board was previously added to
Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yamlhowever the dts file was not updated to reflect this change. This patch correctsbcm958623hr.dtsby adding the board name to the compatible.Signed-off-by Matthew Hagan <[email protected]>---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks! --
Florian