DT support for LaCie 2Big and 5Big Network v2

PATCH New Andrew Lunn 3 participants 22 messages May 26, 2014 – Jul 13, 2014

Subsystems (5)

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

lore

Share & tools

lore

Andrew Lunn

author maintainer

2014-05-26 19:29 UTC #0 lore raw

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

v4:
Rename board-netxbig.c to netxbig.c
Add _v2 to compatible string for devices
Fix SoC version
tabification
Add Fan controller and clock
Enable fan controller in _defconfig files

Andrew Lunn (4):
ARM: Kirkwood: Add setup 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 | 180 ++++++++++++++++++++++++++++++
 arch/arm/configs/multi_v5_defconfig     |   2 +
 arch/arm/configs/mvebu_v5_defconfig     |   2 +
 arch/arm/mach-mvebu/Kconfig             |   7 ++
 arch/arm/mach-mvebu/Makefile            |   1 +
 arch/arm/mach-mvebu/board.h             |   5 +
 arch/arm/mach-mvebu/kirkwood.c          |   3 +
 arch/arm/mach-mvebu/netxbig.c           | 191 ++++++++++++++++++++++++++++++++
 11 files changed, 506 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/netxbig.c

Signature · 1 line

2.0.0.rc2

Andrew Lunn

author maintainer

2014-05-26 19:29 UTC #1 lore raw

PATCH v4 1/4 ARM: Kirkwood: Add setup 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]>

v3-v4:
rename board-nextbig.c to nextbig.c

---
 arch/arm/mach-mvebu/Kconfig    |   7 ++
 arch/arm/mach-mvebu/Makefile   |   1 +
 arch/arm/mach-mvebu/board.h    |   5 ++
 arch/arm/mach-mvebu/kirkwood.c |   3 +
 arch/arm/mach-mvebu/netxbig.c  | 191 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 207 insertions(+)
 create mode 100644 arch/arm/mach-mvebu/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..db29c1dfe3c5 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)	 += netxbig.o

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);
 }

arch/arm/mach-mvebu/netxbig.c new file +191 -0

191 lines not on this page · raw message

Signature · 1 line

2.0.0.rc2

Jason Cooper

Applied

2014-06-20 20:51 UTC #2 lore raw

PATCH v4 1/4 ARM: Kirkwood: Add setup file for netxbig LEDs

Quoted 6 lines · Andrew Lunn

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]>
v3-v4:
rename board-nextbig.c to nextbig.c

Quoted 8 lines

---
 arch/arm/mach-mvebu/Kconfig    |   7 ++
 arch/arm/mach-mvebu/Makefile   |   1 +
 arch/arm/mach-mvebu/board.h    |   5 ++
 arch/arm/mach-mvebu/kirkwood.c |   3 +
 arch/arm/mach-mvebu/netxbig.c  | 191 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 207 insertions(+)
 create mode 100644 arch/arm/mach-mvebu/netxbig.c

Applied to mvebu/soc

thx,

Jason.

Simon Guinot

2014-06-20 23:24 UTC #3 lore raw

PATCH v4 1/4 ARM: Kirkwood: Add setup file for netxbig LEDs

Quoted 16 lines · Jason Cooper

Quoted 6 lines · Andrew Lunn
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]>
v3-v4:
rename board-nextbig.c to nextbig.c
Quoted 8 lines
---
 arch/arm/mach-mvebu/Kconfig    |   7 ++
 arch/arm/mach-mvebu/Makefile   |   1 +
 arch/arm/mach-mvebu/board.h    |   5 ++
 arch/arm/mach-mvebu/kirkwood.c |   3 +
 arch/arm/mach-mvebu/netxbig.c  | 191 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 207 insertions(+)
 create mode 100644 arch/arm/mach-mvebu/netxbig.c

Quoted 1 line

Applied to mvebu/soc

Hi Jason and Andrew,

First, I apologize for being late (as usual).

Some fixes are still needed for this patch series. See my incoming comments.

Let me know if you want me to send a patch rather than comments.

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/20140621/23f37bc7/attachment.sig>

Simon Guinot

2014-06-20 23:30 UTC #4 lore raw

