* [PATCH v2 1/5] ARM: dts: NSP: Add bcm958623hr board name to dts
@ 2021-08-29 22:37 Matthew Hagan
2021-08-29 22:37 ` [PATCH v2 2/5] ARM: dts: NSP: Fix mpcore, mmc node names Matthew Hagan
` (4 more replies)
0 siblings, 5 replies; 11+ messages in thread
From: Matthew Hagan @ 2021-08-29 22:37 UTC (permalink / raw)
Cc: Florian Fainelli, Andrew Lunn, Matthew Hagan, Rob Herring,
Ray Jui, Scott Branden, bcm-kernel-feedback-list, devicetree,
linux-arm-kernel, linux-kernel
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.
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
---
arch/arm/boot/dts/bcm958623hr.dts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/bcm958623hr.dts b/arch/arm/boot/dts/bcm958623hr.dts
index 80556882951f..c06871915a1c 100644
--- a/arch/arm/boot/dts/bcm958623hr.dts
+++ b/arch/arm/boot/dts/bcm958623hr.dts
@@ -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";
--
2.27.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 2/5] ARM: dts: NSP: Fix mpcore, mmc node names
2021-08-29 22:37 [PATCH v2 1/5] ARM: dts: NSP: Add bcm958623hr board name to dts Matthew Hagan
@ 2021-08-29 22:37 ` Matthew Hagan
2021-09-02 21:05 ` Florian Fainelli
2021-08-29 22:37 ` [PATCH v2 3/5] ARM: dts: NSP: Fix MDIO mux " Matthew Hagan
` (3 subsequent siblings)
4 siblings, 1 reply; 11+ messages in thread
From: Matthew Hagan @ 2021-08-29 22:37 UTC (permalink / raw)
Cc: Florian Fainelli, Andrew Lunn, Matthew Hagan, Rob Herring,
Ray Jui, Scott Branden, bcm-kernel-feedback-list, devicetree,
linux-arm-kernel, linux-kernel
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(@.*)?$'
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
---
arch/arm/boot/dts/bcm-nsp.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index 745d1d9d7414..6f2ccd059e73 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -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>;
--
2.27.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 3/5] ARM: dts: NSP: Fix MDIO mux node names
2021-08-29 22:37 [PATCH v2 1/5] ARM: dts: NSP: Add bcm958623hr board name to dts Matthew Hagan
2021-08-29 22:37 ` [PATCH v2 2/5] ARM: dts: NSP: Fix mpcore, mmc node names Matthew Hagan
@ 2021-08-29 22:37 ` Matthew Hagan
2021-08-30 0:27 ` Andrew Lunn
2021-09-02 21:05 ` Florian Fainelli
2021-08-29 22:37 ` [PATCH v2 4/5] ARM: dts: NSP: Fix MX64/MX65 eeprom node name Matthew Hagan
` (2 subsequent siblings)
4 siblings, 2 replies; 11+ messages in thread
From: Matthew Hagan @ 2021-08-29 22:37 UTC (permalink / raw)
Cc: Florian Fainelli, Andrew Lunn, Matthew Hagan, Rob Herring,
Ray Jui, Scott Branden, bcm-kernel-feedback-list, devicetree,
linux-arm-kernel, linux-kernel
While 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/20210822191256.3715003-1-f.fainelli@gmail.com/T/
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
---
arch/arm/boot/dts/bcm-nsp.dtsi | 2 +-
arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index 6f2ccd059e73..180827500f25 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -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>;
diff --git a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
index 8860f2fefc63..57d0c5eb9749 100644
--- a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
+++ b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
@@ -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>;
--
2.27.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 4/5] ARM: dts: NSP: Fix MX64/MX65 eeprom node name
2021-08-29 22:37 [PATCH v2 1/5] ARM: dts: NSP: Add bcm958623hr board name to dts Matthew Hagan
2021-08-29 22:37 ` [PATCH v2 2/5] ARM: dts: NSP: Fix mpcore, mmc node names Matthew Hagan
2021-08-29 22:37 ` [PATCH v2 3/5] ARM: dts: NSP: Fix MDIO mux " Matthew Hagan
@ 2021-08-29 22:37 ` Matthew Hagan
2021-09-02 21:05 ` Florian Fainelli
2021-08-29 22:37 ` [PATCH v2 5/5] ARM: dts: NSP: Fix MX65 MDIO mux warnings Matthew Hagan
2021-09-02 21:04 ` [PATCH v2 1/5] ARM: dts: NSP: Add bcm958623hr board name to dts Florian Fainelli
4 siblings, 1 reply; 11+ messages in thread
From: Matthew Hagan @ 2021-08-29 22:37 UTC (permalink / raw)
Cc: Florian Fainelli, Andrew Lunn, Matthew Hagan, Rob Herring,
Ray Jui, Scott Branden, bcm-kernel-feedback-list, devicetree,
linux-arm-kernel, linux-kernel
Running 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.
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
---
arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi b/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi
index bcdd38954f1d..6519b7c61af1 100644
--- a/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi
+++ b/arch/arm/boot/dts/bcm958625-meraki-mx6x-common.dtsi
@@ -48,7 +48,7 @@ &ehci0 {
&i2c0 {
status = "okay";
- at24@50 {
+ eeprom@50 {
compatible = "atmel,24c64";
reg = <0x50>;
pagesize = <32>;
--
2.27.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v2 5/5] ARM: dts: NSP: Fix MX65 MDIO mux warnings
2021-08-29 22:37 [PATCH v2 1/5] ARM: dts: NSP: Add bcm958623hr board name to dts Matthew Hagan
` (2 preceding siblings ...)
2021-08-29 22:37 ` [PATCH v2 4/5] ARM: dts: NSP: Fix MX64/MX65 eeprom node name Matthew Hagan
@ 2021-08-29 22:37 ` Matthew Hagan
2021-09-02 21:06 ` Florian Fainelli
2021-09-02 21:04 ` [PATCH v2 1/5] ARM: dts: NSP: Add bcm958623hr board name to dts Florian Fainelli
4 siblings, 1 reply; 11+ messages in thread
From: Matthew Hagan @ 2021-08-29 22:37 UTC (permalink / raw)
Cc: Florian Fainelli, Andrew Lunn, Matthew Hagan, Rob Herring,
Ray Jui, Scott Branden, bcm-kernel-feedback-list, devicetree,
linux-arm-kernel, linux-kernel
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 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/20180618174159.86150-1-npcomplete13@gmail.com/#1941353
Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
---
arch/arm/boot/dts/bcm-nsp.dtsi | 2 +-
arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi | 6 ++++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/bcm-nsp.dtsi b/arch/arm/boot/dts/bcm-nsp.dtsi
index 180827500f25..1c08daa18858 100644
--- a/arch/arm/boot/dts/bcm-nsp.dtsi
+++ b/arch/arm/boot/dts/bcm-nsp.dtsi
@@ -166,7 +166,7 @@ periph_clk: periph_clk {
};
};
- axi@18000000 {
+ axi: axi@18000000 {
compatible = "simple-bus";
ranges = <0x00000000 0x18000000 0x0011c40c>;
#address-cells = <1>;
diff --git a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
index 57d0c5eb9749..102acd85fab2 100644
--- a/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
+++ b/arch/arm/boot/dts/bcm958625-meraki-alamo.dtsi
@@ -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>;
--
2.27.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v2 3/5] ARM: dts: NSP: Fix MDIO mux node names
2021-08-29 22:37 ` [PATCH v2 3/5] ARM: dts: NSP: Fix MDIO mux " Matthew Hagan
@ 2021-08-30 0:27 ` Andrew Lunn
2021-09-02 21:05 ` Florian Fainelli
1 sibling, 0 replies; 11+ messages in thread
From: Andrew Lunn @ 2021-08-30 0:27 UTC (permalink / raw)
To: Matthew Hagan
Cc: Florian Fainelli, Rob Herring, Ray Jui, Scott Branden,
bcm-kernel-feedback-list, devicetree, linux-arm-kernel,
linux-kernel
On Sun, Aug 29, 2021 at 10:37:49PM +0000, Matthew Hagan wrote:
> While 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/20210822191256.3715003-1-f.fainelli@gmail.com/T/
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
Thanks for the expanded commit message.
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 1/5] ARM: dts: NSP: Add bcm958623hr board name to dts
2021-08-29 22:37 [PATCH v2 1/5] ARM: dts: NSP: Add bcm958623hr board name to dts Matthew Hagan
` (3 preceding siblings ...)
2021-08-29 22:37 ` [PATCH v2 5/5] ARM: dts: NSP: Fix MX65 MDIO mux warnings Matthew Hagan
@ 2021-09-02 21:04 ` Florian Fainelli
4 siblings, 0 replies; 11+ messages in thread
From: Florian Fainelli @ 2021-09-02 21:04 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Matthew Hagan
Cc: Andrew Lunn, Rob Herring, Ray Jui, Scott Branden, devicetree,
linux-arm-kernel, linux-kernel
On Sun, 29 Aug 2021 22:37:47 +0000, Matthew Hagan <mnhagan88@gmail.com> wrote:
> 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.
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 2/5] ARM: dts: NSP: Fix mpcore, mmc node names
2021-08-29 22:37 ` [PATCH v2 2/5] ARM: dts: NSP: Fix mpcore, mmc node names Matthew Hagan
@ 2021-09-02 21:05 ` Florian Fainelli
0 siblings, 0 replies; 11+ messages in thread
From: Florian Fainelli @ 2021-09-02 21:05 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Matthew Hagan
Cc: Andrew Lunn, Rob Herring, Ray Jui, Scott Branden, devicetree,
linux-arm-kernel, linux-kernel
On Sun, 29 Aug 2021 22:37:48 +0000, Matthew Hagan <mnhagan88@gmail.com> wrote:
> 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(@.*)?$'
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 3/5] ARM: dts: NSP: Fix MDIO mux node names
2021-08-29 22:37 ` [PATCH v2 3/5] ARM: dts: NSP: Fix MDIO mux " Matthew Hagan
2021-08-30 0:27 ` Andrew Lunn
@ 2021-09-02 21:05 ` Florian Fainelli
1 sibling, 0 replies; 11+ messages in thread
From: Florian Fainelli @ 2021-09-02 21:05 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Matthew Hagan
Cc: Andrew Lunn, Rob Herring, Ray Jui, Scott Branden, devicetree,
linux-arm-kernel, linux-kernel
On Sun, 29 Aug 2021 22:37:49 +0000, Matthew Hagan <mnhagan88@gmail.com> wrote:
> While 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/20210822191256.3715003-1-f.fainelli@gmail.com/T/
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 4/5] ARM: dts: NSP: Fix MX64/MX65 eeprom node name
2021-08-29 22:37 ` [PATCH v2 4/5] ARM: dts: NSP: Fix MX64/MX65 eeprom node name Matthew Hagan
@ 2021-09-02 21:05 ` Florian Fainelli
0 siblings, 0 replies; 11+ messages in thread
From: Florian Fainelli @ 2021-09-02 21:05 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Matthew Hagan
Cc: Andrew Lunn, Rob Herring, Ray Jui, Scott Branden, devicetree,
linux-arm-kernel, linux-kernel
On Sun, 29 Aug 2021 22:37:50 +0000, Matthew Hagan <mnhagan88@gmail.com> wrote:
> Running 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.
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 5/5] ARM: dts: NSP: Fix MX65 MDIO mux warnings
2021-08-29 22:37 ` [PATCH v2 5/5] ARM: dts: NSP: Fix MX65 MDIO mux warnings Matthew Hagan
@ 2021-09-02 21:06 ` Florian Fainelli
0 siblings, 0 replies; 11+ messages in thread
From: Florian Fainelli @ 2021-09-02 21:06 UTC (permalink / raw)
To: bcm-kernel-feedback-list, Matthew Hagan
Cc: Andrew Lunn, Rob Herring, Ray Jui, Scott Branden, devicetree,
linux-arm-kernel, linux-kernel
On Sun, 29 Aug 2021 22:37:51 +0000, Matthew Hagan <mnhagan88@gmail.com> wrote:
> 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 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/20180618174159.86150-1-npcomplete13@gmail.com/#1941353
>
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>
> ---
Applied to https://github.com/Broadcom/stblinux/commits/devicetree/next, thanks!
--
Florian
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-09-02 21:06 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-29 22:37 [PATCH v2 1/5] ARM: dts: NSP: Add bcm958623hr board name to dts Matthew Hagan
2021-08-29 22:37 ` [PATCH v2 2/5] ARM: dts: NSP: Fix mpcore, mmc node names Matthew Hagan
2021-09-02 21:05 ` Florian Fainelli
2021-08-29 22:37 ` [PATCH v2 3/5] ARM: dts: NSP: Fix MDIO mux " Matthew Hagan
2021-08-30 0:27 ` Andrew Lunn
2021-09-02 21:05 ` Florian Fainelli
2021-08-29 22:37 ` [PATCH v2 4/5] ARM: dts: NSP: Fix MX64/MX65 eeprom node name Matthew Hagan
2021-09-02 21:05 ` Florian Fainelli
2021-08-29 22:37 ` [PATCH v2 5/5] ARM: dts: NSP: Fix MX65 MDIO mux warnings Matthew Hagan
2021-09-02 21:06 ` Florian Fainelli
2021-09-02 21:04 ` [PATCH v2 1/5] ARM: dts: NSP: Add bcm958623hr board name to dts Florian Fainelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).