[PATCH 1/5] ARM: dts: NSP: Add bcm958623hr board name to dts

[PATCH 1/5] ARM: dts: NSP: Add bcm958623hr board name to dts

[Matthew Hagan]

This board was added to
Documentation/devicetree/bindings/arm/bcm/brcm,nsp.yaml. 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

[PATCH 2/5] ARM: dts: NSP: Fix mpcore, mmc node names

[Matthew Hagan]

This fixes the following message by appending "-bus" to 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 this fixes the mmc node name. Leave the label name 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

[PATCH 3/5] ARM: dts: NSP: Fix MDIO mux node names

[Matthew Hagan]

This patch fixes the following message by adding "mdio-mux" compatible:
compatible: ['mdio-mux-mmioreg'] is too short

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

Re: [PATCH 3/5] ARM: dts: NSP: Fix MDIO mux node names

[Andrew Lunn]

On Sat, Aug 28, 2021 at 11:27:01AM +0000, Matthew Hagan wrote:
> This patch fixes the following message by adding "mdio-mux" compatible:
> compatible: ['mdio-mux-mmioreg'] is too short
 
Err, what? This sounds like a workaround for a tool problem, not a
real fix. 

What is actually wrong with:

compatible = "mdio-mux-mmioreg";

	   Andrew

Re: [PATCH 3/5] ARM: dts: NSP: Fix MDIO mux node names

[Matthew Hagan]

On 28/08/2021 18:07, Andrew Lunn wrote:

> On Sat, Aug 28, 2021 at 11:27:01AM +0000, Matthew Hagan wrote:
>> This patch fixes the following message by adding "mdio-mux" compatible:
>> compatible: ['mdio-mux-mmioreg'] is too short
>  
> Err, what? This sounds like a workaround for a tool problem, not a
> real fix. 
>
> What is actually wrong with:
>
> compatible = "mdio-mux-mmioreg";

Yes this does work fine either with or without "mdio-mux". The changes
have been made to correspond with those submitted by Rafal Milecki for
the BCM5301X platform[1] and to conform with
Documentation/devicetree/bindings/net/mdio-mux-mmioreg.yaml
which does state both as required items (and hence not a tool problem).

[1] https://lore.kernel.org/linux-arm-kernel/20210822191256.3715003-1-f.fainelli@gmail.com/T/

>
> 	   Andrew
>
Matthew

Re: [PATCH 3/5] ARM: dts: NSP: Fix MDIO mux node names

[Andrew Lunn]

On Sat, Aug 28, 2021 at 10:52:30PM +0100, Matthew Hagan wrote:
> On 28/08/2021 18:07, Andrew Lunn wrote:
> 
> > On Sat, Aug 28, 2021 at 11:27:01AM +0000, Matthew Hagan wrote:
> >> This patch fixes the following message by adding "mdio-mux" compatible:
> >> compatible: ['mdio-mux-mmioreg'] is too short
> >  
> > Err, what? This sounds like a workaround for a tool problem, not a
> > real fix. 
> >
> > What is actually wrong with:
> >
> > compatible = "mdio-mux-mmioreg";
> 
> Yes this does work fine either with or without "mdio-mux". The changes
> have been made to correspond with those submitted by Rafal Milecki for
> the BCM5301X platform[1] and to conform with
> Documentation/devicetree/bindings/net/mdio-mux-mmioreg.yaml
> which does state both as required items (and hence not a tool problem).

Hi Matthew

It would be good to expand the commit message a bit, since the error
'is too short' is particularly uninformative, and leads to questions
like this if not explained.

It would also good to get the tool improved, but that is out of scope
for this patch.

     Andrew

Re: [PATCH 3/5] ARM: dts: NSP: Fix MDIO mux node names

[Andrew Lunn]

On Sat, Aug 28, 2021 at 11:27:01AM +0000, Matthew Hagan wrote:
> This patch fixes the following message by adding "mdio-mux" compatible:
> compatible: ['mdio-mux-mmioreg'] is too short
> 
> Signed-off-by: Matthew Hagan <mnhagan88@gmail.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

[PATCH 4/5] ARM: dts: NSP: Fix MX64/MX65 eeprom node name

[Matthew Hagan]

This fixes the following issue by renaming the node appropriately:
at24@50: $nodename:0: 'at24@50' does not match '^eeprom@[0-9a-f]{1,2}$'

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

[PATCH 5/5] ARM: dts: NSP: Fix MX65 MDIO mux warnings

[Matthew Hagan]

Firstly this fixes the following message:
mdio-mii-mux: $nodename:0: 'mdio-mii-mux' does not match '^mdio-mux[\\-@]?'

Secondly, move the mdio-mux to within the axi node and add the unit
address. This 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

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