PATCH v4 1/4 ARM: Kirkwood: Add setup file for netxbig LEDs

In reply to Andrew Lunn

Quoted 14 lines · Andrew Lunn

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]>
v3-v4:
rename board-nextbig.c to nextbig.c
---
 arch/arm/mach-mvebu/Kconfig    |   7 ++
 arch/arm/mach-mvebu/Makefile   |   1 +
 arch/arm/mach-mvebu/board.h    |   5 ++
 arch/arm/mach-mvebu/kirkwood.c |   3 +
 arch/arm/mach-mvebu/netxbig.c  | 191 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 207 insertions(+)
 create mode 100644 arch/arm/mach-mvebu/netxbig.c

...

Quoted 6 lines

arch/arm/mach-mvebu/netxbig.c new file +0 -0
new file mode 100644
index 000000000000..e6f2f547b1c7
@@ -0,0 +1,191 @@

...

Quoted 4 lines

arch/arm/mach-mvebu/netxbig.c new file +4 -0

+
+static struct netxbig_led net5big_v2_leds_ctrl[] = {
+	NETXBIG_LED("net5big-v2:blue:power", 0, netxbig_v2_blue_pwr_mled,  1),
+	NETXBIG_LED("net5big-v2:red:power",  0, netxbig_v2_red_mled,       1),

arch/arm/mach-mvebu/netxbig.c line 166

Quoted 10 lines

arch/arm/mach-mvebu/netxbig.c new file +10 -0

+	NETXBIG_LED("net5big-v2:blue:sata0", 3, netxbig_v2_blue_sata_mled, 2),
+	NETXBIG_LED("net5big-v2:red:sata0",  3, netxbig_v2_red_mled,       2),
+	NETXBIG_LED("net5big-v2:blue:sata1", 4, netxbig_v2_blue_sata_mled, 2),
+	NETXBIG_LED("net5big-v2:red:sata1",  4, netxbig_v2_red_mled,       2),
+	NETXBIG_LED("net5big-v2:blue:sata2", 5, netxbig_v2_blue_sata_mled, 2),
+	NETXBIG_LED("net5big-v2:red:sata2",  5, netxbig_v2_red_mled,       2),
+	NETXBIG_LED("net5big-v2:blue:sata3", 6, netxbig_v2_blue_sata_mled, 2),
+	NETXBIG_LED("net5big-v2:red:sata3",  6, netxbig_v2_red_mled,       2),
+	NETXBIG_LED("net5big-v2:blue:sata4", 7, netxbig_v2_blue_sata_mled, 2),
+	NETXBIG_LED("net5big-v2:red:sata5",  7, netxbig_v2_red_mled,       2),

There is a slight typo here (introduced by myself):
"net5big-v2:red:sata5" should be "net5big-v2:red:sata4".

Quoted 12 lines

arch/arm/mach-mvebu/netxbig.c new file +12 -0

+};
+
+static struct netxbig_led_platform_data net5big_v2_leds_data = {
+	.gpio_ext	= &netxbig_v2_gpio_ext,
+	.timer		= netxbig_v2_led_timer,
+	.num_timer	= ARRAY_SIZE(netxbig_v2_led_timer),
+	.leds		= net5big_v2_leds_ctrl,
+	.num_leds	= ARRAY_SIZE(net5big_v2_leds_ctrl),
+};
+
+static struct platform_device netxbig_v2_leds = {
+	.name		= "leds-netxbig",

arch/arm/mach-mvebu/netxbig.c line 188

Quoted 10 lines

arch/arm/mach-mvebu/netxbig.c new file +10 -0

+	.id		= -1,
+	.dev		= {
+		.platform_data	= &net2big_v2_leds_data,
+	},
+};
+
+void __init netxbig_init(void)
+{
+
+	if (of_machine_is_compatible("lacie,net5big"))

Here "lacie,net5big" must be replaced with "lacie,net5big_v2".

Jason Cooper

2014-06-20 23:40 UTC #5 lore raw

PATCH v4 1/4 ARM: Kirkwood: Add setup file for netxbig LEDs

Quoted 61 lines · Simon Guinot

Quoted 14 lines · Andrew Lunn

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]>
v3-v4:
rename board-nextbig.c to nextbig.c
---
 arch/arm/mach-mvebu/Kconfig    |   7 ++
 arch/arm/mach-mvebu/Makefile   |   1 +
 arch/arm/mach-mvebu/board.h    |   5 ++
 arch/arm/mach-mvebu/kirkwood.c |   3 +
 arch/arm/mach-mvebu/netxbig.c  | 191 +++++++++++++++++++++++++++++++++++++++++
 5 files changed, 207 insertions(+)
 create mode 100644 arch/arm/mach-mvebu/netxbig.c

