* [PATCHv4 0/4] DT support for LaCie 2Big and 5Big Network v2
@ 2014-05-26 19:29 Andrew Lunn
2014-05-26 19:29 ` [PATCHv4 1/4] ARM: Kirkwood: Add setup file for netxbig LEDs Andrew Lunn
` (4 more replies)
0 siblings, 5 replies; 22+ messages in thread
From: Andrew Lunn @ 2014-05-26 19:29 UTC (permalink / raw)
To: linux-arm-kernel
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
--
2.0.0.rc2
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCHv4 1/4] ARM: Kirkwood: Add setup file for netxbig LEDs
2014-05-26 19:29 [PATCHv4 0/4] DT support for LaCie 2Big and 5Big Network v2 Andrew Lunn
@ 2014-05-26 19:29 ` Andrew Lunn
2014-06-20 20:51 ` Jason Cooper
2014-06-20 23:30 ` Simon Guinot
2014-05-26 19:29 ` [PATCHv4 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big Andrew Lunn
` (3 subsequent siblings)
4 siblings, 2 replies; 22+ messages in thread
From: Andrew Lunn @ 2014-05-26 19:29 UTC (permalink / raw)
To: linux-arm-kernel
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 <andrew@lunn.ch>
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
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index d6b0a772a6dd..0f9a700d3b50 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -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
diff --git a/arch/arm/mach-mvebu/Makefile b/arch/arm/mach-mvebu/Makefile
index 2ecb828e4a8b..db29c1dfe3c5 100644
--- a/arch/arm/mach-mvebu/Makefile
+++ b/arch/arm/mach-mvebu/Makefile
@@ -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
diff --git a/arch/arm/mach-mvebu/board.h b/arch/arm/mach-mvebu/board.h
index 9c7bb4386f8b..98e32cc2ef3d 100644
--- a/arch/arm/mach-mvebu/board.h
+++ b/arch/arm/mach-mvebu/board.h
@@ -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
diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c
index 46f105913c84..6b5310828eb2 100644
--- a/arch/arm/mach-mvebu/kirkwood.c
+++ b/arch/arm/mach-mvebu/kirkwood.c
@@ -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);
}
diff --git a/arch/arm/mach-mvebu/netxbig.c b/arch/arm/mach-mvebu/netxbig.c
new file mode 100644
index 000000000000..e6f2f547b1c7
--- /dev/null
+++ b/arch/arm/mach-mvebu/netxbig.c
@@ -0,0 +1,191 @@
+/*
+ * arch/arm/mach-mvbu/board-netxbig.c
+ *
+ * LaCie 2Big and 5Big Network v2 board setup
+ *
+ * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/platform_device.h>
+#include <linux/platform_data/leds-kirkwood-netxbig.h>
+#include "common.h"
+
+/*****************************************************************************
+ * GPIO extension LEDs
+ ****************************************************************************/
+
+/*
+ * The LEDs are controlled by a CPLD and can be configured through a GPIO
+ * extension bus:
+ *
+ * - address register : bit [0-2] -> GPIO [47-49]
+ * - data register : bit [0-2] -> GPIO [44-46]
+ * - enable register : GPIO 29
+ */
+
+static int netxbig_v2_gpio_ext_addr[] = { 47, 48, 49 };
+static int netxbig_v2_gpio_ext_data[] = { 44, 45, 46 };
+
+static struct netxbig_gpio_ext netxbig_v2_gpio_ext = {
+ .addr = netxbig_v2_gpio_ext_addr,
+ .num_addr = ARRAY_SIZE(netxbig_v2_gpio_ext_addr),
+ .data = netxbig_v2_gpio_ext_data,
+ .num_data = ARRAY_SIZE(netxbig_v2_gpio_ext_data),
+ .enable = 29,
+};
+
+/*
+ * Address register selection:
+ *
+ * addr | register
+ * ----------------------------
+ * 0 | front LED
+ * 1 | front LED brightness
+ * 2 | SATA LED brightness
+ * 3 | SATA0 LED
+ * 4 | SATA1 LED
+ * 5 | SATA2 LED
+ * 6 | SATA3 LED
+ * 7 | SATA4 LED
+ *
+ * Data register configuration:
+ *
+ * data | LED brightness
+ * -------------------------------------------------
+ * 0 | min (off)
+ * - | -
+ * 7 | max
+ *
+ * data | front LED mode
+ * -------------------------------------------------
+ * 0 | fix off
+ * 1 | fix blue on
+ * 2 | fix red on
+ * 3 | blink blue on=1 sec and blue off=1 sec
+ * 4 | blink red on=1 sec and red off=1 sec
+ * 5 | blink blue on=2.5 sec and red on=0.5 sec
+ * 6 | blink blue on=1 sec and red on=1 sec
+ * 7 | blink blue on=0.5 sec and blue off=2.5 sec
+ *
+ * data | SATA LED mode
+ * -------------------------------------------------
+ * 0 | fix off
+ * 1 | SATA activity blink
+ * 2 | fix red on
+ * 3 | blink blue on=1 sec and blue off=1 sec
+ * 4 | blink red on=1 sec and red off=1 sec
+ * 5 | blink blue on=2.5 sec and red on=0.5 sec
+ * 6 | blink blue on=1 sec and red on=1 sec
+ * 7 | fix blue on
+ */
+
+static int netxbig_v2_red_mled[NETXBIG_LED_MODE_NUM] = {
+ [NETXBIG_LED_OFF] = 0,
+ [NETXBIG_LED_ON] = 2,
+ [NETXBIG_LED_SATA] = NETXBIG_LED_INVALID_MODE,
+ [NETXBIG_LED_TIMER1] = 4,
+ [NETXBIG_LED_TIMER2] = NETXBIG_LED_INVALID_MODE,
+};
+
+static int netxbig_v2_blue_pwr_mled[NETXBIG_LED_MODE_NUM] = {
+ [NETXBIG_LED_OFF] = 0,
+ [NETXBIG_LED_ON] = 1,
+ [NETXBIG_LED_SATA] = NETXBIG_LED_INVALID_MODE,
+ [NETXBIG_LED_TIMER1] = 3,
+ [NETXBIG_LED_TIMER2] = 7,
+};
+
+static int netxbig_v2_blue_sata_mled[NETXBIG_LED_MODE_NUM] = {
+ [NETXBIG_LED_OFF] = 0,
+ [NETXBIG_LED_ON] = 7,
+ [NETXBIG_LED_SATA] = 1,
+ [NETXBIG_LED_TIMER1] = 3,
+ [NETXBIG_LED_TIMER2] = NETXBIG_LED_INVALID_MODE,
+};
+
+static struct netxbig_led_timer netxbig_v2_led_timer[] = {
+ [0] = {
+ .delay_on = 500,
+ .delay_off = 500,
+ .mode = NETXBIG_LED_TIMER1,
+ },
+ [1] = {
+ .delay_on = 500,
+ .delay_off = 1000,
+ .mode = NETXBIG_LED_TIMER2,
+ },
+};
+
+#define NETXBIG_LED(_name, maddr, mval, baddr) \
+ { .name = _name, \
+ .mode_addr = maddr, \
+ .mode_val = mval, \
+ .bright_addr = baddr }
+
+static struct netxbig_led net2big_v2_leds_ctrl[] = {
+ NETXBIG_LED("net2big-v2:blue:power", 0, netxbig_v2_blue_pwr_mled, 1),
+ NETXBIG_LED("net2big-v2:red:power", 0, netxbig_v2_red_mled, 1),
+ NETXBIG_LED("net2big-v2:blue:sata0", 3, netxbig_v2_blue_sata_mled, 2),
+ NETXBIG_LED("net2big-v2:red:sata0", 3, netxbig_v2_red_mled, 2),
+ NETXBIG_LED("net2big-v2:blue:sata1", 4, netxbig_v2_blue_sata_mled, 2),
+ NETXBIG_LED("net2big-v2:red:sata1", 4, netxbig_v2_red_mled, 2),
+};
+
+static struct netxbig_led_platform_data net2big_v2_leds_data = {
+ .gpio_ext = &netxbig_v2_gpio_ext,
+ .timer = netxbig_v2_led_timer,
+ .num_timer = ARRAY_SIZE(netxbig_v2_led_timer),
+ .leds = net2big_v2_leds_ctrl,
+ .num_leds = ARRAY_SIZE(net2big_v2_leds_ctrl),
+};
+
+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),
+ 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),
+};
+
+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,
+ },
+};
+
+void __init netxbig_init(void)
+{
+
+ if (of_machine_is_compatible("lacie,net5big"))
+ netxbig_v2_leds.dev.platform_data = &net5big_v2_leds_data;
+ platform_device_register(&netxbig_v2_leds);
+}
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCHv4 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big.
2014-05-26 19:29 [PATCHv4 0/4] DT support for LaCie 2Big and 5Big Network v2 Andrew Lunn
2014-05-26 19:29 ` [PATCHv4 1/4] ARM: Kirkwood: Add setup file for netxbig LEDs Andrew Lunn
@ 2014-05-26 19:29 ` Andrew Lunn
2014-06-20 20:52 ` Jason Cooper
2014-06-20 23:37 ` Simon Guinot
2014-05-26 19:29 ` [PATCHv4 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2 Andrew Lunn
` (2 subsequent siblings)
4 siblings, 2 replies; 22+ messages in thread
From: Andrew Lunn @ 2014-05-26 19:29 UTC (permalink / raw)
To: linux-arm-kernel
Describe LaCie 2Big and 5Big Network v2 using device tree.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
---
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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 629eee22e606..facbf0cc2fca 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/kirkwood-net2big.dts b/arch/arm/boot/dts/kirkwood-net2big.dts
new file mode 100644
index 000000000000..a98deccee59f
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-net2big.dts
@@ -0,0 +1,30 @@
+/*
+ * Device Tree file for LaCie 2Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>
+ *
+ * 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>;
+ };
+};
diff --git a/arch/arm/boot/dts/kirkwood-net5big.dts b/arch/arm/boot/dts/kirkwood-net5big.dts
new file mode 100644
index 000000000000..f665fcd6005b
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-net5big.dts
@@ -0,0 +1,83 @@
+/*
+ * Device Tree file for LaCie 5Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>
+ *
+ * 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 5Big Network v2";
+ compatible = "lacie,net2big_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x20000000>;
+ };
+
+};
+
+®ulators {
+ 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>;
+ };
+};
+
+ð1 {
+ status = "okay";
+ ethernet1-port at 0 {
+ phy-handle = <ðphy1>;
+ };
+};
+
diff --git a/arch/arm/boot/dts/kirkwood-netxbig.dtsi b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
new file mode 100644
index 000000000000..fd75720547e3
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
@@ -0,0 +1,180 @@
+/*
+ * Device Tree common file for LaCie 2Big and 5Big Network v2
+ *
+ * Copyright (C) 2014
+ *
+ * Andrew Lunn <andrew@lunn.ch>
+ *
+ * Based on netxbig_v2-setup.c,
+ * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>
+ *
+ * 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 "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+ chosen {
+ bootargs = "console=ttyS0,115200n8";
+ stdout-path = &uart0;
+ };
+
+ 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>;
+ gpios = <&gpio1 2 GPIO_ACTIVE_LOW>;
+ };
+
+ };
+
+ gpio-poweroff {
+ compatible = "gpio-poweroff";
+ gpios = <&gpio0 7 GPIO_ACTIVE_HIGH>;
+ };
+
+ 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>;
+ };
+
+ clocks {
+ g762_clk: g762-oscillator {
+ compatible = "fixed-clock";
+ #clock-cells = <0>;
+ clock-frequency = <32768>;
+ };
+ };
+ };
+};
+
+&mdio {
+ status = "okay";
+
+ ethphy0: ethernet-phy at 0 {
+ reg = <8>;
+ };
+
+ ethphy1: ethernet-phy at 1 {
+ reg = <0>;
+ };
+};
+
+ð0 {
+ status = "okay";
+ ethernet0-port at 0 {
+ phy-handle = <ðphy0>;
+ };
+};
+
+&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";
+ };
+};
+
+&i2c0 {
+ status = "okay";
+
+ eeprom at 50 {
+ compatible = "atmel,24c04";
+ pagesize = <16>;
+ reg = <0x50>;
+ };
+
+ g762 at 3e {
+ compatible = "gmt,g762";
+ reg = <0x3e>;
+ clocks = <&g762_clk>;
+ };
+};
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCHv4 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2
2014-05-26 19:29 [PATCHv4 0/4] DT support for LaCie 2Big and 5Big Network v2 Andrew Lunn
2014-05-26 19:29 ` [PATCHv4 1/4] ARM: Kirkwood: Add setup file for netxbig LEDs Andrew Lunn
2014-05-26 19:29 ` [PATCHv4 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big Andrew Lunn
@ 2014-05-26 19:29 ` Andrew Lunn
2014-06-20 20:52 ` Jason Cooper
2014-05-26 19:29 ` [PATCHv4 4/4] ARM: multi_v5: Enable " Andrew Lunn
2014-07-08 14:42 ` [PATCH 0/2] Add DT support for LaCie NAS d2 " Simon Guinot
4 siblings, 1 reply; 22+ messages in thread
From: Andrew Lunn @ 2014-05-26 19:29 UTC (permalink / raw)
To: linux-arm-kernel
Enable building LaCie 2Big and 5Big Network v2 in the mvebu v5 kernel.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
---
v3->v4
Add G762 fan controller
---
arch/arm/configs/mvebu_v5_defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig
index 27c732fdf21e..b9892f8739fb 100644
--- a/arch/arm/configs/mvebu_v5_defconfig
+++ b/arch/arm/configs/mvebu_v5_defconfig
@@ -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
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCHv4 4/4] ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2
2014-05-26 19:29 [PATCHv4 0/4] DT support for LaCie 2Big and 5Big Network v2 Andrew Lunn
` (2 preceding siblings ...)
2014-05-26 19:29 ` [PATCHv4 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2 Andrew Lunn
@ 2014-05-26 19:29 ` Andrew Lunn
2014-07-08 14:42 ` [PATCH 0/2] Add DT support for LaCie NAS d2 " Simon Guinot
4 siblings, 0 replies; 22+ messages in thread
From: Andrew Lunn @ 2014-05-26 19:29 UTC (permalink / raw)
To: linux-arm-kernel
Enable building LaCie 2Big and 5Big Network v2 in the multi v5 kernel.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
---
v3->v4
Add G762 fan controller
---
arch/arm/configs/multi_v5_defconfig | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig
index 5ebfa8bf8509..018bef9fa7e8 100644
--- a/arch/arm/configs/multi_v5_defconfig
+++ b/arch/arm/configs/multi_v5_defconfig
@@ -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
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCHv4 1/4] ARM: Kirkwood: Add setup file for netxbig LEDs
2014-05-26 19:29 ` [PATCHv4 1/4] ARM: Kirkwood: Add setup file for netxbig LEDs Andrew Lunn
@ 2014-06-20 20:51 ` Jason Cooper
2014-06-20 23:24 ` Simon Guinot
2014-06-20 23:30 ` Simon Guinot
1 sibling, 1 reply; 22+ messages in thread
From: Jason Cooper @ 2014-06-20 20:51 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 26, 2014 at 09:29:48PM +0200, Andrew Lunn wrote:
> 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 <andrew@lunn.ch>
> 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
Applied to mvebu/soc
thx,
Jason.
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCHv4 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big.
2014-05-26 19:29 ` [PATCHv4 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big Andrew Lunn
@ 2014-06-20 20:52 ` Jason Cooper
2014-06-20 23:37 ` Simon Guinot
1 sibling, 0 replies; 22+ messages in thread
From: Jason Cooper @ 2014-06-20 20:52 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 26, 2014 at 09:29:49PM +0200, Andrew Lunn wrote:
> Describe LaCie 2Big and 5Big Network v2 using device tree.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> 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
Applied to mvebu/dt
thx,
Jason.
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCHv4 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2
2014-05-26 19:29 ` [PATCHv4 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2 Andrew Lunn
@ 2014-06-20 20:52 ` Jason Cooper
0 siblings, 0 replies; 22+ messages in thread
From: Jason Cooper @ 2014-06-20 20:52 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 26, 2014 at 09:29:50PM +0200, Andrew Lunn wrote:
> Enable building LaCie 2Big and 5Big Network v2 in the mvebu v5 kernel.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
> ---
> 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.
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCHv4 1/4] ARM: Kirkwood: Add setup file for netxbig LEDs
2014-06-20 20:51 ` Jason Cooper
@ 2014-06-20 23:24 ` Simon Guinot
0 siblings, 0 replies; 22+ messages in thread
From: Simon Guinot @ 2014-06-20 23:24 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jun 20, 2014 at 04:51:47PM -0400, Jason Cooper wrote:
> On Mon, May 26, 2014 at 09:29:48PM +0200, Andrew Lunn wrote:
> > 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 <andrew@lunn.ch>
> > 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
>
> 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>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCHv4 1/4] ARM: Kirkwood: Add setup file for netxbig LEDs
2014-05-26 19:29 ` [PATCHv4 1/4] ARM: Kirkwood: Add setup file for netxbig LEDs Andrew Lunn
2014-06-20 20:51 ` Jason Cooper
@ 2014-06-20 23:30 ` Simon Guinot
2014-06-20 23:40 ` Jason Cooper
1 sibling, 1 reply; 22+ messages in thread
From: Simon Guinot @ 2014-06-20 23:30 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 26, 2014 at 09:29:48PM +0200, Andrew Lunn wrote:
> 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 <andrew@lunn.ch>
> 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
...
> diff --git a/arch/arm/mach-mvebu/netxbig.c b/arch/arm/mach-mvebu/netxbig.c
> new file mode 100644
> index 000000000000..e6f2f547b1c7
> --- /dev/null
> +++ b/arch/arm/mach-mvebu/netxbig.c
> @@ -0,0 +1,191 @@
...
> +
> +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),
> + 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".
> +};
> +
> +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,
> + },
> +};
> +
> +void __init netxbig_init(void)
> +{
> +
> + if (of_machine_is_compatible("lacie,net5big"))
Here "lacie,net5big" must be replaced with "lacie,net5big_v2".
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/256082a3/attachment.sig>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCHv4 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big.
2014-05-26 19:29 ` [PATCHv4 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big Andrew Lunn
2014-06-20 20:52 ` Jason Cooper
@ 2014-06-20 23:37 ` Simon Guinot
2014-06-20 23:48 ` Jason Cooper
` (2 more replies)
1 sibling, 3 replies; 22+ messages in thread
From: Simon Guinot @ 2014-06-20 23:37 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 26, 2014 at 09:29:49PM +0200, Andrew Lunn wrote:
> Describe LaCie 2Big and 5Big Network v2 using device tree.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> ---
> 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
...
> diff --git a/arch/arm/boot/dts/kirkwood-net5big.dts b/arch/arm/boot/dts/kirkwood-net5big.dts
> new file mode 100644
> index 000000000000..f665fcd6005b
> --- /dev/null
> +++ b/arch/arm/boot/dts/kirkwood-net5big.dts
> @@ -0,0 +1,83 @@
> +/*
> + * Device Tree file for LaCie 5Big Network v2
> + *
> + * Copyright (C) 2014
> + *
> + * Andrew Lunn <andrew@lunn.ch>
> + *
> + * Based on netxbig_v2-setup.c,
> + * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>
> + *
> + * 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 5Big Network v2";
> + compatible = "lacie,net2big_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";
"lacie,net2big_v2" must be replaced with "lacie,net5big_v2".
> +
> + memory {
> + device_type = "memory";
> + reg = <0x00000000 0x20000000>;
> + };
> +
> +};
> +
> +®ulators {
> + 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.
> + };
> +
> + 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.
> + };
> +
> + 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 <simon.guinot@sequanux.org>
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/b67ac049/attachment.sig>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCHv4 1/4] ARM: Kirkwood: Add setup file for netxbig LEDs
2014-06-20 23:30 ` Simon Guinot
@ 2014-06-20 23:40 ` Jason Cooper
0 siblings, 0 replies; 22+ messages in thread
From: Jason Cooper @ 2014-06-20 23:40 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Jun 21, 2014 at 01:30:42AM +0200, Simon Guinot wrote:
> On Mon, May 26, 2014 at 09:29:48PM +0200, Andrew Lunn wrote:
> > 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 <andrew@lunn.ch>
> > 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
>
> ...
>
> > diff --git a/arch/arm/mach-mvebu/netxbig.c b/arch/arm/mach-mvebu/netxbig.c
> > new file mode 100644
> > index 000000000000..e6f2f547b1c7
> > --- /dev/null
> > +++ b/arch/arm/mach-mvebu/netxbig.c
> > @@ -0,0 +1,191 @@
>
> ...
>
> > +
> > +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),
> > + 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".
>
> > +};
> > +
> > +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,
> > + },
> > +};
> > +
> > +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.
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCHv4 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big.
2014-06-20 23:37 ` Simon Guinot
@ 2014-06-20 23:48 ` Jason Cooper
2014-06-21 1:00 ` Andrew Lunn
2014-06-21 9:50 ` Simon Guinot
2 siblings, 0 replies; 22+ messages in thread
From: Jason Cooper @ 2014-06-20 23:48 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Jun 21, 2014 at 01:37:18AM +0200, Simon Guinot wrote:
> On Mon, May 26, 2014 at 09:29:49PM +0200, Andrew Lunn wrote:
> > Describe LaCie 2Big and 5Big Network v2 using device tree.
> >
> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> > ---
> > 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
>
> ...
>
> > diff --git a/arch/arm/boot/dts/kirkwood-net5big.dts b/arch/arm/boot/dts/kirkwood-net5big.dts
> > new file mode 100644
> > index 000000000000..f665fcd6005b
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/kirkwood-net5big.dts
> > @@ -0,0 +1,83 @@
> > +/*
> > + * Device Tree file for LaCie 5Big Network v2
> > + *
> > + * Copyright (C) 2014
> > + *
> > + * Andrew Lunn <andrew@lunn.ch>
> > + *
> > + * Based on netxbig_v2-setup.c,
> > + * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>
> > + *
> > + * 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 5Big Network v2";
> > + compatible = "lacie,net2big_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";
>
> "lacie,net2big_v2" must be replaced with "lacie,net5big_v2".
>
> > +
> > + memory {
> > + device_type = "memory";
> > + reg = <0x00000000 0x20000000>;
> > + };
> > +
> > +};
> > +
> > +®ulators {
> > + 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.
>
> > + };
> > +
> > + 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.
>
> > + };
> > +
> > + 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 <simon.guinot@sequanux.org>
Changes squashed in and pushed with your Tested-by.
thx,
Jason.
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCHv4 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big.
2014-06-20 23:37 ` Simon Guinot
2014-06-20 23:48 ` Jason Cooper
@ 2014-06-21 1:00 ` Andrew Lunn
2014-06-21 9:50 ` Simon Guinot
2 siblings, 0 replies; 22+ messages in thread
From: Andrew Lunn @ 2014-06-21 1:00 UTC (permalink / raw)
To: linux-arm-kernel
> Andrew, with all this changes, I can confirm that the 2Big and 5Big
> Network v2 boards are working as expected.
>
> Tested-by: Simon Guinot <simon.guinot@sequanux.org>
Hi Simon
Thanks for testing.
And thanks Jason for squashing the fixed in.
Andrew
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCHv4 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big.
2014-06-20 23:37 ` Simon Guinot
2014-06-20 23:48 ` Jason Cooper
2014-06-21 1:00 ` Andrew Lunn
@ 2014-06-21 9:50 ` Simon Guinot
2014-06-21 19:28 ` Jason Cooper
2 siblings, 1 reply; 22+ messages in thread
From: Simon Guinot @ 2014-06-21 9:50 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Jun 21, 2014 at 01:37:18AM +0200, Simon Guinot wrote:
> On Mon, May 26, 2014 at 09:29:49PM +0200, Andrew Lunn wrote:
> > Describe LaCie 2Big and 5Big Network v2 using device tree.
> >
> > Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> > Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
> > ---
> > 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
>
> ...
>
> > diff --git a/arch/arm/boot/dts/kirkwood-net5big.dts b/arch/arm/boot/dts/kirkwood-net5big.dts
> > new file mode 100644
> > index 000000000000..f665fcd6005b
> > --- /dev/null
> > +++ b/arch/arm/boot/dts/kirkwood-net5big.dts
> > @@ -0,0 +1,83 @@
> > +/*
> > + * Device Tree file for LaCie 5Big Network v2
> > + *
> > + * Copyright (C) 2014
> > + *
> > + * Andrew Lunn <andrew@lunn.ch>
> > + *
> > + * Based on netxbig_v2-setup.c,
> > + * Copyright (C) 2010 Simon Guinot <sguinot@lacie.com>
> > + *
> > + * 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 5Big Network v2";
> > + compatible = "lacie,net2big_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";
>
> "lacie,net2big_v2" must be replaced with "lacie,net5big_v2".
>
> > +
> > + memory {
> > + device_type = "memory";
> > + reg = <0x00000000 0x20000000>;
> > + };
> > +
> > +};
> > +
> > +®ulators {
> > + 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.
And gpio0 must replaced with gpio1.
>
> > + };
> > +
> > + 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.
>
> > + };
> > +
> > + 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.
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/3f1b49e1/attachment.sig>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCHv4 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big.
2014-06-21 9:50 ` Simon Guinot
@ 2014-06-21 19:28 ` Jason Cooper
2014-06-23 9:53 ` Simon Guinot
0 siblings, 1 reply; 22+ messages in thread
From: Jason Cooper @ 2014-06-21 19:28 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Jun 21, 2014 at 11:50:02AM +0200, Simon Guinot wrote:
> On Sat, Jun 21, 2014 at 01:37:18AM +0200, Simon Guinot wrote:
> > On Mon, May 26, 2014 at 09:29:49PM +0200, Andrew Lunn wrote:
...
> > > +®ulators {
> > > + 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.
>
> And gpio0 must replaced with gpio1.
>
> >
> > > + };
> > > +
> > > + 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.
>
> >
> > > + };
> > > +
> > > + 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.
>
I've pushed the following to mvebu/dt:
--------->8--------------
commit d854fa8a1500bec982ed9cb26b82d96bd5ae8dab
Author: Jason Cooper <jason@lakedaemon.net>
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 <simon.guinot@sequanux.org>
Link: https://lkml.kernel.org/r/20140621095001.GW20207 at kw.sim.vm.gnt
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
diff --git a/arch/arm/boot/dts/kirkwood-net5big.dts b/arch/arm/boot/dts/kirkwood-net5big.dts
index 51c56a9490b3..d2887ed493f2 100644
--- a/arch/arm/boot/dts/kirkwood-net5big.dts
+++ b/arch/arm/boot/dts/kirkwood-net5big.dts
@@ -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>;
};
};
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCHv4 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big.
2014-06-21 19:28 ` Jason Cooper
@ 2014-06-23 9:53 ` Simon Guinot
0 siblings, 0 replies; 22+ messages in thread
From: Simon Guinot @ 2014-06-23 9:53 UTC (permalink / raw)
To: linux-arm-kernel
On Sat, Jun 21, 2014 at 03:28:46PM -0400, Jason Cooper wrote:
> On Sat, Jun 21, 2014 at 11:50:02AM +0200, Simon Guinot wrote:
> > On Sat, Jun 21, 2014 at 01:37:18AM +0200, Simon Guinot wrote:
> > > On Mon, May 26, 2014 at 09:29:49PM +0200, Andrew Lunn wrote:
> ...
> > > > +®ulators {
> > > > + 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.
> >
> > And gpio0 must replaced with gpio1.
> >
> > >
> > > > + };
> > > > +
> > > > + 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.
> >
> > >
> > > > + };
> > > > +
> > > > + 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.
> >
>
> I've pushed the following to mvebu/dt:
>
> --------->8--------------
> commit d854fa8a1500bec982ed9cb26b82d96bd5ae8dab
> Author: Jason Cooper <jason@lakedaemon.net>
> 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 <simon.guinot@sequanux.org>
> Link: https://lkml.kernel.org/r/20140621095001.GW20207 at kw.sim.vm.gnt
> Signed-off-by: Jason Cooper <jason@lakedaemon.net>
>
> diff --git a/arch/arm/boot/dts/kirkwood-net5big.dts b/arch/arm/boot/dts/kirkwood-net5big.dts
> index 51c56a9490b3..d2887ed493f2 100644
> --- a/arch/arm/boot/dts/kirkwood-net5big.dts
> +++ b/arch/arm/boot/dts/kirkwood-net5big.dts
> @@ -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>;
> };
> };
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/20140623/fa524dcf/attachment.sig>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 0/2] Add DT support for LaCie NAS d2 Network v2
2014-05-26 19:29 [PATCHv4 0/4] DT support for LaCie 2Big and 5Big Network v2 Andrew Lunn
` (3 preceding siblings ...)
2014-05-26 19:29 ` [PATCHv4 4/4] ARM: multi_v5: Enable " Andrew Lunn
@ 2014-07-08 14:42 ` Simon Guinot
2014-07-08 14:42 ` [PATCH 1/2] ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS Simon Guinot
` (3 more replies)
4 siblings, 4 replies; 22+ messages in thread
From: Simon Guinot @ 2014-07-08 14:42 UTC (permalink / raw)
To: linux-arm-kernel
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
--
2.0.0.rc2
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/2] ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS
2014-07-08 14:42 ` [PATCH 0/2] Add DT support for LaCie NAS d2 " Simon Guinot
@ 2014-07-08 14:42 ` Simon Guinot
2014-07-08 14:42 ` [PATCH 2/2] ARM: Kirkwood: add DT support for d2 Network v2 Simon Guinot
` (2 subsequent siblings)
3 siblings, 0 replies; 22+ messages in thread
From: Simon Guinot @ 2014-07-08 14:42 UTC (permalink / raw)
To: linux-arm-kernel
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 <simon.guinot@sequanux.org>
---
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(-)
diff --git a/arch/arm/boot/dts/kirkwood-net2big.dts b/arch/arm/boot/dts/kirkwood-net2big.dts
index a98deccee59f..53dc37a3b687 100644
--- a/arch/arm/boot/dts/kirkwood-net2big.dts
+++ b/arch/arm/boot/dts/kirkwood-net2big.dts
@@ -28,3 +28,33 @@
reg = <0x00000000 0x10000000>;
};
};
+
+®ulators {
+ 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>;
+ };
+};
diff --git a/arch/arm/boot/dts/kirkwood-net5big.dts b/arch/arm/boot/dts/kirkwood-net5big.dts
index d2887ed493f2..36155b749d9f 100644
--- a/arch/arm/boot/dts/kirkwood-net5big.dts
+++ b/arch/arm/boot/dts/kirkwood-net5big.dts
@@ -31,6 +31,18 @@
};
®ulators {
+ 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>;
+ };
+};
diff --git a/arch/arm/boot/dts/kirkwood-netxbig.dtsi b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
index fd75720547e3..b0cfb7cd30b9 100644
--- a/arch/arm/boot/dts/kirkwood-netxbig.dtsi
+++ b/arch/arm/boot/dts/kirkwood-netxbig.dtsi
@@ -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>;
- };
};
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 2/2] ARM: Kirkwood: add DT support for d2 Network v2
2014-07-08 14:42 ` [PATCH 0/2] Add DT support for LaCie NAS d2 " Simon Guinot
2014-07-08 14:42 ` [PATCH 1/2] ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS Simon Guinot
@ 2014-07-08 14:42 ` Simon Guinot
2014-07-10 20:48 ` [PATCH 0/2] Add DT support for LaCie NAS " Andrew Lunn
2014-07-13 21:46 ` Jason Cooper
3 siblings, 0 replies; 22+ messages in thread
From: Simon Guinot @ 2014-07-08 14:42 UTC (permalink / raw)
To: linux-arm-kernel
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 <simon.guinot@sequanux.org>
---
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
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 0b216b425eb8..c1dd2d1aa773 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -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 \
diff --git a/arch/arm/boot/dts/kirkwood-d2net.dts b/arch/arm/boot/dts/kirkwood-d2net.dts
new file mode 100644
index 000000000000..6b7856025001
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-d2net.dts
@@ -0,0 +1,42 @@
+/*
+ * Device Tree file for d2 Network v2
+ *
+ * Copyright (C) 2014 Simon Guinot <simon.guinot@sequanux.org>
+ *
+ * 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-netxbig.dtsi"
+
+/ {
+ model = "LaCie d2 Network v2";
+ compatible = "lacie,d2net_v2", "lacie,netxbig", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+ memory {
+ device_type = "memory";
+ reg = <0x00000000 0x10000000>;
+ };
+
+ ns2-leds {
+ compatible = "lacie,ns2-leds";
+
+ blue-sata {
+ label = "d2net_v2:blue:sata";
+ slow-gpio = <&gpio0 29 GPIO_ACTIVE_HIGH>;
+ cmd-gpio = <&gpio0 30 GPIO_ACTIVE_HIGH>;
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ red-fail {
+ label = "d2net_v2:red:fail";
+ gpios = <&gpio0 12 GPIO_ACTIVE_HIGH>;
+ };
+ };
+};
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 0/2] Add DT support for LaCie NAS d2 Network v2
2014-07-08 14:42 ` [PATCH 0/2] Add DT support for LaCie NAS d2 " Simon Guinot
2014-07-08 14:42 ` [PATCH 1/2] ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS Simon Guinot
2014-07-08 14:42 ` [PATCH 2/2] ARM: Kirkwood: add DT support for d2 Network v2 Simon Guinot
@ 2014-07-10 20:48 ` Andrew Lunn
2014-07-13 21:46 ` Jason Cooper
3 siblings, 0 replies; 22+ messages in thread
From: Andrew Lunn @ 2014-07-10 20:48 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 08, 2014 at 04:42:23PM +0200, Simon Guinot wrote:
> 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
Hi Simon
These patches look good.
Acked-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 0/2] Add DT support for LaCie NAS d2 Network v2
2014-07-08 14:42 ` [PATCH 0/2] Add DT support for LaCie NAS d2 " Simon Guinot
` (2 preceding siblings ...)
2014-07-10 20:48 ` [PATCH 0/2] Add DT support for LaCie NAS " Andrew Lunn
@ 2014-07-13 21:46 ` Jason Cooper
3 siblings, 0 replies; 22+ messages in thread
From: Jason Cooper @ 2014-07-13 21:46 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, Jul 08, 2014 at 04:42:23PM +0200, Simon Guinot wrote:
> 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
Both applied to mvebu/dt with Andrew's Ack.
thx,
Jason.
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2014-07-13 21:46 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-05-26 19:29 [PATCHv4 0/4] DT support for LaCie 2Big and 5Big Network v2 Andrew Lunn
2014-05-26 19:29 ` [PATCHv4 1/4] ARM: Kirkwood: Add setup file for netxbig LEDs Andrew Lunn
2014-06-20 20:51 ` Jason Cooper
2014-06-20 23:24 ` Simon Guinot
2014-06-20 23:30 ` Simon Guinot
2014-06-20 23:40 ` Jason Cooper
2014-05-26 19:29 ` [PATCHv4 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big Andrew Lunn
2014-06-20 20:52 ` Jason Cooper
2014-06-20 23:37 ` Simon Guinot
2014-06-20 23:48 ` Jason Cooper
2014-06-21 1:00 ` Andrew Lunn
2014-06-21 9:50 ` Simon Guinot
2014-06-21 19:28 ` Jason Cooper
2014-06-23 9:53 ` Simon Guinot
2014-05-26 19:29 ` [PATCHv4 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2 Andrew Lunn
2014-06-20 20:52 ` Jason Cooper
2014-05-26 19:29 ` [PATCHv4 4/4] ARM: multi_v5: Enable " Andrew Lunn
2014-07-08 14:42 ` [PATCH 0/2] Add DT support for LaCie NAS d2 " Simon Guinot
2014-07-08 14:42 ` [PATCH 1/2] ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS Simon Guinot
2014-07-08 14:42 ` [PATCH 2/2] ARM: Kirkwood: add DT support for d2 Network v2 Simon Guinot
2014-07-10 20:48 ` [PATCH 0/2] Add DT support for LaCie NAS " Andrew Lunn
2014-07-13 21:46 ` Jason Cooper
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.