Skip to contentSkip to conversation

DT support for LaCie 2Big and 5Big Network v2

PATCH Superseded Andrew Lunn 3 participants 11 messages May 11, 2014 – May 23, 2014

Subsystems (5)
Device tree bindings Arm (32-bit) Arm sub-architectures Arm and arm64 SoC sub-architectures (common parts) +1 more subsystems

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Andrew Lunn

author maintainer
#0 lore raw

v3 cover DT support for LaCie 2Big and 5Big Network v2

v3:
gpio_poweroff -> gpio-poweroff, etc.
Add stdout-path
Remove pinctrl property from spi, set in kirkwood.dtsi.

Andrew Lunn (4):
ARM: Kirkwood: Add board file for netxbig LEDs
ARM: Kirkwood: Add DT descriptions for net2big and net5big.
ARM: mvebu: Add LaCie 2Big and 5Big Network v2
ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2

 arch/arm/boot/dts/Makefile              |   2 +
 arch/arm/boot/dts/kirkwood-net2big.dts  |  30 +++++
 arch/arm/boot/dts/kirkwood-net5big.dts  |  83 ++++++++++++++
 arch/arm/boot/dts/kirkwood-netxbig.dtsi | 166 +++++++++++++++++++++++++++
 arch/arm/configs/multi_v5_defconfig     |   1 +
 arch/arm/configs/mvebu_v5_defconfig     |   1 +
 arch/arm/mach-mvebu/Kconfig             |   7 ++
 arch/arm/mach-mvebu/Makefile            |   1 +
 arch/arm/mach-mvebu/board-netxbig.c     | 191 ++++++++++++++++++++++++++++++++
 arch/arm/mach-mvebu/board.h             |   5 +
 arch/arm/mach-mvebu/kirkwood.c          |   3 +
 11 files changed, 490 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi
 create mode 100644 arch/arm/mach-mvebu/board-netxbig.c
Signature · 1 line
2.0.0.rc2
author maintainer
#1 lore raw

PATCH v3 1/4 ARM: Kirkwood: Add board file for netxbig LEDs

There is currently no DT binding for the CPLD which controls the LEDs on the Net 2Big and Net 5Big. So use a platform device.

Signed-off-by Andrew Lunn <[email protected]>
---
 arch/arm/mach-mvebu/Kconfig         |   7 ++
 arch/arm/mach-mvebu/Makefile        |   1 +
 arch/arm/mach-mvebu/board-netxbig.c | 191 ++++++++++++++++++++++++++++++++++++
 arch/arm/mach-mvebu/board.h         |   5 +
 arch/arm/mach-mvebu/kirkwood.c      |   3 +
 5 files changed, 207 insertions(+)
 create mode 100644 arch/arm/mach-mvebu/board-netxbig.c
arch/arm/mach-mvebu/Kconfig +7 -0
index d6b0a772a6dd..0f9a700d3b50 100644
@@ -104,6 +104,13 @@ config MACH_KIRKWOOD
 	  Say 'Y' here if you want your kernel to support boards based
 	  on the Marvell Kirkwood device tree.
 
+config MACH_NETXBIG
+	bool "LaCie 2Big and 5Big Network v2"
+	depends on MACH_KIRKWOOD
+	help
+	  Say 'Y' here if you want your kernel to support the
+	  LaCie 2Big and 5Big Network v2
+
 endmenu
 
 endif
arch/arm/mach-mvebu/Makefile +1 -0
index 2ecb828e4a8b..15580e48069a 100644
@@ -14,3 +14,4 @@ endif
 
 obj-$(CONFIG_MACH_DOVE)		 += dove.o
 obj-$(CONFIG_MACH_KIRKWOOD)	 += kirkwood.o kirkwood-pm.o
+obj-$(CONFIG_MACH_NETXBIG)	 += board-netxbig.o
arch/arm/mach-mvebu/board-netxbig.c new file +191 -0

191 lines not on this page · raw message