...

Quoted 6 lines

arch/arm/mach-mvebu/netxbig.c new file +0 -0
new file mode 100644
index 000000000000..e6f2f547b1c7
@@ -0,0 +1,191 @@

...

Quoted 4 lines

arch/arm/mach-mvebu/netxbig.c new file +4 -0

+
+static struct netxbig_led net5big_v2_leds_ctrl[] = {
+	NETXBIG_LED("net5big-v2:blue:power", 0, netxbig_v2_blue_pwr_mled,  1),
+	NETXBIG_LED("net5big-v2:red:power",  0, netxbig_v2_red_mled,       1),

arch/arm/mach-mvebu/netxbig.c line 166

Quoted 10 lines

arch/arm/mach-mvebu/netxbig.c new file +10 -0

+	NETXBIG_LED("net5big-v2:blue:sata0", 3, netxbig_v2_blue_sata_mled, 2),
+	NETXBIG_LED("net5big-v2:red:sata0",  3, netxbig_v2_red_mled,       2),
+	NETXBIG_LED("net5big-v2:blue:sata1", 4, netxbig_v2_blue_sata_mled, 2),
+	NETXBIG_LED("net5big-v2:red:sata1",  4, netxbig_v2_red_mled,       2),
+	NETXBIG_LED("net5big-v2:blue:sata2", 5, netxbig_v2_blue_sata_mled, 2),
+	NETXBIG_LED("net5big-v2:red:sata2",  5, netxbig_v2_red_mled,       2),
+	NETXBIG_LED("net5big-v2:blue:sata3", 6, netxbig_v2_blue_sata_mled, 2),
+	NETXBIG_LED("net5big-v2:red:sata3",  6, netxbig_v2_red_mled,       2),
+	NETXBIG_LED("net5big-v2:blue:sata4", 7, netxbig_v2_blue_sata_mled, 2),
+	NETXBIG_LED("net5big-v2:red:sata5",  7, netxbig_v2_red_mled,       2),

There is a slight typo here (introduced by myself):
"net5big-v2:red:sata5" should be "net5big-v2:red:sata4".

Quoted 16 lines

arch/arm/mach-mvebu/netxbig.c new file +16 -0

+};
+
+static struct netxbig_led_platform_data net5big_v2_leds_data = {
+	.gpio_ext	= &netxbig_v2_gpio_ext,
+	.timer		= netxbig_v2_led_timer,
+	.num_timer	= ARRAY_SIZE(netxbig_v2_led_timer),
+	.leds		= net5big_v2_leds_ctrl,
+	.num_leds	= ARRAY_SIZE(net5big_v2_leds_ctrl),
+};
+
+static struct platform_device netxbig_v2_leds = {
+	.name		= "leds-netxbig",
+	.id		= -1,
+	.dev		= {
+		.platform_data	= &net2big_v2_leds_data,
+	},

Quoted 8 lines

arch/arm/mach-mvebu/netxbig.c line 188
Quoted 6 lines
arch/arm/mach-mvebu/netxbig.c new file +6 -0
+};
+
+void __init netxbig_init(void)
+{
+
+	if (of_machine_is_compatible("lacie,net5big"))
Here "lacie,net5big" must be replaced with "lacie,net5big_v2".

These changes have now been squashed in.

thx,

Jason.

Andrew Lunn

author maintainer

2014-05-26 19:29 UTC #6 lore raw

PATCH v4 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.

v3->v4
Add _v2 to compatible name of devices
Fix SoC version to 6281
tabification of DT files
Add fan controller and clock node for fan controller

---
 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 | 180 ++++++++++++++++++++++++++++++++
 4 files changed, 295 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..a98deccee59f
@@ -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_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "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 +180 -0

180 lines not on this page · raw message

Signature · 1 line

2.0.0.rc2

Jason Cooper

Applied

2014-06-20 20:52 UTC #7 lore raw

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

Quoted 21 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.
v3->v4
Add _v2 to compatible name of devices
Fix SoC version to 6281
tabification of DT files
Add fan controller and clock node for fan controller

Quoted 9 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 | 180 ++++++++++++++++++++++++++++++++
 4 files changed, 295 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

Applied to mvebu/dt

thx,

Jason.

Simon Guinot

2014-06-20 23:37 UTC #8 lore raw

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

In reply to Andrew Lunn

Quoted 30 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.
v3->v4
Add _v2 to compatible name of devices
Fix SoC version to 6281
tabification of DT files
Add fan controller and clock node for fan controller
---
 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 | 180 ++++++++++++++++++++++++++++++++
 4 files changed, 295 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

...

Quoted 20 lines

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

new file mode 100644
index 000000000000..f665fcd6005b
@@ -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_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";

"lacie,net2big_v2" must be replaced with "lacie,net5big_v2".

Quoted 9 lines

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

+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x20000000>;
+	};
+
+};
+
+&regulators {

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

Quoted 10 lines

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

+	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>;

19 must be replaced with 9.

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

Quoted 12 lines

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

+	};
+
+	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>;

