arm: mvebu: support for the PlatHome OpenBlocks AX3 board

arch/arm/mach-mvebu/armada-370-xp.c static void __init armada_370_xp_dt_init(void) · line 54

Quoted 11 lines

arch/arm/mach-mvebu/armada-370-xp.c +1 -0

index 49d7915..cd2717b 100644
@@ -49,6 +49,7 @@ static void __init armada_370_xp_dt_init(void)
 static const char * const armada_370_xp_dt_board_dt_compat[] = {
 	"marvell,a370-db",
 	"marvell,axp-db",
+	"plathome,openblocks-ax3",
 	NULL,
 };

Hi Thomas

You will get less merge conflicts with new boards if you keep this list sorted.

Dear Andrew Lunn,

Quoted 14 lines · Andrew Lunn

arch/arm/mach-mvebu/armada-370-xp.c static void __init armada_370_xp_dt_init(void) · line 54

Quoted 11 lines

arch/arm/mach-mvebu/armada-370-xp.c +1 -0

index 49d7915..cd2717b 100644
@@ -49,6 +49,7 @@ static void __init armada_370_xp_dt_init(void)
 static const char * const armada_370_xp_dt_board_dt_compat[] = {
 	"marvell,a370-db",
 	"marvell,axp-db",
+	"plathome,openblocks-ax3",
 	NULL,
 };

Hi Thomas

Quoted 2 lines

You will get less merge conflicts with new boards if you keep this list sorted.

Hum, right, but isn't "plathome" after "marvell" when sorted alphabetically? Or maybe I don't get which kind of sorting you are referring to?

This platform, available in Japan from PlatHome, has a dual-core Armada XP, the MV78260. For now, only the two serial ports and the three front LEDs are supported. Support for network, SATA, USB and other peripherals will be added as drivers for them become available for Armada XP in mainline.

Signed-off-by Thomas Petazzoni <[email protected]>

---
This is 3.8 material.

---
 arch/arm/boot/dts/Makefile           |    3 +-
 arch/arm/boot/dts/openblocks-ax3.dts |   69 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-mvebu/armada-370-xp.c  |    1 +
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/openblocks-ax3.dts

arch/arm/boot/dts/Makefile +2 -1

index f37cf9f..b7814b9 100644
@@ -44,7 +44,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \
 dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
 	msm8960-cdp.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
-	armada-xp-db.dtb
+	armada-xp-db.dtb \
+	openblocks-ax3.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
 	imx53-ard.dtb \
 	imx53-evk.dtb \

arch/arm/boot/dts/openblocks-ax3.dts new file +69 -0

new file mode 100644
index 0000000..f757116
@@ -0,0 +1,69 @@
+/*
+ * Device Tree file for OpenBlocks AX3 board
+ *
+ * Copyright (C) 2012 Marvell
+ *
+ * Thomas Petazzoni <[email protected]>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+/include/ "armada-xp-mv78260.dtsi"
+
+/ {
+	model = "PlatHome OpenBlocks AX3 board";
+	compatible = "plathome,openblocks-ax3", "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp";
+
+	chosen {
+		bootargs = "console=ttyS0,115200 earlyprintk";
+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x40000000>; /* 1 GB */
+	};
+
+	soc {
+		serial at d0012000 {
+			clock-frequency = <250000000>;
+			status = "okay";
+		};
+		serial at d0012100 {
+			clock-frequency = <250000000>;
+			status = "okay";
+		};
+		pinctrl {
+			led_pins: led-pins-0 {
+				  marvell,pins = "mpp49", "mpp51", "mpp53";
+				  marvell,function = "gpio";
+			};
+		};
+		leds {
+		        compatible = "gpio-leds";
+			pinctrl-names = "default";
+			pinctrl-0 = <&led_pins>;
+
+			red_led {
+				   label = "red_led";
+				   gpios = <&gpio1 17 1>;
+				   default-state = "off";
+			};
+
+			yellow_led {
+				   label = "yellow_led";
+				   gpios = <&gpio1 19 1>;
+				   default-state = "off";
+			};
+
+			green_led {
+				   label = "green_led";
+				   gpios = <&gpio1 21 1>;
+				   default-state = "off";
+				   linux,default-trigger = "heartbeat";
+			};
+		};
+	};
+};

arch/arm/mach-mvebu/armada-370-xp.c +1 -0

index 49d7915..cd2717b 100644
@@ -49,6 +49,7 @@ static void __init armada_370_xp_dt_init(void)
 static const char * const armada_370_xp_dt_board_dt_compat[] = {
 	"marvell,a370-db",
 	"marvell,axp-db",
+	"plathome,openblocks-ax3",
 	NULL,
 };
 

Quoted 5 lines · Thomas Petazzoni

This platform, available in Japan from PlatHome, has a dual-core Armada XP, the MV78260. For now, only the two serial ports and the three front LEDs are supported. Support for network, SATA, USB and other peripherals will be added as drivers for them become available for Armada XP in mainline.

And don't forget the SMP support too, MV78260 is supposed to have 2 cores.

Besides this, this patch looks good. I have applied it on a v3.7-rc2 without any problem, and managed to build it also.
So you can add my

Acked-by Gregory CLEMENT <[email protected]>

This platform, available in Japan from PlatHome, has a dual-core Armada XP, the MV78260. For now, only the two serial ports and the three front LEDs are supported. Support for network, SATA, USB and other peripherals will be added as drivers for them become available for Armada XP in mainline.

Signed-off-by Thomas Petazzoni <[email protected]>