arch/arm/mach-mvebu/board.h +5 -0
index 9c7bb4386f8b..98e32cc2ef3d 100644
@@ -13,4 +13,9 @@
 #ifndef __ARCH_MVEBU_BOARD_H
 #define __ARCH_MVEBU_BOARD_H
 
+#ifdef CONFIG_MACH_NETXBIG
+void netxbig_init(void);
+#else
+static inline void netxbig_init(void) {};
+#endif
 #endif
arch/arm/mach-mvebu/kirkwood.c +3 -0
index 46f105913c84..6b5310828eb2 100644
@@ -180,6 +180,9 @@ static void __init kirkwood_dt_init(void)
 	kirkwood_pm_init();
 	kirkwood_dt_eth_fixup();
 
+	if (of_machine_is_compatible("lacie,netxbig"))
+		netxbig_init();
+
 	of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL);
 }
Signature · 1 line
2.0.0.rc2
author maintainer
#2 lore raw

PATCH v3 2/4 ARM: Kirkwood: Add DT descriptions for net2big and net5big.

In reply to Andrew Lunn

Describe LaCie 2Big and 5Big Network v2 using device tree.

Signed-off-by Andrew Lunn <[email protected]>
Acked-by Sebastian Hesselbarth <[email protected]>

---
v1->v2
Fix size of memory
Clean up ethernet nodes
s/at/atmel/

v2->v3
gpio_poweroff->gpio-poweroff
gpio_key->gpio-key
s/ok/okay
Remove spi pinctrl properties.

---
 arch/arm/boot/dts/Makefile              |   2 +
 arch/arm/boot/dts/kirkwood-net2big.dts  |  30 ++++++
 arch/arm/boot/dts/kirkwood-net5big.dts  |  83 ++++++++++++++++
 arch/arm/boot/dts/kirkwood-netxbig.dtsi | 166 ++++++++++++++++++++++++++++++++
 4 files changed, 281 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi
arch/arm/boot/dts/Makefile +2 -0
index 629eee22e606..facbf0cc2fca 100644
@@ -118,6 +118,8 @@ kirkwood := \
 	kirkwood-lsxhl.dtb \
 	kirkwood-mplcec4.dtb \
 	kirkwood-mv88f6281gtw-ge.dtb \
+	kirkwood-net2big.dtb \
+	kirkwood-net5big.dtb \
 	kirkwood-netgear_readynas_duo_v2.dtb \
 	kirkwood-netgear_readynas_nv+_v2.dtb \
 	kirkwood-ns2.dtb \
arch/arm/boot/dts/kirkwood-net2big.dts new file +30 -0
new file mode 100644
index 000000000000..c3f5281a52f5
@@ -0,0 +1,30 @@
+/*
+ * Device Tree file for LaCie 2Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <[email protected]>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 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/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+#include "kirkwood-netxbig.dtsi"
+
+/ {
+	model = "LaCie 2Big Network v2";
+	compatible = "lacie,net2big", "lacie,netxbig", "marvell,kirkwood-88f6192", "marvell,kirkwood";
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x10000000>;
+	};
+};
arch/arm/boot/dts/kirkwood-net5big.dts new file +83 -0

83 lines not on this page · raw message

arch/arm/boot/dts/kirkwood-netxbig.dtsi new file +166 -0

166 lines not on this page · raw message

Signature · 1 line
2.0.0.rc2
#3 lore raw

PATCH v3 2/4 ARM: Kirkwood: Add DT descriptions for net2big and net5big.

Quoted 58 lines · Andrew Lunn

Describe LaCie 2Big and 5Big Network v2 using device tree.

Signed-off-by Andrew Lunn <[email protected]>
Acked-by Sebastian Hesselbarth <[email protected]>

---
v1->v2
Fix size of memory
Clean up ethernet nodes
s/at/atmel/

v2->v3
gpio_poweroff->gpio-poweroff
gpio_key->gpio-key
s/ok/okay
Remove spi pinctrl properties.

---
 arch/arm/boot/dts/Makefile              |   2 +
 arch/arm/boot/dts/kirkwood-net2big.dts  |  30 ++++++
 arch/arm/boot/dts/kirkwood-net5big.dts  |  83 ++++++++++++++++
 arch/arm/boot/dts/kirkwood-netxbig.dtsi | 166 ++++++++++++++++++++++++++++++++
 4 files changed, 281 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi
arch/arm/boot/dts/Makefile +2 -0
index 629eee22e606..facbf0cc2fca 100644
@@ -118,6 +118,8 @@ kirkwood := \
 	kirkwood-lsxhl.dtb \
 	kirkwood-mplcec4.dtb \
 	kirkwood-mv88f6281gtw-ge.dtb \
+	kirkwood-net2big.dtb \
+	kirkwood-net5big.dtb \
 	kirkwood-netgear_readynas_duo_v2.dtb \
 	kirkwood-netgear_readynas_nv+_v2.dtb \
 	kirkwood-ns2.dtb \
arch/arm/boot/dts/kirkwood-net2big.dts new file +14 -0
new file mode 100644
index 000000000000..c3f5281a52f5
@@ -0,0 +1,30 @@
+/*
+ * Device Tree file for LaCie 2Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <[email protected]>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 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.
+*/