20 must be replaced with 10.

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

Quoted 12 lines

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

+	};
+
+	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>;

21 must be replaced with 11.

Andrew, with all this changes, I can confirm that the 2Big and 5Big Network v2 boards are working as expected.

Tested-by Simon Guinot <[email protected]>

Thanks,

Jason Cooper

2014-06-20 23:48 UTC #9 lore raw

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

Quoted 119 lines · Simon Guinot

Quoted 30 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.
v3->v4
Add _v2 to compatible name of devices
Fix SoC version to 6281
tabification of DT files
Add fan controller and clock node for fan controller
---
 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 | 180 ++++++++++++++++++++++++++++++++
 4 files changed, 295 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
...
Quoted 20 lines
arch/arm/boot/dts/kirkwood-net5big.dts new file +14 -0
new file mode 100644
index 000000000000..f665fcd6005b
@@ -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_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";
"lacie,net2big_v2" must be replaced with "lacie,net5big_v2".
Quoted 9 lines
arch/arm/boot/dts/kirkwood-net5big.dts new file +9 -0
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x20000000>;
+	};
+
+};
+
+&regulators {
arch/arm/boot/dts/kirkwood-net5big.dts line 43
Quoted 10 lines
arch/arm/boot/dts/kirkwood-net5big.dts new file +10 -0
+	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>;
19 must be replaced with 9.
arch/arm/boot/dts/kirkwood-net5big.dts line 55
Quoted 12 lines
arch/arm/boot/dts/kirkwood-net5big.dts new file +12 -0
+	};
+
+	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>;
20 must be replaced with 10.
arch/arm/boot/dts/kirkwood-net5big.dts line 67
Quoted 12 lines
arch/arm/boot/dts/kirkwood-net5big.dts new file +12 -0
+	};
+
+	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>;
21 must be replaced with 11.

Quoted 4 lines

Andrew, with all this changes, I can confirm that the 2Big and 5Big Network v2 boards are working as expected.
Tested-by Simon Guinot <[email protected]>

Changes squashed in and pushed with your Tested-by.

thx,

Jason.

Andrew Lunn

author maintainer

2014-06-21 01:00 UTC #10 lore raw

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

In reply to Simon Guinot

Quoted 4 lines

Andrew, with all this changes, I can confirm that the 2Big and 5Big Network v2 boards are working as expected.
Tested-by Simon Guinot <[email protected]>

Hi Simon

Thanks for testing.

And thanks Jason for squashing the fixed in.

Andrew

Simon Guinot

2014-06-21 09:50 UTC #11 lore raw

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

