[PATCH 0/4] ARM: dts: mvebu: updates and new board

[PATCH 0/4] ARM: dts: mvebu: updates and new board

[Chris Packham]

This series updates the armada-xp-98dx3236 SoC and related boards to use the
new style dts bindings for nand.

I've also added a new db-88f6820-amc board which is an Armada-385 based
reference board from Marvell's switch team. It's a plugin card for either the
db-dxbc2 or db-xc3-24g4 which can be used if you disable the internal CPU on
those platforms.

Chris Packham (4):
  ARM: dts: mvebu: 98dx3236: Rename nand controller node
  ARM: dts: mvebu: db-dxbc2: use new style nand binding
  ARM: dts: mvebu: db-xc3-24g4: use new style nand binding
  ARM: dts: mvebu: Add device tree for db-88f6820-amc board

 arch/arm/boot/dts/Makefile                    |   1 +
 .../boot/dts/armada-385-db-88f6820-amc.dts    | 184 ++++++++++++++++++
 arch/arm/boot/dts/armada-xp-98dx3236.dtsi     |   2 +-
 arch/arm/boot/dts/armada-xp-db-dxbc2.dts      |  18 +-
 arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts |  18 +-
 5 files changed, 208 insertions(+), 15 deletions(-)
 create mode 100644 arch/arm/boot/dts/armada-385-db-88f6820-amc.dts

-- 
2.18.0

[PATCH 1/4] ARM: dts: mvebu: 98dx3236: Rename nand controller node

[Chris Packham]

Update the 98dx3236 SoC and dependent boards to use
"nand-controller" instead of "nand".

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
 arch/arm/boot/dts/armada-xp-98dx3236.dtsi     | 2 +-
 arch/arm/boot/dts/armada-xp-db-dxbc2.dts      | 2 +-
 arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
index 8d708cc22495..eb03a5773903 100644
--- a/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
+++ b/arch/arm/boot/dts/armada-xp-98dx3236.dtsi
@@ -189,7 +189,7 @@
 				};
 			};
 
-			nand: nand@d0000 {
+			nand_controller: nand-controller@d0000 {
 				clocks = <&dfx_coredivclk 0>;
 			};
 
diff --git a/arch/arm/boot/dts/armada-xp-db-dxbc2.dts b/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
index f42fc6118b7c..944e0a9c9dac 100644
--- a/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
+++ b/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
@@ -68,7 +68,7 @@
 	status = "okay";
 };
 