arch/arm/boot/dts/kirkwood-net2big.dts line 24

Quoted 10 lines
arch/arm/boot/dts/kirkwood-net2big.dts new file +10 -0
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+#include "kirkwood-netxbig.dtsi"
+
+/ {
+	model = "LaCie 2Big Network v2";
+	compatible = "lacie,net2big", "lacie,netxbig", "marvell,kirkwood-88f6192", "marvell,kirkwood";

While the file name kirkwood-net2big.dtsi is correct (thanks to the kirkwood prefix), "lacie,net2big" is not. It refers to the 2Big Network board (Orion based). Even if there is no DT support for the net2big yet, it could be added latter. Then, I think we should add a _v2 prefix here, just to avoid the confusion.

Also, you should replace the compatible string marvell,kirkwood-88f6192" with "marvell,kirkwood-88f6281".

Quoted 26 lines
arch/arm/boot/dts/kirkwood-net2big.dts new file +6 -0
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x10000000>;
+	};
+};
arch/arm/boot/dts/kirkwood-net5big.dts new file +14 -0
new file mode 100644
index 000000000000..20abe7e37ca2
@@ -0,0 +1,83 @@
+/*
+ * Device Tree file for LaCie 5Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <[email protected]>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 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.
+*/

arch/arm/boot/dts/kirkwood-net5big.dts line 24