In reply to Simon Guinot

Quoted 80 lines · Simon Guinot

Quoted 30 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.
v3->v4
Add _v2 to compatible name of devices
Fix SoC version to 6281
tabification of DT files
Add fan controller and clock node for fan controller
---
 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 | 180 ++++++++++++++++++++++++++++++++
 4 files changed, 295 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
...
Quoted 20 lines
arch/arm/boot/dts/kirkwood-net5big.dts new file +14 -0
new file mode 100644
index 000000000000..f665fcd6005b
@@ -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_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";
"lacie,net2big_v2" must be replaced with "lacie,net5big_v2".
Quoted 13 lines
arch/arm/boot/dts/kirkwood-net5big.dts new file +13 -0
+
+	memory {
+		device_type = "memory";
+		reg = <0x00000000 0x20000000>;
+	};
+
+};
+
+&regulators {
+	regulator at 3 {
+		compatible = "regulator-fixed";
+		reg = <3>;
+		regulator-name = "hdd2power";

Quoted 8 lines

arch/arm/boot/dts/kirkwood-net5big.dts line 43
Quoted 6 lines
arch/arm/boot/dts/kirkwood-net5big.dts new file +6 -0
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		regulator-always-on;
+		regulator-boot-on;
+		gpio = <&gpio0 19 GPIO_ACTIVE_HIGH>;
19 must be replaced with 9.

And gpio0 must replaced with gpio1.

Quoted 15 lines

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

Quoted 13 lines

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

+	};
+
+	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>;

20 must be replaced with 10.

Here too.

Quoted 15 lines

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

Quoted 13 lines

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

+	};
+
+	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>;

21 must be replaced with 11.

And here too.

Sorry for this additional changes.

Jason Cooper

2014-06-21 19:28 UTC #12 lore raw

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

Quoted 2 lines · Simon Guinot

Quoted 1 line · Simon Guinot
On Mon, May 26, 2014 at 09:29:49PM +0200, Andrew Lunn wrote:

...

Quoted 50 lines

Quoted 5 lines

+&regulators {

(quoted diff) +4 -0

+	regulator at 3 {
+		compatible = "regulator-fixed";
+		reg = <3>;
+		regulator-name = "hdd2power";

Quoted 8 lines

Review

Quoted 6 lines

(quoted diff) +6 -0

+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		regulator-always-on;
+		regulator-boot-on;
+		gpio = <&gpio0 19 GPIO_ACTIVE_HIGH>;

19 must be replaced with 9.

And gpio0 must replaced with gpio1.

Quoted 15 lines

Review

Quoted 13 lines

(quoted diff) +12 -0

+	};
+
+	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>;

20 must be replaced with 10.

Here too.

Quoted 15 lines

Review

Quoted 13 lines

(quoted diff) +12 -0

+	};
+
+	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>;

21 must be replaced with 11.

Quoted 2 lines

And here too.

I've pushed the following to mvebu/dt:

--------->8--------------
commit d854fa8a1500bec982ed9cb26b82d96bd5ae8dab

Author: Jason Cooper <[email protected]>
Date:   Sat Jun 21 19:21:13 2014 +0000

ARM: kirkwood: fix net5big regulator gpio assignments

Late correction from Simon's testing.

Reported-by Simon Guinot <[email protected]>

Link https://lkml.kernel.org/r/20140621095001.GW20207 at kw.sim.vm.gnt

Signed-off-by Jason Cooper <[email protected]>

arch/arm/boot/dts/kirkwood-net5big.dts +3 -3

index 51c56a9490b3..d2887ed493f2 100644
@@ -40,7 +40,7 @@
 		enable-active-high;
 		regulator-always-on;
 		regulator-boot-on;
-		gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+		gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
 	};
 
 	regulator at 4 {

@@ -52,7 +52,7 @@
 		enable-active-high;
 		regulator-always-on;
 		regulator-boot-on;
-		gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>;
+		gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
 	};
 
 	regulator at 5 {

@@ -64,7 +64,7 @@
 		enable-active-high;
 		regulator-always-on;
 		regulator-boot-on;
-		gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+		gpio = <&gpio1 11 GPIO_ACTIVE_HIGH>;
 	};
 };

