ARM: kirkwood: convert a few more boards to DT

This commit completely converts the d2net_v2 Kirkwood board to use a Device Tree representation.

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

---
 arch/arm/boot/dts/Makefile              |   1 +
 arch/arm/boot/dts/kirkwood-d2net-v2.dts | 231 ++++++++++++++++++++++++++++++++
 arch/arm/mach-kirkwood/Kconfig          |   7 -
 arch/arm/mach-kirkwood/Makefile         |   2 +-
 arch/arm/mach-kirkwood/d2net_v2-setup.c | 231 --------------------------------
 5 files changed, 233 insertions(+), 239 deletions(-)
 create mode 100644 arch/arm/boot/dts/kirkwood-d2net-v2.dts
 delete mode 100644 arch/arm/mach-kirkwood/d2net_v2-setup.c

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

index 641b3c9..277685f 100644
@@ -67,6 +67,7 @@ dtb-$(CONFIG_ARCH_INTEGRATOR) += integratorap.dtb \
 	integratorcp.dtb
 dtb-$(CONFIG_ARCH_LPC32XX) += ea3250.dtb phy3250.dtb
 dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
+	kirkwood-d2net-v2.dtb \
 	kirkwood-db-88f6281.dtb \
 	kirkwood-db-88f6282.dtb \
 	kirkwood-dns320.dtb \

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +3 -0

new file mode 100644
index 0000000..3b2d75b
@@ -0,0 +1,231 @@
+/dts-v1/;
+
+/include/ "kirkwood.dtsi"

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +19 -0

+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8 earlyprintk";
+	};
+
+	ocp at f1000000 {
+		pinctrl: pinctrl at 10000 {
+			pinctrl-0 = <&pmx_inhibit_poweroff
+				     &pmx_sysrst>;
+
+			pmx_spi: pmx-spi {
+				marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3";
+				marvell,function = "spi";
+			};
+
+			pmx_i2c: pmx-i2c {
+				marvell,pins = "mpp8", "mpp9";
+				marvell,function = "twsi0";

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +121 -0

+			};
+
+			pmx_keys: pmx-keys {
+				marvell,pins = "mpp13", "mpp15", "mpp34";
+				marvell,function = "gpio";
+			};
+
+			pmx_poweroff: pmx-poweroff {
+				marvell,pins = "mpp7";
+				marvell,function = "gpo";
+			};
+
+			pmx_sata_power: pmx-sata-power {
+				marvell,pins = "mpp16";
+				marvell,function = "gpio";
+			};
+
+			pmx_sata: pmx-sata {
+				marvell,pins = "mpp21";
+				marvell,function = "sata0";
+			};
+
+			pmx_usb: pmx-usb {
+				marvell,pins = "mpp14", "mpp24", "mpp26", "mpp28";
+				marvell,function = "gpio";
+			};
+
+			pmx_sysrst: pmx-sysrst {
+				marvell,pins = "mpp6";
+				marvell,function = "sysrst";
+			};
+
+			pmx_inhibit_poweroff: pmx-inhibit-poweroff {
+				marvell,pins = "mpp35";
+				marvell,function = "gpio";
+			};
+
+			pmx_cpld_leds: pmx-cpld-leds {
+				marvell,pins = "mpp29", "mpp30";
+				marvell,function = "gpio";
+			};
+		};
+
+		spi at 10600 {
+			status = "okay";
+			pinctrl-0 = <&pmx_spi>;
+			pinctrl-names = "default";
+
+			flash at 0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "mx25l4005a";
+				reg = <0>;
+				spi-max-frequency = <20000000>;
+				mode = <0>;
+
+				partition at 0 {
+					reg = <0x0 0x80000>;
+					label = "u-boot";
+				};
+			};
+		};
+
+		i2c at 11000 {
+			status = "okay";
+			pinctrl-0 = <&pmx_i2c>;
+			pinctrl-names = "default";
+
+			eeprom at 50 {
+				compatible = "at,24c04";
+				pagesize = <16>;
+				reg = <0x50>;
+			};
+		};
+
+		serial at 12000 {
+			status = "ok";
+			pinctrl-0 = <&pmx_uart>;
+			pinctrl-names = "default";
+		};
+
+		sata at 80000 {
+			nr-ports = <2>;
+			status = "okay";
+			pinctrl-0 = <&pmx_sata>;
+			pinctrl-names = "default";
+		};
+
+		ehci at 50000 {
+			pinctrl-0 = <&pmx_usb>;
+			pinctrl-names = "default";
+		};
+	};
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		pinctrl-0 = <&pmx_keys>;
+		pinctrl-names = "default";
+
+		button at 1 {
+			label = "Back power switch (on|auto)";
+			linux,code = <1>;
+			linux,input-type = <5>; /* EV_SW */
+			gpios = <&gpio0 13 0>;
+		};
+
+		button at 2 {
+			label = "Back power switch (auto|off)";
+			linux,code = <2>;
+			linux,input-type = <5>; /* EV_SW */
+			gpios = <&gpio0 15 0>;
+		};
+
+		button at 3 {
+			label = "Front Push Button";
+			linux,code = <116>; /* KEY_POWER */
+			gpios = <&gpio1 2 1>;
+		};
+	};

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +29 -0