---
This is 3.8 material.

---
 arch/arm/boot/dts/Makefile           |    3 +-
 arch/arm/boot/dts/openblocks-ax3.dts |   69 ++++++++++++++++++++++++++++++++++
 arch/arm/mach-mvebu/armada-370-xp.c  |    1 +
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm/boot/dts/openblocks-ax3.dts

arch/arm/boot/dts/Makefile +2 -1

index f37cf9f..b7814b9 100644
@@ -44,7 +44,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \
 dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
 	msm8960-cdp.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
-	armada-xp-db.dtb
+	armada-xp-db.dtb \
+	openblocks-ax3.dtb
 dtb-$(CONFIG_ARCH_MXC) += imx51-babbage.dtb \
 	imx53-ard.dtb \
 	imx53-evk.dtb \

arch/arm/boot/dts/openblocks-ax3.dts new file +17 -0

new file mode 100644
index 0000000..f757116
@@ -0,0 +1,69 @@
+/*
+ * Device Tree file for OpenBlocks AX3 board
+ *
+ * Copyright (C) 2012 Marvell
+ *
+ * Thomas Petazzoni <[email protected]>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+/include/ "armada-xp-mv78260.dtsi"
+
+/ {
+	model = "PlatHome OpenBlocks AX3 board";

There are two variants of this box, ax3/2 and ax3/4. The ax3/4 can have more RAM and has a mini pci express slot. Do you expect both boards to be supported with one dts file?

Andrew,

Quoted 3 lines · Andrew Lunn

There are two variants of this box, ax3/2 and ax3/4. The ax3/4 can have more RAM and has a mini pci express slot. Do you expect both boards to be supported with one dts file?

I have the ax3/4 version apparently.

So, we can have the following possible schemes:

+ openblocks-ax3.dtsi
+ openblocks-ax3-2.dts
+ openblocks-ax3-4.dts

But I am not sure if using a .dtsi to factorize things common between multiple boards is OK. Or we can do:

+ openblocks-ax3-2.dts
+ openblocks-ax3-4.dts

With openblocks-ax3-4.dts being the simple addition of PCIe slot + more RAM. That said, I don't have the ax3/2 board anyway, so should we plan for something that nobody can test at the moment, or wait for someone to get a ax3/2 board, and therefore be able to do the testing? I think I prefer to submit dts files that are know to work and have been tested on hardware that we have.

I agree with the last point. So maybe have a openblocks-ax3-4.dts and set the compatibility string to plathome,openblocks-ax3-4.

When somebody gets a ax3/2, they can refactor the common DT into a dtsi file without causing any compatibility issues.

With openblocks-ax3-4.dts being the simple addition of PCIe slot + more RAM. That said, I don't have the ax3/2 board anyway, so should we plan for something that nobody can test at the moment, or wait for someone to get a ax3/2 board, and therefore be able to do the testing? I think I prefer to submit dts files that are know to work and have been tested on hardware that we have.

I got an ax3/2 device, I would not mind to test any changes? Are you aware of which changes should I apply to dtsi file to work on ax3-2 device?

Quoted 3 lines · Hector Oron

I got an ax3/2 device, I would not mind to test any changes? Are you aware of which changes should I apply to dtsi file to work on ax3-2 device?

If I'm correct, the differences between AX-2 and AX3-4 is:

* AX3-2 has two Ethernet interfaces, while AX3-4 has four Ethernet interfaces

* AX3-4 is in standard mounted with a 2 GB additional DRAM in a SO-DIMM slot, while the AX3-2 is not. However, it is not clear if the SO-DIMM slot is present or not on the AX3-2 (could you confirm this?).

* AX3-2 does not have a mini PCIe slot, while AX3-4 has one.

So I guess you could create a separate armada-xp-openblocks-ax3-2.dts file to support this new board. Maybe at some point it will make sense to have a common armada-xp-openblocks-ax3.dtsi that both board .dts includes.

Quoted 16 lines · Thomas Petazzoni

Quoted 3 lines · Hector Oron

I got an ax3/2 device, I would not mind to test any changes? Are you aware of which changes should I apply to dtsi file to work on ax3-2 device?

If I'm correct, the differences between AX-2 and AX3-4 is:

* AX3-2 has two Ethernet interfaces, while AX3-4 has four Ethernet interfaces

* AX3-4 is in standard mounted with a 2 GB additional DRAM in a SO-DIMM slot, while the AX3-2 is not. However, it is not clear if the SO-DIMM slot is present or not on the AX3-2 (could you confirm this?).

Quoted 6 lines

* AX3-2 does not have a mini PCIe slot, while AX3-4 has one.

So I guess you could create a separate armada-xp-openblocks-ax3-2.dts file to support this new board. Maybe at some point it will make sense to have a common armada-xp-openblocks-ax3.dtsi that both board .dts includes.

Adding plathome to the email list to see if they can offer any concrete answers.

thx,

Jason.

Quoted 8 lines · Thomas Petazzoni

Quoted 7 lines · Hector Oron

Quoted 4 lines

I got an ax3/2 device, I would not mind to test any changes? Are you aware of which changes should I apply to dtsi file to work on ax3-2 device?

If I'm correct, the differences between AX-2 and AX3-4 is:

arch/arm/boot/dts/openblocks-ax3-4.dts new file +1 -0

+	compatible = "plathome,openblocks-ax3-4", "marvell,armadaxp-mv78260", "marvell,armadaxp", "marvell,armada-370-xp";