Simon Guinot

2014-06-23 09:53 UTC #13 lore raw

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

Quoted 95 lines · Jason Cooper

Quoted 2 lines · Simon Guinot
Quoted 1 line · Simon Guinot
On Mon, May 26, 2014 at 09:29:49PM +0200, Andrew Lunn wrote:
...
Quoted 50 lines
Quoted 5 lines
Quoted 5 lines
+&regulators {
(quoted diff) +4 -0
+	regulator at 3 {
+		compatible = "regulator-fixed";
+		reg = <3>;
+		regulator-name = "hdd2power";
Quoted 8 lines
Review
Quoted 6 lines
(quoted diff) +6 -0
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		enable-active-high;
+		regulator-always-on;
+		regulator-boot-on;
+		gpio = <&gpio0 19 GPIO_ACTIVE_HIGH>;
19 must be replaced with 9.
And gpio0 must replaced with gpio1.
Quoted 15 lines
Review
Quoted 13 lines
(quoted diff) +12 -0
+	};
+
+	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>;
20 must be replaced with 10.
Here too.
Quoted 15 lines
Review
Quoted 13 lines
(quoted diff) +12 -0
+	};
+
+	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>;
21 must be replaced with 11.
Quoted 2 lines
And here too.
I've pushed the following to mvebu/dt:
--------->8--------------
commit d854fa8a1500bec982ed9cb26b82d96bd5ae8dab
Author: Jason Cooper <[email protected]>
Date:   Sat Jun 21 19:21:13 2014 +0000
ARM: kirkwood: fix net5big regulator gpio assignments
Late correction from Simon's testing.
Reported-by Simon Guinot <[email protected]>
Link https://lkml.kernel.org/r/20140621095001.GW20207 at kw.sim.vm.gnt
Signed-off-by Jason Cooper <[email protected]>
arch/arm/boot/dts/kirkwood-net5big.dts +2 -2
index 51c56a9490b3..d2887ed493f2 100644
@@ -40,7 +40,7 @@
 		enable-active-high;
 		regulator-always-on;
 		regulator-boot-on;
-		gpio = <&gpio0 9 GPIO_ACTIVE_HIGH>;
+		gpio = <&gpio1 9 GPIO_ACTIVE_HIGH>;
 	};
 
 	regulator at 4 {
@@ -52,7 +52,7 @@
 		enable-active-high;
 		regulator-always-on;
 		regulator-boot-on;
-		gpio = <&gpio0 10 GPIO_ACTIVE_HIGH>;
+		gpio = <&gpio1 10 GPIO_ACTIVE_HIGH>;
 	};
 
 	regulator at 5 {

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

Quoted 7 lines

arch/arm/boot/dts/kirkwood-net5big.dts +1 -1

@@ -64,7 +64,7 @@
 		enable-active-high;
 		regulator-always-on;
 		regulator-boot-on;
-		gpio = <&gpio0 11 GPIO_ACTIVE_HIGH>;
+		gpio = <&gpio1 11 GPIO_ACTIVE_HIGH>;
 	};
 };

Thanks.

Andrew Lunn

author maintainer

2014-05-26 19:29 UTC #14 lore raw

PATCH v4 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]>

---
v3->v4
Add G762 fan controller

---
 arch/arm/configs/mvebu_v5_defconfig | 2 ++
 1 file changed, 2 insertions(+)

arch/arm/configs/mvebu_v5_defconfig +2 -0

index 27c732fdf21e..b9892f8739fb 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

@@ -89,6 +90,7 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_QNAP=y
 CONFIG_SENSORS_ADT7475=y
+CONFIG_SENSORS_G762=y
 CONFIG_SENSORS_LM63=y
 CONFIG_SENSORS_LM75=y
 CONFIG_SENSORS_LM85=y

Signature · 1 line

2.0.0.rc2

Jason Cooper

2014-06-20 20:52 UTC #15 lore raw

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

Quoted 10 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]>
---
v3->v4
Add G762 fan controller
---
 arch/arm/configs/mvebu_v5_defconfig | 2 ++
 1 file changed, 2 insertions(+)