+		};
+	};
+
+	gpio_poweroff {
+		compatible = "gpio-poweroff";
+		pinctrl-0 = <&pmx_poweroff>;
+		pinctrl-names = "default";
+		gpios = <&gpio0 7 0>;
+	};
+
+	ns2-leds {
+		compatible = "lacie,ns2-leds";
+		pinctrl-0 = <&pmx_cpld_leds>;
+		pinctrl-names = "default";
+
+		blue-sata {
+			label = "d2net_v2:blue:sata";
+			slow-gpio = <&gpio0 29 0>;
+			cmd-gpio = <&gpio0 30 0>;
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+		pinctrl-0 = <&pmx_sata_power>;
+		pinctrl-names = "default";
+		#address-cells = <1>;
+		#size-cells = <0>;
+

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +19 -0

+		};
+	};
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		device_type = "ethernet-phy";
+		reg = <8>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port at 0 {
+		phy-handle = <&ethphy0>;
+	};
+};

arch/arm/mach-kirkwood/Kconfig +0 -0

index 60d0896..8bcd659 100644

Thanks for this patch. I have tested on by d2net_v2 board and it is almost good. Please, see below for my comments.

arch/arm/boot/dts/kirkwood-d2net-v2.dts line 13

Quoted 4 lines

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +4 -0