-&nand {
+&nand_controller {
 	status = "okay";
 	label = "pxa3xx_nand-0";
 	num-cs = <1>;
diff --git a/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts b/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
index 8432f517e346..d58ea48cb151 100644
--- a/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
+++ b/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
@@ -67,7 +67,7 @@
 	status = "okay";
 };
 
-&nand {
+&nand_controller {
 	status = "okay";
 	label = "pxa3xx_nand-0";
 	num-cs = <1>;
-- 
2.18.0

[PATCH 2/4] ARM: dts: mvebu: db-dxbc2: use new style nand binding

[Chris Packham]

Update the nand flash binding to the new style.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
 arch/arm/boot/dts/armada-xp-db-dxbc2.dts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/armada-xp-db-dxbc2.dts b/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
index 944e0a9c9dac..8a3aa616bbd0 100644
--- a/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
+++ b/arch/arm/boot/dts/armada-xp-db-dxbc2.dts
@@ -70,12 +70,16 @@
 
 &nand_controller {
 	status = "okay";
-	label = "pxa3xx_nand-0";
-	num-cs = <1>;
-	marvell,nand-keep-config;
-	nand-on-flash-bbt;
-	nand-ecc-strength = <4>;
-	nand-ecc-step-size = <512>;
+
+	nand@0 {
+		reg = <0>;
+		label = "pxa3xx_nand-0";
+		nand-rb = <0>;
+		marvell,nand-keep-config;
+		nand-on-flash-bbt;
+		nand-ecc-strength = <4>;
+		nand-ecc-step-size = <512>;
+	};
 };
 
 &sdio {
-- 
2.18.0

[PATCH 3/4] ARM: dts: mvebu: db-xc3-24g4: use new style nand binding

[Chris Packham]

Update the nand flash binding to the new style.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
 arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts b/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
index d58ea48cb151..df048050615f 100644
--- a/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
+++ b/arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts
@@ -69,12 +69,16 @@
 
 &nand_controller {
 	status = "okay";
-	label = "pxa3xx_nand-0";
-	num-cs = <1>;
-	marvell,nand-keep-config;
-	nand-on-flash-bbt;
-	nand-ecc-strength = <4>;
-	nand-ecc-step-size = <512>;
+
+	nand@0 {
+		reg = <0>;
+		label = "pxa3xx_nand-0";
+		nand-rb = <0>;
+		marvell,nand-keep-config;
+		nand-on-flash-bbt;
+		nand-ecc-strength = <4>;
+		nand-ecc-step-size = <512>;
+	};
 };
 
 &spi0 {
-- 
2.18.0

[PATCH 4/4] ARM: dts: mvebu: Add device tree for db-88f6820-amc board

[Chris Packham]

This board is a plugin card for some of Marvell's switch development
kits. It's similar to the non-amc board except that it has no SATA
support.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
---
 arch/arm/boot/dts/Makefile                    |   1 +
 .../boot/dts/armada-385-db-88f6820-amc.dts    | 147 ++++++++++++++++++
 2 files changed, 148 insertions(+)
 create mode 100644 arch/arm/boot/dts/armada-385-db-88f6820-amc.dts

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 37a3de760d40..e4212b7b7d9e 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -1126,6 +1126,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
 dtb-$(CONFIG_MACH_ARMADA_375) += \
 	armada-375-db.dtb
 dtb-$(CONFIG_MACH_ARMADA_38X) += \
+	armada-385-db-88f6820-amc.dtb \
 	armada-385-db-ap.dtb \
 	armada-385-linksys-caiman.dtb \
 	armada-385-linksys-cobra.dtb \
diff --git a/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts b/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts
new file mode 100644
index 000000000000..d87614057e3f
--- /dev/null
+++ b/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts
@@ -0,0 +1,147 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/*
+ * Device Tree file for Marvell Armada 385 AMC board
+ * (DB-88F6820-AMC)
+ *
+ * Copyright (C) 2017 Allied Telesis Labs
+ */
+
+/dts-v1/;
+#include "armada-385.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+	model = "Marvell Armada 385 AMC";
+	compatible = "marvell,a385-db-amc", "marvell,armada385", "marvell,armada380";
+
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	aliases {
+		ethernet0 = &eth0;
+		ethernet1 = &eth1;
+		spi1 = &spi1;
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x80000000>; /* 2GB */
+	};
+
+	soc {
+		ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000
+			  MBUS_ID(0x01, 0x1d) 0 0xfff00000 0x100000>;
+	};
+};
+
+&i2c0 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&i2c0_pins>;
+	status = "okay";
+};
+
+&uart0 {
+	/*
+	 * Exported on the micro USB connector CON3
+	 * through an FTDI
+	 */
+
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart0_pins>;
+	status = "okay";
+};
+
+
+&eth0 {
+	pinctrl-names = "default";
+	/*
+	 * The Reference Clock 0 is used to provide a
+	 * clock to the PHY
+	 */
+	pinctrl-0 = <&ge0_rgmii_pins>, <&ref_clk0_pins>;
+	status = "okay";
+	phy = <&phy0>;
+	phy-mode = "rgmii-id";
+};
+
+&eth2 {
+	status = "okay";
+	phy = <&phy1>;
+	phy-mode = "sgmii";
+};
+
+&usb0 {
+	status = "okay";
+};
+
+
+
+&mdio {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mdio_pins>;
+
+	phy0: ethernet-phy@1 {
+		reg = <1>;
+	};
+
+	phy1: ethernet-phy@0 {
+		reg = <0>;
+	};
+};
+
+&nand_controller {
+	status = "okay";
+
+	nand@0 {
+		reg = <0>;
+		label = "pxa3xx_nand-0";
+		nand-rb = <0>;
+		nand-on-flash-bbt;
+		nand-ecc-strength = <4>;
+		nand-ecc-step-size = <512>;
+
+		partition@user {
+			reg = <0x00000000 0x40000000>;
+			label = "user";
+		};
+	};
+};
+
+&pciec {
+	status = "okay";
+};
+
+&pcie1 {
+	/* Port 0, Lane 0 */
+	status = "okay";
+};
+
+&spi1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&spi1_pins>;
+	status = "okay";
+
+	spi-flash@0 {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "jedec,spi-nor";
+		reg = <0>; /* Chip select 0 */
+		spi-max-frequency = <50000000>;
+		m25p,fast-read;
+
+		partition@u-boot {
+			reg = <0x00000000 0x00100000>;
+			label = "u-boot";
+		};
+		partition@u-boot-env {
+			reg = <0x00100000 0x00040000>;
+			label = "u-boot-env";
+		};
+	};
+};
+
+&refclk {
+	clock-frequency = <20000000>;
+};
-- 
2.18.0

Re: [PATCH 0/4] ARM: dts: mvebu: updates and new board

[Gregory CLEMENT]

Hi Chris,
 
 On jeu., juil. 26 2018, Chris Packham <chris.packham@alliedtelesis.co.nz> wrote:

> This series updates the armada-xp-98dx3236 SoC and related boards to use the
> new style dts bindings for nand.
>
> I've also added a new db-88f6820-amc board which is an Armada-385 based
> reference board from Marvell's switch team. It's a plugin card for either the
> db-dxbc2 or db-xc3-24g4 which can be used if you disable the internal CPU on
> those platforms.
>
> Chris Packham (4):
>   ARM: dts: mvebu: 98dx3236: Rename nand controller node
>   ARM: dts: mvebu: db-dxbc2: use new style nand binding
>   ARM: dts: mvebu: db-xc3-24g4: use new style nand binding
>   ARM: dts: mvebu: Add device tree for db-88f6820-amc board

While applying this series mvebu/dt, I got few warning with "ARM: dts:
mvebu: 98dx3236: Rename nand controller node".

I fix them and also use the new partition binding, the diff is the
following:

iff --git a/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts b/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts
index d87614057e3f..dc9ccce1d4a1 100644
--- a/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts
+++ b/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts
@@ -102,9 +102,14 @@
                nand-ecc-strength = <4>;
                nand-ecc-step-size = <512>;
 
-               partition@user {
-                       reg = <0x00000000 0x40000000>;
-                       label = "user";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       partition@0 {
+                               reg = <0x00000000 0x40000000>;
+                               label = "user";
+                       };
                };
        };
 };