Quoted 10 lines
arch/arm/boot/dts/kirkwood-net5big.dts new file +10 -0
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+#include "kirkwood-netxbig.dtsi"
+
+/ {
+	model = "LaCie 5Big Network v2";
+	compatible = "lacie,net2big", "lacie,netxbig", "marvell,kirkwood-88f6192", "marvell,kirkwood";

Same comments here.

Quoted 77 lines
arch/arm/boot/dts/kirkwood-net5big.dts new file +59 -0
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x20000000>;
+	};
+
+};
+
+&regulators {
+	regulator at 3 {
+		compatible = "regulator-fixed";
+		reg = <3>;
+		regulator-name = "hdd2power";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		regulator-always-on;
+		regulator-boot-on;
+		gpio = <&gpio0 19 GPIO_ACTIVE_HIGH>;
+	};
+
+	regulator at 4 {
+		compatible = "regulator-fixed";
+		reg = <4>;
+		regulator-name = "hdd3power";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		regulator-always-on;
+		regulator-boot-on;
+		gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>;
+	};
+
+	regulator at 5 {
+		compatible = "regulator-fixed";
+		reg = <5>;
+		regulator-name = "hdd4power";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		regulator-always-on;
+		regulator-boot-on;
+		gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>;
+	};
+};
+
+&mdio {
+	ethphy1: ethernet-phy at 1 {
+		reg = <0>;
+	};
+};
+
+&eth1 {
+	status = "okay";
+	ethernet1-port at 0 {
+		phy-handle = <&ethphy1>;
+	};
+};
+
arch/arm/boot/dts/kirkwood-netxbig.dtsi new file +12 -0
new file mode 100644
index 000000000000..eca522316560
@@ -0,0 +1,166 @@
+/*
+ * Device Tree common file for LaCie 2Big and 5Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <[email protected]>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 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

arch/arm/boot/dts/kirkwood-netxbig.dtsi line 22

Quoted 10 lines
arch/arm/boot/dts/kirkwood-netxbig.dtsi new file +10 -0
+ * warranty of any kind, whether express or implied.
+*/
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+	chosen {
+		bootargs = "console=ttyS0,115200n8";
+		stdout-path = &uart0;

Note that I had to comment the line above to build this file with Linux 3.15-rc6. The uart alias is missing. I guess it is not an issue with the -mvebu or -next trees.

Quoted 56 lines
arch/arm/boot/dts/kirkwood-netxbig.dtsi new file +56 -0
+	};
+
+	ocp at f1000000 {
+		serial at 12000 {
+			status = "okay";
+		};
+
+		spi at 10600 {
+			status = "okay";
+
+			flash at 0 {
+				#address-cells = <1>;
+				#size-cells = <1>;
+				compatible = "mxicy,mx25l4005a";
+				reg = <0>;
+				spi-max-frequency = <20000000>;
+				mode = <0>;
+
+				partition at 0 {
+					reg = <0x0 0x80000>;
+					label = "u-boot";
+				};
+			};
+		};
+
+		sata at 80000 {
+			status = "okay";
+			nr-ports = <2>;
+		};
+
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		/*
+		 * button at 1 and button at 2 represent a three position rocker
+		 * switch. Thus the conventional KEY_POWER does not fit
+		 */
+		button at 1 {
+			label = "Back power switch (on|auto)";
+			linux,code = <KEY_ESC>;
+			linux,input-type = <5>;
+			gpios = <&gpio0 13 GPIO_ACTIVE_LOW>;
+		};
+		button at 2 {
+			label = "Back power switch (auto|off)";
+			linux,code = <KEY_1>;
+			linux,input-type = <5>;
+			gpios = <&gpio0 15 GPIO_ACTIVE_LOW>;
+		};
+		button at 3 {
+			label = "Function button";
+			linux,code = <KEY_OPTION>;

arch/arm/boot/dts/kirkwood-netxbig.dtsi line 88

Quoted 10 lines
arch/arm/boot/dts/kirkwood-netxbig.dtsi new file +10 -0
+			gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
+		};
+
+	};
+
+	gpio-poweroff {
+		compatible = "gpio-poweroff";
+		gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+	};
+

Alignment and indentation looks wrong for the regulators node below.