+	memory {
+		device_type = "memory";
+		/* TODO: verify memory installed on board */
+		reg = <0x00000000 0x20000000>;

The board only provides 256MB of memory (0x100000000).

arch/arm/boot/dts/kirkwood-d2net-v2.dts line 42

Quoted 3 lines

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +3 -0

+			pmx_leds: pmx-leds {
+				marvell,pins = "mpp12";
+				marvell,function = "gpo";

"gpo" is not valid for the 6281 SoC. You could use "gpio" instead.

arch/arm/boot/dts/kirkwood-d2net-v2.dts line 173

Quoted 4 lines

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +4 -0

+		fail {
+			label = "d2net_v2:red:fail";
+			gpios = <&gpio0 12 0>;
+			default-state = "on";

"keep" is a better default-state. Else, blue and red are melted for the front LED.

Quoted 6 lines

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +6 -0

+		sata0_power: regulator at 1 {
+			compatible = "regulator-fixed";
+			reg = <1>;
+			regulator-name = "SATA0 Power";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;

arch/arm/boot/dts/kirkwood-d2net-v2.dts line 212

Quoted 4 lines

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +4 -0

+			enable-active-high;
+			regulator-always-on;
+			regulator-boot-on;
+			gpio = <&gpio0 16 0>;

I don't know the regulator API at all. But is that possible to allow a user to enable/disable the SATA0 power ? If yes, then it should be great to have the appropriate setting.

arch/arm/mach-kirkwood/Kconfig menu "Marvell Kirkwood Implementations" · line 13

Quoted 6 lines

arch/arm/mach-kirkwood/Kconfig +0 -6

-config MACH_D2NET_V2
-	bool "LaCie d2 Network v2 NAS Board"
-	select KIRKWOOD_LEGACY
-	help
-	  Say 'Y' here if you want your kernel to support the
-	  LaCie d2 Network v2 NAS.

Before removing this option, we need to fix the Kconfig dependencies for the LED driver leds-ns2. I will send a patch to do that.

With the DT conversion, the board Kconfig symbols MACH_ are going to be removed. In order to prepare this removal, this patch replaces alls the machines dependencies for leds-ns2 by ARCH_KIRKWOOD.

Signed-off-by Simon Guinot <[email protected]>

---
Thomas,

Please, insert this patch in your series before the patch named:
[PATCHv2 1/9] ARM: kirkwood: convert d2net_v2 to DT

Simon

 drivers/leds/Kconfig |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Quoted 11 lines · Simon Guinot

With the DT conversion, the board Kconfig symbols MACH_ are going to be removed. In order to prepare this removal, this patch replaces alls the machines dependencies for leds-ns2 by ARCH_KIRKWOOD.

Signed-off-by Simon Guinot <[email protected]>

---
Thomas,

Please, insert this patch in your series before the patch named:
[PATCHv2 1/9] ARM: kirkwood: convert d2net_v2 to DT

Quoted 4 lines

Simon

 drivers/leds/Kconfig |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Almost missed this one. This should also go through -leds.

Acked-by Jason Cooper <[email protected]>

This commit completely converts the d2net_v2 Kirkwood board to use a Device Tree representation.

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

---
 arch/arm/boot/dts/Makefile              |   1 +
 arch/arm/boot/dts/kirkwood-d2net-v2.dts | 231 ++++++++++++++++++++++++++++++++
 arch/arm/mach-kirkwood/Kconfig          |   7 -
 arch/arm/mach-kirkwood/Makefile         |   2 +-
 arch/arm/mach-kirkwood/d2net_v2-setup.c | 231 --------------------------------
 5 files changed, 233 insertions(+), 239 deletions(-)
 create mode 100644 arch/arm/boot/dts/kirkwood-d2net-v2.dts
 delete mode 100644 arch/arm/mach-kirkwood/d2net_v2-setup.c

arch/arm/boot/dts/kirkwood-d2net-v2.dts line 201

Quoted 6 lines

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +6 -0

+       regulators {
+               compatible = "simple-bus";
+               pinctrl-0 = <&pmx_sata_power>;
+               pinctrl-names = "default";
+               #address-cells = <1>;
+               #size-cells = <0>;

That's not really a simple-bus if there's no mapping to the parent's address space (and it represents a completely different concept of address).

Could you explain what the pinctrl's doing here? I couldn't see what code would be handling that given the node will get probed as a simple-bus and the regulator-fixed binding doesn't mention anything about the parent node.

arch/arm/boot/dts/kirkwood-d2net-v2.dts line 205

Quoted 4 lines

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +4 -0

+
+               sata0_power: regulator at 1 {
+                       compatible = "regulator-fixed";
+                       reg = <1>;

Do we even need the unit-address?

Dear Mark Rutland,

Quoted 11 lines

arch/arm/boot/dts/kirkwood-d2net-v2.dts line 201

Quoted 7 lines

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +6 -0

+       regulators {
+               compatible = "simple-bus";
+               pinctrl-0 = <&pmx_sata_power>;
+               pinctrl-names = "default";
+               #address-cells = <1>;
+               #size-cells = <0>;

That's not really a simple-bus if there's no mapping to the parent's address space (and it represents a completely different concept of address).

Right, but I guess it is needed for the child nodes to be considered as platform devices. There are already gazillions of .dts doing this in arch/arm/boot/dts, not only Kirkwood platforms, but also Tegra platforms, i.MX platforms and a bunch of others. While I admit it doesn't look the most appropriate representation, I believe that considering the number of existing users, solving this problem is a separate matter to the conversion of the d2net_v2 to the Device Tree.

Quoted 5 lines

Could you explain what the pinctrl's doing here? I couldn't see what code would be handling that given the node will get probed as a simple-bus and the regulator-fixed binding doesn't mention anything about the parent node.

Right, the pinctrl should be one-level down, in the DT sub-node that describes the regulator, so that it get automatically configured because the regulator driver is a platform_driver.

I'll fix this.

Quoted 7 lines

arch/arm/boot/dts/kirkwood-d2net-v2.dts line 205

Quoted 5 lines

arch/arm/boot/dts/kirkwood-d2net-v2.dts new file +4 -0

+
+               sata0_power: regulator at 1 {
+                       compatible = "regulator-fixed";
+                       reg = <1>;

Do we even need the unit-address?

No, I'll fix this one as well.

The Kirkwood Dockstar platform has already been converted to the Device Tree, so we can remove the legacy booting option for this platform.

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

---
 arch/arm/mach-kirkwood/Kconfig          |   7 --
 arch/arm/mach-kirkwood/Makefile         |   1 -
 arch/arm/mach-kirkwood/dockstar-setup.c | 111 --------------------------------
 3 files changed, 119 deletions(-)
 delete mode 100644 arch/arm/mach-kirkwood/dockstar-setup.c

The Kirkwood Guruplug platform has already been converted to the Device Tree, so we can remove the legacy booting option for this platform.

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

---
 arch/arm/mach-kirkwood/Kconfig          |   7 --
 arch/arm/mach-kirkwood/Makefile         |   1 -
 arch/arm/mach-kirkwood/guruplug-setup.c | 133 --------------------------------
 3 files changed, 141 deletions(-)
 delete mode 100644 arch/arm/mach-kirkwood/guruplug-setup.c

arch/arm/mach-kirkwood/guruplug-setup.c +0 -0

Quoted 12 lines · Thomas Petazzoni

The Kirkwood Guruplug platform has already been converted to the Device Tree, so we can remove the legacy booting option for this platform.

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

---
 arch/arm/mach-kirkwood/Kconfig          |   7 --
 arch/arm/mach-kirkwood/Makefile         |   1 -
 arch/arm/mach-kirkwood/guruplug-setup.c | 133 --------------------------------
 3 files changed, 141 deletions(-)
 delete mode 100644 arch/arm/mach-kirkwood/guruplug-setup.c

...

Quoted 1 line

arch/arm/mach-kirkwood/guruplug-setup.c +0 -0

...

arch/arm/mach-kirkwood/guruplug-setup.c line 52

Quoted 3 lines

arch/arm/mach-kirkwood/guruplug-setup.c +0 -3

-static struct mv_sata_platform_data guruplug_sata_data = {
-	.n_ports	= 1,
-};

This just caught my eye. iirc, there were two flavors of the Guruplug, the Guruplug, and the Guruplug Server Plus (had eSATA plus something else).

This commit converts the LaCie Net2big and Net5Big Kirkwood boards to use a Device Tree representation. All devices are converted to use a DT representation, except the GPIO extension leds that use a special leds-netxbig driver that does not yet have a DT binding.

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

---
 arch/arm/boot/dts/Makefile                |   2 +
 arch/arm/boot/dts/kirkwood-net2big-v2.dts | 219 ++++++++++++++++
 arch/arm/boot/dts/kirkwood-net5big-v2.dts | 265 +++++++++++++++++++
 arch/arm/mach-kirkwood/Kconfig            |  26 +-
 arch/arm/mach-kirkwood/Makefile           |   4 +-
 arch/arm/mach-kirkwood/board-dt.c         |   4 +
 arch/arm/mach-kirkwood/board-netxbig_v2.c | 199 ++++++++++++++
 arch/arm/mach-kirkwood/common.h           |   6 +
 arch/arm/mach-kirkwood/netxbig_v2-setup.c | 422 ------------------------------
 9 files changed, 709 insertions(+), 438 deletions(-)
 create mode 100644 arch/arm/boot/dts/kirkwood-net2big-v2.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-net5big-v2.dts
 create mode 100644 arch/arm/mach-kirkwood/board-netxbig_v2.c
 delete mode 100644 arch/arm/mach-kirkwood/netxbig_v2-setup.c

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

index d168bed..20a6886 100644
@@ -85,6 +85,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
 	kirkwood-lsxhl.dtb \
 	kirkwood-mplcec4.dtb \
 	kirkwood-mv88f6281gtw-ge.dtb \
+	kirkwood-net2big-v2.dtb \
+	kirkwood-net5big-v2.dtb \
 	kirkwood-netgear_readynas_duo_v2.dtb \
 	kirkwood-ns2.dtb \
 	kirkwood-ns2lite.dtb \

arch/arm/boot/dts/kirkwood-net2big-v2.dts new file +12 -0

new file mode 100644
index 0000000..608ef01
@@ -0,0 +1,219 @@
+/*
+ * LaCie 2Big Network v2
+ *
+ * Simon Guinot <[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/;
+

arch/arm/boot/dts/kirkwood-net2big-v2.dts new file +91 -0

+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8 earlyprintk";
+	};
+
+	ocp at f1000000 {
+		pinctrl at 10000 {
+			pinctrl-0 = <&pmx_misc &pmx_sysrst>;
+			pinctrl-names = "default";
+
+			pmx_keys: pmx-keys {
+				marvell,pins = "mpp13", "mpp15", "mpp34";
+				marvell,function = "gpio";
+			};
+
+			pmx_sata_power: pmx-sata-power {
+				marvell,pins = "mpp16", "mpp17";
+				marvell,function = "gpio";
+			};
+
+			pmx_sata1: pmx-sata1 {
+				marvell,pins = "mpp20";
+				marvell,function = "sata1";
+			};
+
+			pmx_sata0: pmx-sata0 {
+				marvell,pins = "mpp21";
+				marvell,function = "sata0";
+			};
+
+			pmx_poweroff: pmx-poweroff {
+				marvell,pins = "mpp7";
+				marvell,function = "gpo";
+			};
+
+			pmx_sysrst: pmx-sysrst {
+				marvell,pins = "mpp6";
+				marvell,function = "sysrst";
+			};
+
+			/*
+			 * MPP14: USB fuse alarm
+			 * MPP24: USB mode select
+			 * MPP26: USB device vbus
+			 * MPP28: USB enable host vbus
+			 * MPP35: inhibit switch power-off
+			 * MPP36: SATA HDD1 presence
+			 * MPP37: SATA HDD2 presence
+			 * MPP40: eSATA presence
+			 * MPP44: GPIO extension (data 0)
+			 * MPP45: GPIO extension (data 1)
+			 * MPP46: GPIO extension (data 2)
+			 * MPP47: GPIO extension (addr 0)
+			 * MPP48: GPIO extension (addr 1)
+			 * MPP49: GPIO extension (addr 2)
+			 */
+			pmx_misc: pmx-misc {
+				marvell,pins = "mpp14", "mpp24", "mpp26", "mpp28", "mpp29",
+					       "mpp35", "mpp36", "mpp37", "mpp40", "mpp44",
+					       "mpp45", "mpp46", "mpp47", "mpp48", "mpp49";
+				marvell,function = "gpio";
+			};
+		};
+
+		spi at 10600 {
+			status = "okay";
+			pinctrl-0 = <&pmx_spi>;
+			pinctrl-names = "default";
+
+			flash at 0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "mx25l4005a";
+				reg = <0>;
+				spi-max-frequency = <20000000>;
+				mode = <0>;
+
+				partition at 0 {
+					reg = <0x0 0x80000>;
+					label = "u-boot";
+				};
+			};
+		};
+
+		i2c at 11000 {
+			status = "okay";
+			pinctrl-0 = <&pmx_twsi0>;
+			pinctrl-names = "default";
+
+			eeprom at 50 {

arch/arm/boot/dts/kirkwood-net2big-v2.dts new file +60 -0

+			status = "ok";
+		};
+
+		ehci at 50000 {
+			status = "okay";
+		};
+
+		sata at 80000 {
+			pinctrl-0 = <&pmx_sata0 &pmx_sata1>;
+			pinctrl-names = "default";
+			status = "okay";
+			nr-ports = <2>;
+		};
+	};
+
+        gpio_poweroff {
+		compatible = "gpio-poweroff";
+		pinctrl-0 = <&pmx_poweroff>;
+		pinctrl-names = "default";
+		gpios = <&gpio0 7 0>;
+        };
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		pinctrl-0 = <&pmx_keys>;
+		pinctrl-names = "default";
+
+		button at 1 {
+			label = "Back power switch (on|auto)";
+			linux,code = <0x1>;
+			linux,input-type = <5>; /* EV_SW */
+			gpios = <&gpio0 13 1>;
+		};
+		button at 2 {
+			label = "Back power switch (auto|off)";
+			linux,code = <0x2>;
+			linux,input-type = <5>; /* EV_SW */
+			gpios = <&gpio0 15 1>;
+		};
+		button at 3 {
+			label = "Function button";
+			linux,code = <0x165>; /* KEY_OPTION */
+			gpios = <&gpio1 3 1>;
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+		pinctrl-0 = <&pmx_sata_power>;
+		pinctrl-names = "default";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		sata0_power: regulator at 1 {
+			compatible = "regulator-fixed";
+			reg = <1>;
+			regulator-name = "SATA0 Power";
+			regulator-min-microvolt = <5000000>;

arch/arm/boot/dts/kirkwood-net2big-v2.dts new file +19 -0

+		};
+	};
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		device_type = "ethernet-phy";
+		reg = <8>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port at 0 {
+		phy-handle = <&ethphy0>;
+	};
+};

arch/arm/boot/dts/kirkwood-net5big-v2.dts new file +12 -0

new file mode 100644
index 0000000..46ca107
@@ -0,0 +1,265 @@
+/*
+ * LaCie 5Big Network v2
+ *
+ * Simon Guinot <[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/;
+

arch/arm/boot/dts/kirkwood-net5big-v2.dts new file +89 -0

+	};
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8 earlyprintk";
+	};
+
+	ocp at f1000000 {
+		pinctrl at 10000 {
+			pinctrl-0 = <&pmx_misc &pmx_sysrst>;
+			pinctrl-names = "default";
+
+			pmx_keys: pmx-keys {
+				marvell,pins = "mpp13", "mpp15", "mpp34";
+				marvell,function = "gpio";
+			};
+
+			pmx_sata_power: pmx-sata-power {
+				marvell,pins = "mpp16", "mpp17", "mpp41", "mpp42", "mpp43";
+				marvell,function = "gpio";
+			};
+
+			pmx_poweroff: pmx-poweroff {
+				marvell,pins = "mpp7";
+				marvell,function = "gpo";
+			};
+
+			pmx_sysrst: pmx-sysrst {
+				marvell,pins = "mpp6";
+				marvell,function = "sysrst";
+			};
+
+			/*
+			 * MPP14: USB fuse alarm
+			 * MPP28: USB enable host vbus
+			 * MPP29: GPIO extension ALE
+			 * MPP35: inhibit switch power-off
+			 * MPP36: SATA HDD1 presence
+			 * MPP37: SATA HDD2 presence
+			 * MPP38: SATA HDD3 presence
+			 * MPP39: SATA HDD4 presence
+			 * MPP40: SATA HDD5 presence
+			 * MPP44: GPIO extension (data 0)
+			 * MPP45: GPIO extension (data 1)
+			 * MPP46: GPIO extension (data 2)
+			 * MPP47: GPIO extension (addr 0)
+			 * MPP48: GPIO extension (addr 1)
+			 * MPP49: GPIO extension (addr 2)
+			 */
+			pmx_misc: pmx-misc {
+				marvell,pins = "mpp14", "mpp28", "mpp29", "mpp35", "mpp36",
+					       "mpp37", "mpp38", "mpp39", "mpp40", "mpp44",
+					       "mpp45", "mpp46", "mpp47", "mpp48", "mpp49";
+				marvell,function = "gpio";
+			};
+
+			pmx_ge1: pmx-ge1 {
+				marvell,pins = "mpp20", "mpp21", "mpp22", "mpp23", "mpp24",
+					       "mpp25", "mpp26", "mpp27", "mpp30", "mpp31",
+					       "mpp32", "mpp33";
+				marvell,function = "ge1";
+			};
+		};
+
+		spi at 10600 {
+			status = "okay";
+			pinctrl-0 = <&pmx_spi>;
+			pinctrl-names = "default";
+
+			flash at 0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "mx25l4005a";
+				reg = <0>;
+				spi-max-frequency = <20000000>;
+				mode = <0>;
+
+				partition at 0 {
+					reg = <0x0 0x80000>;
+					label = "u-boot";
+				};
+			};
+		};
+
+		i2c at 11000 {
+			status = "okay";
+			pinctrl-0 = <&pmx_twsi0>;
+			pinctrl-names = "default";
+
+			eeprom at 50 {

arch/arm/boot/dts/kirkwood-net5big-v2.dts new file +60 -0

+			status = "ok";
+		};
+
+		ehci at 50000 {
+			status = "okay";
+		};
+
+		sata at 80000 {
+			pinctrl-0 = <&pmx_sata0 &pmx_sata1>;
+			pinctrl-names = "default";
+			status = "okay";
+			nr-ports = <2>;
+		};
+	};
+
+        gpio_poweroff {
+		compatible = "gpio-poweroff";
+		pinctrl-0 = <&pmx_poweroff>;
+		pinctrl-names = "default";
+		gpios = <&gpio0 7 0>;
+        };
+
+	gpio_keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+		pinctrl-0 = <&pmx_keys>;
+		pinctrl-names = "default";
+
+		button at 1 {
+			label = "Back power switch (on|auto)";
+			linux,code = <0x1>;
+			linux,input-type = <5>; /* EV_SW */
+			gpios = <&gpio0 13 1>;
+		};
+		button at 2 {
+			label = "Back power switch (auto|off)";
+			linux,code = <0x2>;
+			linux,input-type = <5>; /* EV_SW */
+			gpios = <&gpio0 15 1>;
+		};
+		button at 3 {
+			label = "Function button";
+			linux,code = <0x165>; /* KEY_OPTION */
+			gpios = <&gpio1 3 1>;
+		};
+	};
+
+	regulators {
+		compatible = "simple-bus";
+		pinctrl-0 = <&pmx_sata_power>;
+		pinctrl-names = "default";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		sata0_power: regulator at 1 {
+			compatible = "regulator-fixed";
+			reg = <1>;
+			regulator-name = "SATA0 Power";
+			regulator-min-microvolt = <5000000>;

arch/arm/boot/dts/kirkwood-net5big-v2.dts new file +27 -0

+			regulator-name = "SATA4 Power";
+			regulator-min-microvolt = <5000000>;
+			regulator-max-microvolt = <5000000>;
+			enable-active-high;
+			regulator-always-on;
+			regulator-boot-on;
+			gpio = <&gpio1 11 0>;
+                };
+        };
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		device_type = "ethernet-phy";
+		reg = <8>;
+	};
+
+	ethphy1: ethernet-phy at 1 {
+		device_type = "ethernet-phy";
+		reg = <0>;
+	};
+};
+
+&eth0 {
+	status = "okay";

arch/arm/boot/dts/kirkwood-net5big-v2.dts new file +1 -0

+};