@@ -131,13 +136,18 @@
                spi-max-frequency = <50000000>;
                m25p,fast-read;
 
-               partition@u-boot {
-                       reg = <0x00000000 0x00100000>;
-                       label = "u-boot";
-               };
-               partition@u-boot-env {
-                       reg = <0x00100000 0x00040000>;
-                       label = "u-boot-env";
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       partition@0 {
+                               reg = <0x00000000 0x00100000>;
+                               label = "u-boot";
+                       };
+                       partition@100000 {
+                               reg = <0x00100000 0x00040000>;
+                               label = "u-boot-env";
+                       };
                };
        };
 };

I amended your patch with it, but if you don't agree with it, I can
still modify it, the branch is not immutable yet.

Thanks,

Gregory

>
>  arch/arm/boot/dts/Makefile                    |   1 +
>  .../boot/dts/armada-385-db-88f6820-amc.dts    | 184 ++++++++++++++++++
>  arch/arm/boot/dts/armada-xp-98dx3236.dtsi     |   2 +-
>  arch/arm/boot/dts/armada-xp-db-dxbc2.dts      |  18 +-
>  arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts |  18 +-
>  5 files changed, 208 insertions(+), 15 deletions(-)
>  create mode 100644 arch/arm/boot/dts/armada-385-db-88f6820-amc.dts
>
> -- 
> 2.18.0
>