This patch and 4/4 applied to mvebu/defconfig.

thx,

Jason.

Andrew Lunn

author maintainer

2014-05-26 19:29 UTC #16 lore raw

PATCH v4 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]>

---
v3->v4
Add G762 fan controller

---
 arch/arm/configs/multi_v5_defconfig | 2 ++
 1 file changed, 2 insertions(+)

arch/arm/configs/multi_v5_defconfig +2 -0

index 5ebfa8bf8509..018bef9fa7e8 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

@@ -94,6 +95,7 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_QNAP=y
 CONFIG_SENSORS_ADT7475=y
+CONFIG_SENSORS_G762=y
 CONFIG_SENSORS_LM63=y
 CONFIG_SENSORS_LM75=y
 CONFIG_SENSORS_LM85=y

Signature · 1 line

2.0.0.rc2

Simon Guinot

2014-07-08 14:42 UTC #17 lore raw

cover Add DT support for LaCie NAS d2 Network v2

In reply to Andrew Lunn

Hi,

This patch series completes the DT conversion for the LaCie Kirkwood based boards by adding DT support for the d2 Network v2.

Regards,

Simon

Simon Guinot (2):
ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS
ARM: Kirkwood: add DT support for d2 Network v2

 arch/arm/boot/dts/Makefile              |  1 +
 arch/arm/boot/dts/kirkwood-d2net.dts    | 42 +++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-net2big.dts  | 30 +++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-net5big.dts  | 28 ++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-netxbig.dtsi | 26 --------------------
 5 files changed, 101 insertions(+), 26 deletions(-)
 create mode 100644 arch/arm/boot/dts/kirkwood-d2net.dts

Signature · 1 line

2.0.0.rc2

Simon Guinot

2014-07-08 14:42 UTC #18 lore raw

PATCH 1/2 ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS

The d2 Network v2 board (d2net_v2) shares a lot of hardware characteristics with the 2Big and 5Big Network v2 boards. This patch prepares the kirkwood-netxbig.dtsi file in order to allow to include it from the d2net_v2 DTS file. The DT nodes only relevant for the 2Big and 5Big Network v2 boards are moved into their respective DTS files.

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

---
 arch/arm/boot/dts/kirkwood-net2big.dts  | 30 ++++++++++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-net5big.dts  | 28 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-netxbig.dtsi | 26 --------------------------
 3 files changed, 58 insertions(+), 26 deletions(-)

arch/arm/boot/dts/kirkwood-net2big.dts +30 -0

index a98deccee59f..53dc37a3b687 100644
@@ -28,3 +28,33 @@
 		reg = <0x00000000 0x10000000>;
 	};
 };
+
+&regulators {
+	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>;
+	};
+
+	clocks {
+	       g762_clk: g762-oscillator {
+			 compatible = "fixed-clock";
+			 #clock-cells = <0>;
+			 clock-frequency = <32768>;
+	       };
+	};
+};
+
+&i2c0 {
+	g762 at 3e {
+		compatible = "gmt,g762";
+		reg = <0x3e>;
+		clocks = <&g762_clk>;
+	};
+};

arch/arm/boot/dts/kirkwood-net5big.dts +28 -0

index d2887ed493f2..36155b749d9f 100644
@@ -31,6 +31,18 @@
 };
 
 &regulators {
+	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>;
+	};
+
 	regulator at 3 {
 		compatible = "regulator-fixed";
 		reg = <3>;

@@ -66,6 +78,14 @@
 		regulator-boot-on;
 		gpio = <&gpio1 11 GPIO_ACTIVE_HIGH>;
 	};
+
+	clocks {
+	       g762_clk: g762-oscillator {
+			 compatible = "fixed-clock";
+			 #clock-cells = <0>;
+			 clock-frequency = <32768>;
+	       };
+	};
 };
 
 &mdio {

@@ -81,3 +101,11 @@
 	};
 };
 
+
+&i2c0 {
+	g762 at 3e {
+		compatible = "gmt,g762";
+		reg = <0x3e>;
+		clocks = <&g762_clk>;
+	};
+};