arch/arm/mach-kirkwood/Kconfig +2 -14

index f624162..b7e66fa 100644
@@ -5,20 +5,6 @@ menu "Marvell Kirkwood Implementations"
 config KIRKWOOD_LEGACY
 	bool
 
-config MACH_NET2BIG_V2
-	bool "LaCie 2Big Network v2 NAS Board"
-	select KIRKWOOD_LEGACY
-	help
-	  Say 'Y' here if you want your kernel to support the
-	  LaCie 2Big Network v2 NAS.
-
-config MACH_NET5BIG_V2
-	bool "LaCie 5Big Network v2 NAS Board"
-	select KIRKWOOD_LEGACY
-	help
-	  Say 'Y' here if you want your kernel to support the
-	  LaCie 5Big Network v2 NAS.
-
 config MACH_OPENRD
 	select KIRKWOOD_LEGACY
         bool

@@ -113,6 +99,18 @@ config MACH_MV88F6281GTW_GE_DT
 	  Say 'Y' here if you want your kernel to support the
 	  Marvell 88F6281 GTW GE Board (Flattened Device Tree).
 
+config MACH_NET2BIG_V2_DT
+	bool "LaCie 2Big Network v2 NAS Board (Flattened Device Tree)"

arch/arm/mach-kirkwood/Kconfig +0 -0

 endmenu
 
 endif