-- 
Gregory Clement, Bootlin
Embedded Linux and Kernel engineering
http://bootlin.com

Re: [PATCH 0/4] ARM: dts: mvebu: updates and new board

[Chris Packham]

On 21/09/18 03:57, Gregory CLEMENT wrote:
> Hi Chris,
>   
>   On jeu., juil. 26 2018, Chris Packham <chris.packham@alliedtelesis.co.nz> wrote:
> 
>> This series updates the armada-xp-98dx3236 SoC and related boards to use the
>> new style dts bindings for nand.
>>
>> I've also added a new db-88f6820-amc board which is an Armada-385 based
>> reference board from Marvell's switch team. It's a plugin card for either the
>> db-dxbc2 or db-xc3-24g4 which can be used if you disable the internal CPU on
>> those platforms.
>>
>> Chris Packham (4):
>>    ARM: dts: mvebu: 98dx3236: Rename nand controller node
>>    ARM: dts: mvebu: db-dxbc2: use new style nand binding
>>    ARM: dts: mvebu: db-xc3-24g4: use new style nand binding
>>    ARM: dts: mvebu: Add device tree for db-88f6820-amc board
> 
> While applying this series mvebu/dt, I got few warning with "ARM: dts:
> mvebu: 98dx3236: Rename nand controller node".
> 
> I fix them and also use the new partition binding, the diff is the
> following:
> 
> iff --git a/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts b/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts
> index d87614057e3f..dc9ccce1d4a1 100644
> --- a/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts
> +++ b/arch/arm/boot/dts/armada-385-db-88f6820-amc.dts
> @@ -102,9 +102,14 @@
>                  nand-ecc-strength = <4>;
>                  nand-ecc-step-size = <512>;
>   
> -               partition@user {
> -                       reg = <0x00000000 0x40000000>;
> -                       label = "user";
> +               partitions {
> +                       compatible = "fixed-partitions";
> +                       #address-cells = <1>;
> +                       #size-cells = <1>;
> +                       partition@0 {
> +                               reg = <0x00000000 0x40000000>;
> +                               label = "user";
> +                       };
>                  };
>          };
>   };
> @@ -131,13 +136,18 @@
>                  spi-max-frequency = <50000000>;
>                  m25p,fast-read;
>   
> -               partition@u-boot {
> -                       reg = <0x00000000 0x00100000>;
> -                       label = "u-boot";
> -               };
> -               partition@u-boot-env {
> -                       reg = <0x00100000 0x00040000>;
> -                       label = "u-boot-env";
> +               partitions {
> +                       compatible = "fixed-partitions";
> +                       #address-cells = <1>;
> +                       #size-cells = <1>;
> +                       partition@0 {
> +                               reg = <0x00000000 0x00100000>;
> +                               label = "u-boot";
> +                       };
> +                       partition@100000 {
> +                               reg = <0x00100000 0x00040000>;
> +                               label = "u-boot-env";
> +                       };
>                  };
>          };
>   };
> 
> I amended your patch with it, but if you don't agree with it, I can
> still modify it, the branch is not immutable yet.

Looks good to me. Thanks.

> 
> Thanks,
> 
> Gregory
> 
>>
>>   arch/arm/boot/dts/Makefile                    |   1 +
>>   .../boot/dts/armada-385-db-88f6820-amc.dts    | 184 ++++++++++++++++++
>>   arch/arm/boot/dts/armada-xp-98dx3236.dtsi     |   2 +-
>>   arch/arm/boot/dts/armada-xp-db-dxbc2.dts      |  18 +-
>>   arch/arm/boot/dts/armada-xp-db-xc3-24g4xg.dts |  18 +-
>>   5 files changed, 208 insertions(+), 15 deletions(-)
>>   create mode 100644 arch/arm/boot/dts/armada-385-db-88f6820-amc.dts
>>
>> -- 
>> 2.18.0
>>
>