arch/arm/boot/dts/kirkwood-netxbig.dtsi +0 ~~-26~~

index fd75720547e3..b0cfb7cd30b9 100644
@@ -104,26 +104,6 @@
 			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>;
-		};
-
-		clocks {
-		       g762_clk: g762-oscillator {
-				 compatible = "fixed-clock";
-				 #clock-cells = <0>;
-				 clock-frequency = <32768>;
-		       };
-		};
 	};
 };

@@ -171,10 +151,4 @@
 		pagesize = <16>;
 		reg = <0x50>;
 	};
-
-	g762 at 3e {
-		compatible = "gmt,g762";
-		reg = <0x3e>;
-		clocks = <&g762_clk>;
-	};
 };

Signature · 1 line

2.0.0.rc2

Simon Guinot

2014-07-08 14:42 UTC #19 lore raw

PATCH 2/2 ARM: Kirkwood: add DT support for d2 Network v2

In reply to Simon Guinot

This patch adds DT support for the LaCie NAS d2 Network v2 (d2net_v2). Most of the hardware characteristics are shared with the 2Big and 5Big Network v2 boards.

- CPU: Marvell 88F6281 1200Mhz
- SDRAM memory: 256MB DDR2 400Mhz
- 2 SATA ports: internal and eSATA
- Gigabit ethernet: PHY Marvell 88E1116R
- Flash memory: SPI NOR 512KB (Macronix MX25L4005A)
- i2c EEPROM: 512 bytes (24C04 type)
- 2 USB2 ports: host and host/device
- 1 push button
- 1 power switch
- 1 SATA LED (bi-color, blue and red)

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

---
 arch/arm/boot/dts/Makefile           |  1 +
 arch/arm/boot/dts/kirkwood-d2net.dts | 42 ++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 arch/arm/boot/dts/kirkwood-d2net.dts

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

index 0b216b425eb8..c1dd2d1aa773 100644
@@ -93,6 +93,7 @@ dtb-$(CONFIG_ARCH_KEYSTONE) += k2hk-evm.dtb \
 kirkwood := \
 	kirkwood-b3.dtb \
 	kirkwood-cloudbox.dtb \
+	kirkwood-d2net.dtb \
 	kirkwood-db-88f6281.dtb \
 	kirkwood-db-88f6282.dtb \
 	kirkwood-dns320.dtb \

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

42 lines not on this page · raw message

Signature · 1 line

2.0.0.rc2

Andrew Lunn

author maintainer

2014-07-10 20:48 UTC #20 lore raw

cover Add DT support for LaCie NAS d2 Network v2

In reply to Simon Guinot

Quoted 5 lines · Simon Guinot

Hi,
This patch series completes the DT conversion for the LaCie Kirkwood based boards by adding DT support for the d2 Network v2.

Quoted 7 lines

Regards,
Simon
Simon Guinot (2):
ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS
ARM: Kirkwood: add DT support for d2 Network v2

Hi Simon

These patches look good.

Acked-by Andrew Lunn <[email protected]>

Andrew

Jason Cooper

2014-07-13 21:46 UTC #21 lore raw

cover Add DT support for LaCie NAS d2 Network v2

In reply to Simon Guinot

Quoted 13 lines · Simon Guinot

Hi,
This patch series completes the DT conversion for the LaCie Kirkwood based boards by adding DT support for the d2 Network v2.
Regards,
Simon
Simon Guinot (2):
ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS
ARM: Kirkwood: add DT support for d2 Network v2

Quoted 7 lines

 arch/arm/boot/dts/Makefile              |  1 +
 arch/arm/boot/dts/kirkwood-d2net.dts    | 42 +++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-net2big.dts  | 30 +++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-net5big.dts  | 28 ++++++++++++++++++++++
 arch/arm/boot/dts/kirkwood-netxbig.dtsi | 26 --------------------
 5 files changed, 101 insertions(+), 26 deletions(-)
 create mode 100644 arch/arm/boot/dts/kirkwood-d2net.dts

Both applied to mvebu/dt with Andrew's Ack.

thx,

Jason.