arch/arm/mach-kirkwood/Makefile +0 -2

index 0dcc5d4..38d0d74 100644
@@ -1,8 +1,6 @@
 obj-y				+= common.o pcie.o
 obj-$(CONFIG_KIRKWOOD_LEGACY)	+= irq.o mpp.o
 
-obj-$(CONFIG_MACH_NET2BIG_V2)		+= netxbig_v2-setup.o lacie_v2-common.o
-obj-$(CONFIG_MACH_NET5BIG_V2)		+= netxbig_v2-setup.o lacie_v2-common.o
 obj-$(CONFIG_MACH_OPENRD)		+= openrd-setup.o
 obj-$(CONFIG_MACH_RD88F6192_NAS)	+= rd88f6192-nas-setup.o
 obj-$(CONFIG_MACH_RD88F6281)		+= rd88f6281-setup.o

arch/arm/mach-kirkwood/board-dt.c +0 -0

index b129c65..80955cc 100644

Quoted 21 lines · Thomas Petazzoni

This commit converts the LaCie Net2big and Net5Big Kirkwood boards to use a Device Tree representation. All devices are converted to use a DT representation, except the GPIO extension leds that use a special leds-netxbig driver that does not yet have a DT binding.

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

---
 arch/arm/boot/dts/Makefile                |   2 +
 arch/arm/boot/dts/kirkwood-net2big-v2.dts | 219 ++++++++++++++++
 arch/arm/boot/dts/kirkwood-net5big-v2.dts | 265 +++++++++++++++++++
 arch/arm/mach-kirkwood/Kconfig            |  26 +-
 arch/arm/mach-kirkwood/Makefile           |   4 +-
 arch/arm/mach-kirkwood/board-dt.c         |   4 +
 arch/arm/mach-kirkwood/board-netxbig_v2.c | 199 ++++++++++++++
 arch/arm/mach-kirkwood/common.h           |   6 +
 arch/arm/mach-kirkwood/netxbig_v2-setup.c | 422 ------------------------------
 9 files changed, 709 insertions(+), 438 deletions(-)
 create mode 100644 arch/arm/boot/dts/kirkwood-net2big-v2.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-net5big-v2.dts
 create mode 100644 arch/arm/mach-kirkwood/board-netxbig_v2.c
 delete mode 100644 arch/arm/mach-kirkwood/netxbig_v2-setup.c