Quoted 67 lines
arch/arm/boot/dts/kirkwood-netxbig.dtsi new file +67 -0
+       	regulators: regulators {
+                status = "okay";
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                pinctrl-names = "default";
+
+                regulator at 1 {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        regulator-name = "hdd0power";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        enable-active-high;
+                        regulator-always-on;
+                        regulator-boot-on;
+                        gpio = <&gpio0 16 GPIO_ACTIVE_HIGH>;
+                };
+
+                regulator at 2 {
+                        compatible = "regulator-fixed";
+                        reg = <2>;
+                        regulator-name = "hdd1power";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        enable-active-high;
+                        regulator-always-on;
+                        regulator-boot-on;
+                        gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>;
+                };
+        };
+};
+
+&mdio {
+	status = "okay";
+
+	ethphy0: ethernet-phy at 0 {
+		reg = <8>;
+	};
+
+	ethphy1: ethernet-phy at 1 {
+		reg = <0>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+	ethernet0-port at 0 {
+		phy-handle = <&ethphy0>;
+	};
+};
+
+&pinctrl {
+	pinctrl-names = "default";
+
+	pmx_button_function: pmx-button-function {
+		marvell,pins = "mpp34";
+		marvell,function = "gpio";
+	};
+	pmx_button_power_off: pmx-button-power-off {
+		marvell,pins = "mpp15";
+		marvell,function = "gpio";
+	};
+	pmx_button_power_on: pmx-button-power-on {
+		marvell,pins = "mpp13";
+		marvell,function = "gpio";
+	};

arch/arm/boot/dts/kirkwood-netxbig.dtsi line 165

Quoted 10 lines
arch/arm/boot/dts/kirkwood-netxbig.dtsi new file +10 -0
+};
+
+&i2c0 {
+	status = "okay";
+
+	eeprom at 50 {
+		compatible = "atmel,24c04";
+		pagesize = <16>;
+		reg = <0x50>;
+	};

While we are at it, maybe you could add the following node here:

	g762 at 3e {
		compatible = "gmt,g762";
		reg = <0x3e>;
		clocks = <&g762_clk>;
	};

With, in the ocp at f1000000 node:

	clocks {
		g761_clk: g762-oscillator {
			compatible = "fixed-clock";
			#clock-cells = <0>;
			clock-frequency = <32768>;
		};
	};

This will provide fan support for both 2Big and 5Big Network v2. And yes I feel a little bit ashamed about that :)

Thanks,

Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/4bea0ebf/attachment.sig>

author maintainer
#4 lore raw

PATCH v3 3/4 ARM: mvebu: Add LaCie 2Big and 5Big Network v2

In reply to Andrew Lunn

Enable building LaCie 2Big and 5Big Network v2 in the mvebu v5 kernel.

Signed-off-by Andrew Lunn <[email protected]>
Acked-by Gregory CLEMENT <[email protected]>
---
 arch/arm/configs/mvebu_v5_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/mvebu_v5_defconfig +1 -0
index 27c732fdf21e..e999bb97be79 100644
@@ -12,6 +12,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_NETXBIG=y
 # CONFIG_CPU_FEROCEON_OLD_ID is not set
 CONFIG_PCI_MVEBU=y
 CONFIG_PREEMPT=y
Signature · 1 line
2.0.0.rc2
#5 lore raw

PATCH v3 3/4 ARM: mvebu: Add LaCie 2Big and 5Big Network v2

Quoted 13 lines · Andrew Lunn

Enable building LaCie 2Big and 5Big Network v2 in the mvebu v5 kernel.

Signed-off-by Andrew Lunn <[email protected]>
Acked-by Gregory CLEMENT <[email protected]>
---
 arch/arm/configs/mvebu_v5_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/mvebu_v5_defconfig +0 -0
index 27c732fdf21e..e999bb97be79 100644

arch/arm/configs/mvebu_v5_defconfig CONFIG_MODULE_UNLOAD=y · line 18

Quoted 7 lines
arch/arm/configs/mvebu_v5_defconfig +1 -0
@@ -12,6 +12,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_NETXBIG=y
 # CONFIG_CPU_FEROCEON_OLD_ID is not set
 CONFIG_PCI_MVEBU=y
 CONFIG_PREEMPT=y

If you add the DT fan node, then you want CONFIG_SENSORS_G762=y here.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/255d2a0f/attachment.sig>

author maintainer
#6 lore raw

PATCH v3 4/4 ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2

In reply to Andrew Lunn

Enable building LaCie 2Big and 5Big Network v2 in the multi v5 kernel.

Signed-off-by Andrew Lunn <[email protected]>
---
 arch/arm/configs/multi_v5_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v5_defconfig +1 -0
index 5ebfa8bf8509..02d4e79826d3 100644
@@ -11,6 +11,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_NETXBIG=y
 CONFIG_ARCH_MXC=y
 CONFIG_MACH_IMX25_DT=y
 CONFIG_MACH_IMX27_DT=y
Signature · 1 line
2.0.0.rc2
#7 lore raw

PATCH v3 4/4 ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2

Quoted 12 lines · Andrew Lunn

Enable building LaCie 2Big and 5Big Network v2 in the multi v5 kernel.

Signed-off-by Andrew Lunn <[email protected]>
---
 arch/arm/configs/multi_v5_defconfig | 1 +
 1 file changed, 1 insertion(+)
arch/arm/configs/multi_v5_defconfig +0 -0
index 5ebfa8bf8509..02d4e79826d3 100644

arch/arm/configs/multi_v5_defconfig CONFIG_MODULE_UNLOAD=y · line 17

Quoted 7 lines
arch/arm/configs/multi_v5_defconfig +1 -0
@@ -11,6 +11,7 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_ARCH_MULTI_V7 is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_MACH_KIRKWOOD=y
+CONFIG_MACH_NETXBIG=y
 CONFIG_ARCH_MXC=y
 CONFIG_MACH_IMX25_DT=y
 CONFIG_MACH_IMX27_DT=y

If you add the DT fan node, then you want CONFIG_SENSORS_G762=y here.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/8b16546d/attachment-0001.sig>

#8 lore raw

v3 cover DT support for LaCie 2Big and 5Big Network v2

In reply to Andrew Lunn
Quoted 11 lines · Andrew Lunn

v3:
gpio_poweroff -> gpio-poweroff, etc.
Add stdout-path
Remove pinctrl property from spi, set in kirkwood.dtsi.

Andrew Lunn (4):
ARM: Kirkwood: Add board file for netxbig LEDs
ARM: Kirkwood: Add DT descriptions for net2big and net5big.
ARM: mvebu: Add LaCie 2Big and 5Big Network v2
ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2

Quoted 16 lines
 arch/arm/boot/dts/Makefile              |   2 +
 arch/arm/boot/dts/kirkwood-net2big.dts  |  30 +++++
 arch/arm/boot/dts/kirkwood-net5big.dts  |  83 ++++++++++++++
 arch/arm/boot/dts/kirkwood-netxbig.dtsi | 166 +++++++++++++++++++++++++++
 arch/arm/configs/multi_v5_defconfig     |   1 +
 arch/arm/configs/mvebu_v5_defconfig     |   1 +
 arch/arm/mach-mvebu/Kconfig             |   7 ++
 arch/arm/mach-mvebu/Makefile            |   1 +
 arch/arm/mach-mvebu/board-netxbig.c     | 191 ++++++++++++++++++++++++++++++++
 arch/arm/mach-mvebu/board.h             |   5 +
 arch/arm/mach-mvebu/kirkwood.c          |   3 +
 11 files changed, 490 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi
 create mode 100644 arch/arm/mach-mvebu/board-netxbig.c

Hi Andrew,

I have successfully tested your patch series (on the top of Linux 3.15-rc6) on a 2Big Network v2 board.

Unfortunately, I failed to test the 5Big Network v2 support. My power supply died :( And since the connector is very specific, I have to wait until next Tuesday to get an another one.

Moreover, I have a question. The DT support for the d2 Network v2 board (d2net_v2) is still missing. Since this board is very close from the 2Big Network v2, I think it should be included in this patch series. Do you want me to take care of that ?

Regards,

Simon
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/4509ff54/attachment.sig>

#9 lore raw

v3 cover DT support for LaCie 2Big and 5Big Network v2

Quoted 34 lines · Simon Guinot
Quoted 11 lines · Andrew Lunn

v3:
gpio_poweroff -> gpio-poweroff, etc.
Add stdout-path
Remove pinctrl property from spi, set in kirkwood.dtsi.

Andrew Lunn (4):
ARM: Kirkwood: Add board file for netxbig LEDs
ARM: Kirkwood: Add DT descriptions for net2big and net5big.
ARM: mvebu: Add LaCie 2Big and 5Big Network v2
ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2

Quoted 16 lines
 arch/arm/boot/dts/Makefile              |   2 +
 arch/arm/boot/dts/kirkwood-net2big.dts  |  30 +++++
 arch/arm/boot/dts/kirkwood-net5big.dts  |  83 ++++++++++++++
 arch/arm/boot/dts/kirkwood-netxbig.dtsi | 166 +++++++++++++++++++++++++++
 arch/arm/configs/multi_v5_defconfig     |   1 +
 arch/arm/configs/mvebu_v5_defconfig     |   1 +
 arch/arm/mach-mvebu/Kconfig             |   7 ++
 arch/arm/mach-mvebu/Makefile            |   1 +
 arch/arm/mach-mvebu/board-netxbig.c     | 191 ++++++++++++++++++++++++++++++++
 arch/arm/mach-mvebu/board.h             |   5 +
 arch/arm/mach-mvebu/kirkwood.c          |   3 +
 11 files changed, 490 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi
 create mode 100644 arch/arm/mach-mvebu/board-netxbig.c

Hi Andrew,

I have successfully tested your patch series (on the top of Linux 3.15-rc6) on a 2Big Network v2 board.

Quoted 8 lines

Unfortunately, I failed to test the 5Big Network v2 support. My power supply died :( And since the connector is very specific, I have to wait until next Tuesday to get an another one.

Moreover, I have a question. The DT support for the d2 Network v2 board (d2net_v2) is still missing. Since this board is very close from the 2Big Network v2, I think it should be included in this patch series. Do you want me to take care of that ?

I'm not sure if Andrew is around so I'll pipe up. Please do. Just base it on top of this patch (along with any fixes ;-) ) and send it in-reply-to this series (not a hard requirement, just makes maintainer patch picking easier).

And thanks for taking the time to test!

thx,

Jason.

author maintainer
#10 lore raw

v3 cover DT support for LaCie 2Big and 5Big Network v2

In reply to Simon Guinot
Quoted 29 lines · Simon Guinot
Quoted 11 lines · Andrew Lunn

v3:
gpio_poweroff -> gpio-poweroff, etc.
Add stdout-path
Remove pinctrl property from spi, set in kirkwood.dtsi.

Andrew Lunn (4):
ARM: Kirkwood: Add board file for netxbig LEDs
ARM: Kirkwood: Add DT descriptions for net2big and net5big.
ARM: mvebu: Add LaCie 2Big and 5Big Network v2
ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2

Quoted 16 lines
 arch/arm/boot/dts/Makefile              |   2 +
 arch/arm/boot/dts/kirkwood-net2big.dts  |  30 +++++
 arch/arm/boot/dts/kirkwood-net5big.dts  |  83 ++++++++++++++
 arch/arm/boot/dts/kirkwood-netxbig.dtsi | 166 +++++++++++++++++++++++++++
 arch/arm/configs/multi_v5_defconfig     |   1 +
 arch/arm/configs/mvebu_v5_defconfig     |   1 +
 arch/arm/mach-mvebu/Kconfig             |   7 ++
 arch/arm/mach-mvebu/Makefile            |   1 +
 arch/arm/mach-mvebu/board-netxbig.c     | 191 ++++++++++++++++++++++++++++++++
 arch/arm/mach-mvebu/board.h             |   5 +
 arch/arm/mach-mvebu/kirkwood.c          |   3 +
 11 files changed, 490 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts
 create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi
 create mode 100644 arch/arm/mach-mvebu/board-netxbig.c
Quoted 4 lines

Hi Andrew,

I have successfully tested your patch series (on the top of Linux 3.15-rc6) on a 2Big Network v2 board.

Great, thanks.

Quoted 3 lines

Unfortunately, I failed to test the 5Big Network v2 support. My power supply died :( And since the connector is very specific, I have to wait until next Tuesday to get an another one.

O.K. I think we have missed the merge window for this cycle anyway, so take your time.

Quoted 4 lines

Moreover, I have a question. The DT support for the d2 Network v2 board (d2net_v2) is still missing. Since this board is very close from the 2Big Network v2, I think it should be included in this patch series. Do you want me to take care of that ?

Humm, i thought Thomas had done that conversion. However, it looks like his patches never got picked up:

http://www.spinics.net/lists/arm-kernel/msg263520.html

It would be great if you can finish them off.

Andrew