arch/arm/boot/dts/kirkwood-net2big-v2.dts line 123

Quoted 4 lines

arch/arm/boot/dts/kirkwood-net2big-v2.dts new file +4 -0

+		serial at 12000 {
+			pinctrl-0 = <&pmx_uart0>;
+			pinctrl-names = "default";
+			clock-frequency = <200000000>;

The serial clock-frequency is 166666667 for the net2big_v2 as well as the TCLK frequency. It could smart to inherit the clock frequencies (if not given) from the TCLK.

With the DT conversion, the board Kconfig symbols MACH_ are going to be removed. In order to prepare this removal, this patch replaces alls the machines dependencies for leds-netxbig by ARCH_KIRKWOOD.

Signed-off-by Simon Guinot <[email protected]>

---
Thomas,

Please, insert this patch in your series before the patch named:
[PATCHv2 7/9] ARM: kirkwood: convert LaCie Net{2, 5}Big v2 platforms to DT

 drivers/leds/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/leds/Kconfig +1 -1

index 0e41460..7226696 100644
@@ -407,8 +407,8 @@ config LEDS_NS2
 
 config LEDS_NETXBIG
 	tristate "LED support for Big Network series LEDs"
-	depends on MACH_NET2BIG_V2 || MACH_NET5BIG_V2
 	depends on LEDS_CLASS
+	depends on ARCH_KIRKWOOD
 	default y
 	help
 	  This option enable support for LEDs found on the LaCie 2Big

Signature · 1 line

1.7.10.4

Quoted 8 lines · Simon Guinot

With the DT conversion, the board Kconfig symbols MACH_ are going to be removed. In order to prepare this removal, this patch replaces alls the machines dependencies for leds-netxbig by ARCH_KIRKWOOD.

Signed-off-by Simon Guinot <[email protected]>

---
Thomas,

Quoted 2 lines

Please, insert this patch in your series before the patch named:
[PATCHv2 7/9] ARM: kirkwood: convert LaCie Net{2, 5}Big v2 platforms to DT

Nah, this should go through linux-leds.

Acked-by Jason Cooper <[email protected]>

Quoted 21 lines

 drivers/leds/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/leds/Kconfig +1 -2

index 0e41460..7226696 100644
@@ -407,8 +407,8 @@ config LEDS_NS2
 
 config LEDS_NETXBIG
      tristate "LED support for Big Network series LEDs"
-     depends on MACH_NET2BIG_V2 || MACH_NET5BIG_V2
      depends on LEDS_CLASS
+     depends on ARCH_KIRKWOOD
      default y
      help
        This option enable support for LEDs found on the LaCie 2Big
--

1.7.10.4

Quoted 12 lines · Jason Cooper

Quoted 10 lines · Simon Guinot

With the DT conversion, the board Kconfig symbols MACH_ are going to be removed. In order to prepare this removal, this patch replaces alls the machines dependencies for leds-netxbig by ARCH_KIRKWOOD.

Signed-off-by Simon Guinot <[email protected]>

---
Thomas,

Please, insert this patch in your series before the patch named:
[PATCHv2 7/9] ARM: kirkwood: convert LaCie Net{2, 5}Big v2 platforms to DT

Quoted 4 lines

Nah, this should go through linux-leds.

Acked-by Jason Cooper <[email protected]>

I can merge this patch through my tree but when will that kirkwood patch be merged?

How about merge this with those kirkwood patches with my ack:

Acked-by Bryan Wu <[email protected]>

Quoted 21 lines

Quoted 21 lines

 drivers/leds/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/leds/Kconfig +1 -2

index 0e41460..7226696 100644
@@ -407,8 +407,8 @@ config LEDS_NS2
 
 config LEDS_NETXBIG
      tristate "LED support for Big Network series LEDs"
-     depends on MACH_NET2BIG_V2 || MACH_NET5BIG_V2
      depends on LEDS_CLASS
+     depends on ARCH_KIRKWOOD
      default y
      help
        This option enable support for LEDs found on the LaCie 2Big
--

1.7.10.4

Bryan,

Quoted 13 lines · Bryan Wu

Quoted 12 lines · Jason Cooper

Quoted 10 lines · Simon Guinot

With the DT conversion, the board Kconfig symbols MACH_ are going to be removed. In order to prepare this removal, this patch replaces alls the machines dependencies for leds-netxbig by ARCH_KIRKWOOD.

Signed-off-by Simon Guinot <[email protected]>

---
Thomas,

Please, insert this patch in your series before the patch named:
[PATCHv2 7/9] ARM: kirkwood: convert LaCie Net{2, 5}Big v2 platforms to DT

Quoted 7 lines

Quoted 4 lines

Nah, this should go through linux-leds.

Acked-by Jason Cooper <[email protected]>

I can merge this patch through my tree but when will that kirkwood patch be merged?

It's okay, it falls in the same category as the other patch you merged. There's no dependency between this patch and the rest of this series, despite the above request to insert.

thx,

Jason.

Quoted 3 lines

How about merge this with those kirkwood patches with my ack:

Acked-by Bryan Wu <[email protected]>

No, no, no. I'm trying to encourage patches to go through the proper trees when possible. :-P

Quoted 21 lines

Quoted 21 lines

Quoted 21 lines

 drivers/leds/Kconfig |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/leds/Kconfig +1 -2

index 0e41460..7226696 100644
@@ -407,8 +407,8 @@ config LEDS_NS2
 
 config LEDS_NETXBIG
      tristate "LED support for Big Network series LEDs"
-     depends on MACH_NET2BIG_V2 || MACH_NET5BIG_V2
      depends on LEDS_CLASS
+     depends on ARCH_KIRKWOOD
      default y
      help
        This option enable support for LEDs found on the LaCie 2Big
--

1.7.10.4

Now that all LaCie platforms have been converted to use the Device Tree, we can get rid of the lacie_v2-common.{c,h} files.

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

---
 arch/arm/mach-kirkwood/lacie_v2-common.c | 114 -------------------------------
 arch/arm/mach-kirkwood/lacie_v2-common.h |  16 -----
 2 files changed, 130 deletions(-)
 delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.c
 delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.h

arch/arm/mach-kirkwood/lacie_v2-common.c deleted +0 -114

deleted file mode 100644
index 4894959..0000000
@@ -1,114 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/lacie_v2-common.c
- *
- * 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.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mtd/physmap.h>
-#include <linux/spi/flash.h>
-#include <linux/spi/spi.h>
-#include <linux/i2c.h>
-#include <linux/i2c/at24.h>
-#include <linux/gpio.h>
-#include <asm/mach/time.h>
-#include <mach/kirkwood.h>
-#include <mach/irqs.h>
-#include <plat/time.h>
-#include "common.h"
-#include "lacie_v2-common.h"
-
-/*****************************************************************************
- * 512KB SPI Flash on Boot Device (MACRONIX MX25L4005)
- ****************************************************************************/
-
-static struct mtd_partition lacie_v2_flash_parts[] = {
-	{
-		.name = "u-boot",
-		.size = MTDPART_SIZ_FULL,
-		.offset = 0,
-		.mask_flags = MTD_WRITEABLE, /* force read-only */
-	},
-};
-
-static const struct flash_platform_data lacie_v2_flash = {
-	.type		= "mx25l4005a",
-	.name		= "spi_flash",
-	.parts		= lacie_v2_flash_parts,
-	.nr_parts	= ARRAY_SIZE(lacie_v2_flash_parts),
-};
-
-static struct spi_board_info __initdata lacie_v2_spi_slave_info[] = {
-	{
-		.modalias	= "m25p80",
-		.platform_data	= &lacie_v2_flash,
-		.irq		= -1,
-		.max_speed_hz	= 20000000,
-		.bus_num	= 0,
-		.chip_select	= 0,
-	},
-};
-
-void __init lacie_v2_register_flash(void)
-{
-	spi_register_board_info(lacie_v2_spi_slave_info,
-				ARRAY_SIZE(lacie_v2_spi_slave_info));
-	kirkwood_spi_init();
-}
-
-/*****************************************************************************
- * I2C devices
- ****************************************************************************/
-
-static struct at24_platform_data at24c04 = {
-	.byte_len	= SZ_4K / 8,
-	.page_size	= 16,
-};
-
-/*
- * i2c addr | chip         | description
- * 0x50     | HT24LC04     | eeprom (512B)
- */
-
-static struct i2c_board_info __initdata lacie_v2_i2c_info[] = {
-	{
-		I2C_BOARD_INFO("24c04", 0x50),
-		.platform_data  = &at24c04,
-	}
-};
-
-void __init lacie_v2_register_i2c_devices(void)
-{
-	kirkwood_i2c_init();
-	i2c_register_board_info(0, lacie_v2_i2c_info,
-				ARRAY_SIZE(lacie_v2_i2c_info));
-}
-
-/*****************************************************************************
- * Hard Disk power
- ****************************************************************************/
-
-static int __initdata lacie_v2_gpio_hdd_power[] = { 16, 17, 41, 42, 43 };
-
-void __init lacie_v2_hdd_power_init(int hdd_num)
-{
-	int i;
-	int err;
-
-	/* Power up all hard disks. */
-	for (i = 0; i < hdd_num; i++) {
-		err = gpio_request(lacie_v2_gpio_hdd_power[i], NULL);
-		if (err == 0) {
-			err = gpio_direction_output(
-					lacie_v2_gpio_hdd_power[i], 1);
-			/* Free the HDD power GPIOs. This allow user-space to
-			 * configure them via the gpiolib sysfs interface. */
-			gpio_free(lacie_v2_gpio_hdd_power[i]);
-		}
-		if (err)
-			pr_err("Failed to power up HDD%d\n", i + 1);
-	}
-}

arch/arm/mach-kirkwood/lacie_v2-common.h deleted +0 -16

deleted file mode 100644
index fc64f57..0000000
@@ -1,16 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/lacie_v2-common.h
- *
- * 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.
- */
-
-#ifndef __ARCH_KIRKWOOD_LACIE_V2_COMMON_H
-#define __ARCH_KIRKWOOD_LACIE_V2_COMMON_H
-
-void lacie_v2_register_flash(void);
-void lacie_v2_register_i2c_devices(void);
-void lacie_v2_hdd_power_init(int hdd_num);
-
-#endif

Signature · 7 lines

1.8.1.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Hello,

Here is a set of patches that converts a few additional Kirkwood boards to use the Device Tree. I intend to continue this effort with the remaining Kirkwood boards. It is based on the mvebu/boards branch of linux-mvebu.git, which allows to use the Ethernet DT bindings.

Note that I don't have access to any of the platforms that are being converted in this patch series, so this means that:

- A careful review would be useful

- Testing from owners of the boards would be appreciated. The DT conversion of Kirkwood boards is a process that has now been started a while ago, and we would like to finalize it. If board owners don't react by testing the proposed patches, then the support for those boards might be broken.

To ease testing, the branch containing those changes has been pushed to:

https://github.com/MISL-EBU-System-SW/mainline-public/tree/kirkwood-dt-conversion-step1-v2

and kernel images for the affected boards have been uploaded to the following locations. They contain the correct appended DTB, and a small initramfs to ease testing:

http://free-electrons.com/~thomas/pub/kirkwood/uImage.kirkwood-d2net-v2
http://free-electrons.com/~thomas/pub/kirkwood/uImage.kirkwood-mv88f6281gtw-ge
http://free-electrons.com/~thomas/pub/kirkwood/uImage.kirkwood-net2big-v2
http://free-electrons.com/~thomas/pub/kirkwood/uImage.kirkwood-net5big-v2

In detail:

* Patch 1 converts the d2net_v2 board completely to DT.

* Patches 2, 3, 4 and 5 remove support for boards that have already been converted to the Deice Tree, but for which the legacy board file was not removed.

* Patch 6 converts the mv88f6281gtw_ge board to DT.

The remaining devices probed in a legacy way are the mv643xx_eth driver, and the DSA switch (note that I have an Armada 370 platform with a DSA switch, so I'll have to look at how to make this appear in the DT). I've left the Ethernet device not converted to DT because the interaction with the DSA switch is a bit special.

* Patch 7 converts the LaCie Net{2,5}Big v2 platforms to DT

The remaining device probed is the one managed by the leds-netxbig driver. For Ethernet, see above. For leds-netxbig, Simon Guinot is currently working on this (see the LAKML thread "Location for a kind of GPIO bus driver").

* Patch 8 removes some common code for LaCie boards that has become useless after the DT conversions.

* Patch 9 adjusts kirkwood_defconfig after the DT conversions.