* [PATCH v3 0/4] DT support for LaCie 2Big and 5Big Network v2
@ 2014-05-11 20:21 Andrew Lunn
2014-05-11 20:21 ` [PATCH v3 1/4] ARM: Kirkwood: Add board file for netxbig LEDs Andrew Lunn
` (4 more replies)
0 siblings, 5 replies; 14+ messages in thread
From: Andrew Lunn @ 2014-05-11 20:21 UTC (permalink / raw)
To: linux-arm-kernel
v3:
gpio_poweroff -> gpio-poweroff, etc.
Add stdout-path
Remove pinctrl property from spi, set in kirkwood.dtsi.
Andrew Lunn (4):
ARM: Kirkwood: Add board file for netxbig LEDs
ARM: Kirkwood: Add DT descriptions for net2big and net5big.
ARM: mvebu: Add LaCie 2Big and 5Big Network v2
ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2
arch/arm/boot/dts/Makefile | 2 +
arch/arm/boot/dts/kirkwood-net2big.dts | 30 +++++
arch/arm/boot/dts/kirkwood-net5big.dts | 83 ++++++++++++++
arch/arm/boot/dts/kirkwood-netxbig.dtsi | 166 +++++++++++++++++++++++++++
arch/arm/configs/multi_v5_defconfig | 1 +
arch/arm/configs/mvebu_v5_defconfig | 1 +
arch/arm/mach-mvebu/Kconfig | 7 ++
arch/arm/mach-mvebu/Makefile | 1 +
arch/arm/mach-mvebu/board-netxbig.c | 191 ++++++++++++++++++++++++++++++++
arch/arm/mach-mvebu/board.h | 5 +
arch/arm/mach-mvebu/kirkwood.c | 3 +
11 files changed, 490 insertions(+)
create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts
create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts
create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi
create mode 100644 arch/arm/mach-mvebu/board-netxbig.c
--
2.0.0.rc2
^ permalink raw reply [flat|nested] 14+ messages in thread* [PATCH v3 1/4] ARM: Kirkwood: Add board file for netxbig LEDs 2014-05-11 20:21 [PATCH v3 0/4] DT support for LaCie 2Big and 5Big Network v2 Andrew Lunn @ 2014-05-11 20:21 ` Andrew Lunn 2014-05-11 20:21 ` [PATCH v3 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big Andrew Lunn ` (3 subsequent siblings) 4 siblings, 0 replies; 14+ messages in thread From: Andrew Lunn @ 2014-05-11 20:21 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> --- arch/arm/mach-mvebu/Kconfig | 7 ++ arch/arm/mach-mvebu/Makefile | 1 + arch/arm/mach-mvebu/board-netxbig.c | 191 ++++++++++++++++++++++++++++++++++++ arch/arm/mach-mvebu/board.h | 5 + arch/arm/mach-mvebu/kirkwood.c | 3 + 5 files changed, 207 insertions(+) create mode 100644 arch/arm/mach-mvebu/board-netxbig.c 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..15580e48069a 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) += board-netxbig.o diff --git a/arch/arm/mach-mvebu/board-netxbig.c b/arch/arm/mach-mvebu/board-netxbig.c new file mode 100644 index 000000000000..e6f2f547b1c7 --- /dev/null +++ b/arch/arm/mach-mvebu/board-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); +} 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); } -- 2.0.0.rc2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big. 2014-05-11 20:21 [PATCH v3 0/4] DT support for LaCie 2Big and 5Big Network v2 Andrew Lunn 2014-05-11 20:21 ` [PATCH v3 1/4] ARM: Kirkwood: Add board file for netxbig LEDs Andrew Lunn @ 2014-05-11 20:21 ` Andrew Lunn 2014-05-23 18:32 ` Simon Guinot 2014-05-11 20:21 ` [PATCH v3 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2 Andrew Lunn ` (2 subsequent siblings) 4 siblings, 1 reply; 14+ messages in thread From: Andrew Lunn @ 2014-05-11 20:21 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. --- arch/arm/boot/dts/Makefile | 2 + arch/arm/boot/dts/kirkwood-net2big.dts | 30 ++++++ arch/arm/boot/dts/kirkwood-net5big.dts | 83 ++++++++++++++++ arch/arm/boot/dts/kirkwood-netxbig.dtsi | 166 ++++++++++++++++++++++++++++++++ 4 files changed, 281 insertions(+) create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi 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..c3f5281a52f5 --- /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", "lacie,netxbig", "marvell,kirkwood-88f6192", "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..20abe7e37ca2 --- /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", "lacie,netxbig", "marvell,kirkwood-88f6192", "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..eca522316560 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-netxbig.dtsi @@ -0,0 +1,166 @@ +/* + * 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>; + }; + }; +}; + +&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>; + }; +}; -- 2.0.0.rc2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big. 2014-05-11 20:21 ` [PATCH v3 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big Andrew Lunn @ 2014-05-23 18:32 ` Simon Guinot 0 siblings, 0 replies; 14+ messages in thread From: Simon Guinot @ 2014-05-23 18:32 UTC (permalink / raw) To: linux-arm-kernel On Sun, May 11, 2014 at 10:21:50PM +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. > --- > arch/arm/boot/dts/Makefile | 2 + > arch/arm/boot/dts/kirkwood-net2big.dts | 30 ++++++ > arch/arm/boot/dts/kirkwood-net5big.dts | 83 ++++++++++++++++ > arch/arm/boot/dts/kirkwood-netxbig.dtsi | 166 ++++++++++++++++++++++++++++++++ > 4 files changed, 281 insertions(+) > create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts > create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts > create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi > > 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..c3f5281a52f5 > --- /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", "lacie,netxbig", "marvell,kirkwood-88f6192", "marvell,kirkwood"; While the file name kirkwood-net2big.dtsi is correct (thanks to the kirkwood prefix), "lacie,net2big" is not. It refers to the 2Big Network board (Orion based). Even if there is no DT support for the net2big yet, it could be added latter. Then, I think we should add a _v2 prefix here, just to avoid the confusion. Also, you should replace the compatible string marvell,kirkwood-88f6192" with "marvell,kirkwood-88f6281". > + > + 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..20abe7e37ca2 > --- /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", "lacie,netxbig", "marvell,kirkwood-88f6192", "marvell,kirkwood"; Same comments here. > + > + 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..eca522316560 > --- /dev/null > +++ b/arch/arm/boot/dts/kirkwood-netxbig.dtsi > @@ -0,0 +1,166 @@ > +/* > + * 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; Note that I had to comment the line above to build this file with Linux 3.15-rc6. The uart alias is missing. I guess it is not an issue with the -mvebu or -next trees. > + }; > + > + 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>; > + }; > + Alignment and indentation looks wrong for the regulators node below. > + regulators: regulators { > + status = "okay"; > + compatible = "simple-bus"; > + #address-cells = <1>; > + #size-cells = <0>; > + pinctrl-names = "default"; > + > + regulator at 1 { > + compatible = "regulator-fixed"; > + reg = <1>; > + regulator-name = "hdd0power"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + gpio = <&gpio0 16 GPIO_ACTIVE_HIGH>; > + }; > + > + regulator at 2 { > + compatible = "regulator-fixed"; > + reg = <2>; > + regulator-name = "hdd1power"; > + regulator-min-microvolt = <5000000>; > + regulator-max-microvolt = <5000000>; > + enable-active-high; > + regulator-always-on; > + regulator-boot-on; > + gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>; > + }; > + }; > +}; > + > +&mdio { > + status = "okay"; > + > + ethphy0: ethernet-phy at 0 { > + reg = <8>; > + }; > + > + ethphy1: ethernet-phy at 1 { > + reg = <0>; > + }; > +}; > + > +ð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>; > + }; While we are at it, maybe you could add the following node here: g762 at 3e { compatible = "gmt,g762"; reg = <0x3e>; clocks = <&g762_clk>; }; With, in the ocp at f1000000 node: clocks { g761_clk: g762-oscillator { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <32768>; }; }; This will provide fan support for both 2Big and 5Big Network v2. And yes I feel a little bit ashamed about that :) Thanks, Simon -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/4bea0ebf/attachment.sig> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2 2014-05-11 20:21 [PATCH v3 0/4] DT support for LaCie 2Big and 5Big Network v2 Andrew Lunn 2014-05-11 20:21 ` [PATCH v3 1/4] ARM: Kirkwood: Add board file for netxbig LEDs Andrew Lunn 2014-05-11 20:21 ` [PATCH v3 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big Andrew Lunn @ 2014-05-11 20:21 ` Andrew Lunn 2014-05-23 18:33 ` Simon Guinot 2014-05-11 20:21 ` [PATCH v3 4/4] ARM: multi_v5: Enable " Andrew Lunn 2014-05-23 18:02 ` [PATCH v3 0/4] DT support for " Simon Guinot 4 siblings, 1 reply; 14+ messages in thread From: Andrew Lunn @ 2014-05-11 20:21 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> --- arch/arm/configs/mvebu_v5_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig index 27c732fdf21e..e999bb97be79 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 -- 2.0.0.rc2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2 2014-05-11 20:21 ` [PATCH v3 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2 Andrew Lunn @ 2014-05-23 18:33 ` Simon Guinot 0 siblings, 0 replies; 14+ messages in thread From: Simon Guinot @ 2014-05-23 18:33 UTC (permalink / raw) To: linux-arm-kernel On Sun, May 11, 2014 at 10:21:51PM +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> > --- > arch/arm/configs/mvebu_v5_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig > index 27c732fdf21e..e999bb97be79 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 If you add the DT fan node, then you want CONFIG_SENSORS_G762=y here. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/255d2a0f/attachment.sig> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 4/4] ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2 2014-05-11 20:21 [PATCH v3 0/4] DT support for LaCie 2Big and 5Big Network v2 Andrew Lunn ` (2 preceding siblings ...) 2014-05-11 20:21 ` [PATCH v3 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2 Andrew Lunn @ 2014-05-11 20:21 ` Andrew Lunn 2014-05-23 18:34 ` Simon Guinot 2014-05-23 18:02 ` [PATCH v3 0/4] DT support for " Simon Guinot 4 siblings, 1 reply; 14+ messages in thread From: Andrew Lunn @ 2014-05-11 20:21 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> --- arch/arm/configs/multi_v5_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig index 5ebfa8bf8509..02d4e79826d3 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 -- 2.0.0.rc2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 4/4] ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2 2014-05-11 20:21 ` [PATCH v3 4/4] ARM: multi_v5: Enable " Andrew Lunn @ 2014-05-23 18:34 ` Simon Guinot 0 siblings, 0 replies; 14+ messages in thread From: Simon Guinot @ 2014-05-23 18:34 UTC (permalink / raw) To: linux-arm-kernel On Sun, May 11, 2014 at 10:21:52PM +0200, Andrew Lunn wrote: > Enable building LaCie 2Big and 5Big Network v2 in the multi v5 kernel. > > Signed-off-by: Andrew Lunn <andrew@lunn.ch> > --- > arch/arm/configs/multi_v5_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm/configs/multi_v5_defconfig b/arch/arm/configs/multi_v5_defconfig > index 5ebfa8bf8509..02d4e79826d3 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 If you add the DT fan node, then you want CONFIG_SENSORS_G762=y here. -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/8b16546d/attachment-0001.sig> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 0/4] DT support for LaCie 2Big and 5Big Network v2 2014-05-11 20:21 [PATCH v3 0/4] DT support for LaCie 2Big and 5Big Network v2 Andrew Lunn ` (3 preceding siblings ...) 2014-05-11 20:21 ` [PATCH v3 4/4] ARM: multi_v5: Enable " Andrew Lunn @ 2014-05-23 18:02 ` Simon Guinot 2014-05-23 18:06 ` Jason Cooper 2014-05-23 18:23 ` Andrew Lunn 4 siblings, 2 replies; 14+ messages in thread From: Simon Guinot @ 2014-05-23 18:02 UTC (permalink / raw) To: linux-arm-kernel On Sun, May 11, 2014 at 10:21:48PM +0200, Andrew Lunn wrote: > v3: > gpio_poweroff -> gpio-poweroff, etc. > Add stdout-path > Remove pinctrl property from spi, set in kirkwood.dtsi. > > Andrew Lunn (4): > ARM: Kirkwood: Add board file for netxbig LEDs > ARM: Kirkwood: Add DT descriptions for net2big and net5big. > ARM: mvebu: Add LaCie 2Big and 5Big Network v2 > ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2 > > arch/arm/boot/dts/Makefile | 2 + > arch/arm/boot/dts/kirkwood-net2big.dts | 30 +++++ > arch/arm/boot/dts/kirkwood-net5big.dts | 83 ++++++++++++++ > arch/arm/boot/dts/kirkwood-netxbig.dtsi | 166 +++++++++++++++++++++++++++ > arch/arm/configs/multi_v5_defconfig | 1 + > arch/arm/configs/mvebu_v5_defconfig | 1 + > arch/arm/mach-mvebu/Kconfig | 7 ++ > arch/arm/mach-mvebu/Makefile | 1 + > arch/arm/mach-mvebu/board-netxbig.c | 191 ++++++++++++++++++++++++++++++++ > arch/arm/mach-mvebu/board.h | 5 + > arch/arm/mach-mvebu/kirkwood.c | 3 + > 11 files changed, 490 insertions(+) > create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts > create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts > create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi > create mode 100644 arch/arm/mach-mvebu/board-netxbig.c Hi Andrew, I have successfully tested your patch series (on the top of Linux 3.15-rc6) on a 2Big Network v2 board. Unfortunately, I failed to test the 5Big Network v2 support. My power supply died :( And since the connector is very specific, I have to wait until next Tuesday to get an another one. Moreover, I have a question. The DT support for the d2 Network v2 board (d2net_v2) is still missing. Since this board is very close from the 2Big Network v2, I think it should be included in this patch series. Do you want me to take care of that ? Regards, Simon -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 181 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140523/4509ff54/attachment.sig> ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 0/4] DT support for LaCie 2Big and 5Big Network v2 2014-05-23 18:02 ` [PATCH v3 0/4] DT support for " Simon Guinot @ 2014-05-23 18:06 ` Jason Cooper 2014-05-23 18:23 ` Andrew Lunn 1 sibling, 0 replies; 14+ messages in thread From: Jason Cooper @ 2014-05-23 18:06 UTC (permalink / raw) To: linux-arm-kernel On Fri, May 23, 2014 at 08:02:42PM +0200, Simon Guinot wrote: > On Sun, May 11, 2014 at 10:21:48PM +0200, Andrew Lunn wrote: > > v3: > > gpio_poweroff -> gpio-poweroff, etc. > > Add stdout-path > > Remove pinctrl property from spi, set in kirkwood.dtsi. > > > > Andrew Lunn (4): > > ARM: Kirkwood: Add board file for netxbig LEDs > > ARM: Kirkwood: Add DT descriptions for net2big and net5big. > > ARM: mvebu: Add LaCie 2Big and 5Big Network v2 > > ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2 > > > > arch/arm/boot/dts/Makefile | 2 + > > arch/arm/boot/dts/kirkwood-net2big.dts | 30 +++++ > > arch/arm/boot/dts/kirkwood-net5big.dts | 83 ++++++++++++++ > > arch/arm/boot/dts/kirkwood-netxbig.dtsi | 166 +++++++++++++++++++++++++++ > > arch/arm/configs/multi_v5_defconfig | 1 + > > arch/arm/configs/mvebu_v5_defconfig | 1 + > > arch/arm/mach-mvebu/Kconfig | 7 ++ > > arch/arm/mach-mvebu/Makefile | 1 + > > arch/arm/mach-mvebu/board-netxbig.c | 191 ++++++++++++++++++++++++++++++++ > > arch/arm/mach-mvebu/board.h | 5 + > > arch/arm/mach-mvebu/kirkwood.c | 3 + > > 11 files changed, 490 insertions(+) > > create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts > > create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts > > create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi > > create mode 100644 arch/arm/mach-mvebu/board-netxbig.c > > Hi Andrew, > > I have successfully tested your patch series (on the top of Linux > 3.15-rc6) on a 2Big Network v2 board. > > Unfortunately, I failed to test the 5Big Network v2 support. My power > supply died :( And since the connector is very specific, I have to wait > until next Tuesday to get an another one. > > Moreover, I have a question. The DT support for the d2 Network v2 board > (d2net_v2) is still missing. Since this board is very close from the > 2Big Network v2, I think it should be included in this patch series. Do > you want me to take care of that ? I'm not sure if Andrew is around so I'll pipe up. Please do. Just base it on top of this patch (along with any fixes ;-) ) and send it in-reply-to this series (not a hard requirement, just makes maintainer patch picking easier). And thanks for taking the time to test! thx, Jason. ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 0/4] DT support for LaCie 2Big and 5Big Network v2 2014-05-23 18:02 ` [PATCH v3 0/4] DT support for " Simon Guinot 2014-05-23 18:06 ` Jason Cooper @ 2014-05-23 18:23 ` Andrew Lunn 1 sibling, 0 replies; 14+ messages in thread From: Andrew Lunn @ 2014-05-23 18:23 UTC (permalink / raw) To: linux-arm-kernel On Fri, May 23, 2014 at 08:02:42PM +0200, Simon Guinot wrote: > On Sun, May 11, 2014 at 10:21:48PM +0200, Andrew Lunn wrote: > > v3: > > gpio_poweroff -> gpio-poweroff, etc. > > Add stdout-path > > Remove pinctrl property from spi, set in kirkwood.dtsi. > > > > Andrew Lunn (4): > > ARM: Kirkwood: Add board file for netxbig LEDs > > ARM: Kirkwood: Add DT descriptions for net2big and net5big. > > ARM: mvebu: Add LaCie 2Big and 5Big Network v2 > > ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2 > > > > arch/arm/boot/dts/Makefile | 2 + > > arch/arm/boot/dts/kirkwood-net2big.dts | 30 +++++ > > arch/arm/boot/dts/kirkwood-net5big.dts | 83 ++++++++++++++ > > arch/arm/boot/dts/kirkwood-netxbig.dtsi | 166 +++++++++++++++++++++++++++ > > arch/arm/configs/multi_v5_defconfig | 1 + > > arch/arm/configs/mvebu_v5_defconfig | 1 + > > arch/arm/mach-mvebu/Kconfig | 7 ++ > > arch/arm/mach-mvebu/Makefile | 1 + > > arch/arm/mach-mvebu/board-netxbig.c | 191 ++++++++++++++++++++++++++++++++ > > arch/arm/mach-mvebu/board.h | 5 + > > arch/arm/mach-mvebu/kirkwood.c | 3 + > > 11 files changed, 490 insertions(+) > > create mode 100644 arch/arm/boot/dts/kirkwood-net2big.dts > > create mode 100644 arch/arm/boot/dts/kirkwood-net5big.dts > > create mode 100644 arch/arm/boot/dts/kirkwood-netxbig.dtsi > > create mode 100644 arch/arm/mach-mvebu/board-netxbig.c > > Hi Andrew, > > I have successfully tested your patch series (on the top of Linux > 3.15-rc6) on a 2Big Network v2 board. Great, thanks. > Unfortunately, I failed to test the 5Big Network v2 support. My power > supply died :( And since the connector is very specific, I have to wait > until next Tuesday to get an another one. O.K. I think we have missed the merge window for this cycle anyway, so take your time. > Moreover, I have a question. The DT support for the d2 Network v2 > board (d2net_v2) is still missing. Since this board is very close > from the 2Big Network v2, I think it should be included in this > patch series. Do you want me to take care of that ? Humm, i thought Thomas had done that conversion. However, it looks like his patches never got picked up: http://www.spinics.net/lists/arm-kernel/msg263520.html It would be great if you can finish them off. Andrew ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH RFC 00/11] Remove mach-kirkwood @ 2014-05-15 14:23 Andrew Lunn 2014-05-15 14:23 ` [PATCH v3 1/4] ARM: Kirkwood: Add board file for netxbig LEDs Andrew Lunn 0 siblings, 1 reply; 14+ messages in thread From: Andrew Lunn @ 2014-05-15 14:23 UTC (permalink / raw) To: linux-arm-kernel This is an RFC patchset which removes mach-kirkwood, now that kirkwood support has been converted to DT and lives in mach-mvebu. It is an RFC because some of the final conversion patches have not yet been accepted by maintainers, in particular: http://www.spinics.net/lists/arm-kernel/msg328068.html which needs to be accepted by the Sound/ASoC maintainer. Once the real patchset is posted, without the RFC status, we would prefer that each subsystem maintainer takes the relevent patches, rather than try to take them all through arm-soc. Thanks Andrew Cc: Mark Brown <broonie@kernel.org> Cc: Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Rafael J. Wysocki <rjw@rjwysocki.net> Cc: Tejun Heo <tj@kernel.org> Cc: Zhang Rui <rui.zhang@intel.com> Cc: Bryan Wu <cooloney@gmail.com> Cc: Richard Purdie <rpurdie@rpsys.net> Cc: Bjorn Helgaas <bhelgaas@google.com> Cc: Kishon Vijay Abraham I <kishon@ti.com> Cc: Alessandro Zummo <a.zummo@towertech.it> Cc: Wim Van Sebroeck <wim@iguana.be> Andrew Lunn (11): ARM: Kirkwood: Remove mach-kirkwood sound: ASoC: kirkwood: Remove unused drivers sound: ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency ata: Remove ARCH_KIRKWOOD dependency thermal: Remove ARCH_KIRKWOOD dependency leds: Remove ARCH_KIRKWOOD dependency PCI: Remove ARCH_KIRKWOOD dependency phy: Remove ARCH_KIRKWOOD dependency rtc: Remove ARCH_KIRKWOOD dependency watchdog: Remove ARCH_KIRKWOOD dependency arch/arm/Kconfig | 18 - arch/arm/Kconfig.debug | 6 +- arch/arm/Makefile | 1 - arch/arm/boot/dts/Makefile | 5 +- arch/arm/configs/kirkwood_defconfig | 181 ------ arch/arm/mach-kirkwood/Kconfig | 111 ---- arch/arm/mach-kirkwood/Makefile | 14 - arch/arm/mach-kirkwood/Makefile.boot | 3 - arch/arm/mach-kirkwood/board-dt.c | 223 ------- arch/arm/mach-kirkwood/common.c | 746 ---------------------- arch/arm/mach-kirkwood/common.h | 74 --- arch/arm/mach-kirkwood/d2net_v2-setup.c | 231 ------- arch/arm/mach-kirkwood/include/mach/bridge-regs.h | 86 --- arch/arm/mach-kirkwood/include/mach/entry-macro.S | 34 - arch/arm/mach-kirkwood/include/mach/hardware.h | 14 - arch/arm/mach-kirkwood/include/mach/irqs.h | 65 -- arch/arm/mach-kirkwood/include/mach/kirkwood.h | 142 ---- arch/arm/mach-kirkwood/include/mach/uncompress.h | 46 -- arch/arm/mach-kirkwood/irq.c | 82 --- arch/arm/mach-kirkwood/lacie_v2-common.c | 114 ---- arch/arm/mach-kirkwood/lacie_v2-common.h | 16 - arch/arm/mach-kirkwood/mpp.c | 43 -- arch/arm/mach-kirkwood/mpp.h | 348 ---------- arch/arm/mach-kirkwood/netxbig_v2-setup.c | 422 ------------ arch/arm/mach-kirkwood/openrd-setup.c | 255 -------- arch/arm/mach-kirkwood/pcie.c | 296 --------- arch/arm/mach-kirkwood/pm.c | 76 --- arch/arm/mach-kirkwood/pm.h | 26 - arch/arm/mach-kirkwood/rd88f6192-nas-setup.c | 89 --- arch/arm/mach-kirkwood/rd88f6281-setup.c | 128 ---- arch/arm/mach-kirkwood/t5325-setup.c | 216 ------- arch/arm/mach-kirkwood/ts219-setup.c | 142 ---- arch/arm/mach-kirkwood/ts41x-setup.c | 186 ------ arch/arm/mach-kirkwood/tsx1x-common.c | 113 ---- arch/arm/mach-kirkwood/tsx1x-common.h | 7 - arch/arm/mm/Kconfig | 2 +- drivers/ata/Kconfig | 2 +- drivers/cpuidle/Kconfig.arm | 2 +- drivers/leds/Kconfig | 4 +- drivers/pci/host/Kconfig | 2 +- drivers/phy/Kconfig | 2 +- drivers/rtc/Kconfig | 2 +- drivers/thermal/Kconfig | 2 +- drivers/watchdog/Kconfig | 2 +- sound/soc/kirkwood/Kconfig | 19 +- sound/soc/kirkwood/Makefile | 4 - sound/soc/kirkwood/kirkwood-openrd.c | 109 ---- sound/soc/kirkwood/kirkwood-t5325.c | 129 ---- 48 files changed, 14 insertions(+), 4826 deletions(-) delete mode 100644 arch/arm/configs/kirkwood_defconfig delete mode 100644 arch/arm/mach-kirkwood/Kconfig delete mode 100644 arch/arm/mach-kirkwood/Makefile delete mode 100644 arch/arm/mach-kirkwood/Makefile.boot delete mode 100644 arch/arm/mach-kirkwood/board-dt.c delete mode 100644 arch/arm/mach-kirkwood/common.c delete mode 100644 arch/arm/mach-kirkwood/common.h delete mode 100644 arch/arm/mach-kirkwood/d2net_v2-setup.c delete mode 100644 arch/arm/mach-kirkwood/include/mach/bridge-regs.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/entry-macro.S delete mode 100644 arch/arm/mach-kirkwood/include/mach/hardware.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/irqs.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/kirkwood.h delete mode 100644 arch/arm/mach-kirkwood/include/mach/uncompress.h delete mode 100644 arch/arm/mach-kirkwood/irq.c delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.c delete mode 100644 arch/arm/mach-kirkwood/lacie_v2-common.h delete mode 100644 arch/arm/mach-kirkwood/mpp.c delete mode 100644 arch/arm/mach-kirkwood/mpp.h delete mode 100644 arch/arm/mach-kirkwood/netxbig_v2-setup.c delete mode 100644 arch/arm/mach-kirkwood/openrd-setup.c delete mode 100644 arch/arm/mach-kirkwood/pcie.c delete mode 100644 arch/arm/mach-kirkwood/pm.c delete mode 100644 arch/arm/mach-kirkwood/pm.h delete mode 100644 arch/arm/mach-kirkwood/rd88f6192-nas-setup.c delete mode 100644 arch/arm/mach-kirkwood/rd88f6281-setup.c delete mode 100644 arch/arm/mach-kirkwood/t5325-setup.c delete mode 100644 arch/arm/mach-kirkwood/ts219-setup.c delete mode 100644 arch/arm/mach-kirkwood/ts41x-setup.c delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.c delete mode 100644 arch/arm/mach-kirkwood/tsx1x-common.h delete mode 100644 sound/soc/kirkwood/kirkwood-openrd.c delete mode 100644 sound/soc/kirkwood/kirkwood-t5325.c -- 2.0.0.rc2 ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 1/4] ARM: Kirkwood: Add board file for netxbig LEDs 2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn @ 2014-05-15 14:23 ` Andrew Lunn 2014-05-15 14:38 ` Arnd Bergmann 0 siblings, 1 reply; 14+ messages in thread From: Andrew Lunn @ 2014-05-15 14:23 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> --- arch/arm/mach-mvebu/Kconfig | 7 ++ arch/arm/mach-mvebu/Makefile | 1 + arch/arm/mach-mvebu/board-netxbig.c | 191 ++++++++++++++++++++++++++++++++++++ arch/arm/mach-mvebu/board.h | 5 + arch/arm/mach-mvebu/kirkwood.c | 3 + 5 files changed, 207 insertions(+) create mode 100644 arch/arm/mach-mvebu/board-netxbig.c 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..15580e48069a 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) += board-netxbig.o diff --git a/arch/arm/mach-mvebu/board-netxbig.c b/arch/arm/mach-mvebu/board-netxbig.c new file mode 100644 index 000000000000..e6f2f547b1c7 --- /dev/null +++ b/arch/arm/mach-mvebu/board-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); +} 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); } -- 2.0.0.rc2 ^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH v3 1/4] ARM: Kirkwood: Add board file for netxbig LEDs 2014-05-15 14:23 ` [PATCH v3 1/4] ARM: Kirkwood: Add board file for netxbig LEDs Andrew Lunn @ 2014-05-15 14:38 ` Arnd Bergmann 2014-05-15 20:36 ` Andrew Lunn 0 siblings, 1 reply; 14+ messages in thread From: Arnd Bergmann @ 2014-05-15 14:38 UTC (permalink / raw) To: linux-arm-kernel On Thursday 15 May 2014 16:23:42 Andrew Lunn wrote: > diff --git a/arch/arm/mach-mvebu/board-netxbig.c b/arch/arm/mach-mvebu/board-netxbig.c > new file mode 100644 > index 000000000000..e6f2f547b1c7 > --- /dev/null > +++ b/arch/arm/mach-mvebu/board-netxbig.c > I'd rather see these tables as part of the netxbig led driver in a separate file, but if we keep it here, can you rename the file to kirkwood-netxbig-led.c? We are not really doing board files any more, and this isn't one. Arnd ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH v3 1/4] ARM: Kirkwood: Add board file for netxbig LEDs 2014-05-15 14:38 ` Arnd Bergmann @ 2014-05-15 20:36 ` Andrew Lunn 0 siblings, 0 replies; 14+ messages in thread From: Andrew Lunn @ 2014-05-15 20:36 UTC (permalink / raw) To: linux-arm-kernel On Thu, May 15, 2014 at 04:38:43PM +0200, Arnd Bergmann wrote: > On Thursday 15 May 2014 16:23:42 Andrew Lunn wrote: > > diff --git a/arch/arm/mach-mvebu/board-netxbig.c b/arch/arm/mach-mvebu/board-netxbig.c > > new file mode 100644 > > index 000000000000..e6f2f547b1c7 > > --- /dev/null > > +++ b/arch/arm/mach-mvebu/board-netxbig.c > > > > I'd rather see these tables as part of the netxbig led driver in a > separate file, but if we keep it here, can you rename the file to > kirkwood-netxbig-led.c? We are not really doing board files any > more, and this isn't one. I will rename it. Simon has said he hopes to test on real hardware soon, so once i have the results i will respin the patch set. Adding a DT binding to the LED driver is probably a task for next cycle. Andrew ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2014-05-23 18:34 UTC | newest] Thread overview: 14+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-05-11 20:21 [PATCH v3 0/4] DT support for LaCie 2Big and 5Big Network v2 Andrew Lunn 2014-05-11 20:21 ` [PATCH v3 1/4] ARM: Kirkwood: Add board file for netxbig LEDs Andrew Lunn 2014-05-11 20:21 ` [PATCH v3 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big Andrew Lunn 2014-05-23 18:32 ` Simon Guinot 2014-05-11 20:21 ` [PATCH v3 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2 Andrew Lunn 2014-05-23 18:33 ` Simon Guinot 2014-05-11 20:21 ` [PATCH v3 4/4] ARM: multi_v5: Enable " Andrew Lunn 2014-05-23 18:34 ` Simon Guinot 2014-05-23 18:02 ` [PATCH v3 0/4] DT support for " Simon Guinot 2014-05-23 18:06 ` Jason Cooper 2014-05-23 18:23 ` Andrew Lunn -- strict thread matches above, loose matches on Subject: below -- 2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn 2014-05-15 14:23 ` [PATCH v3 1/4] ARM: Kirkwood: Add board file for netxbig LEDs Andrew Lunn 2014-05-15 14:38 ` Arnd Bergmann 2014-05-15 20:36 ` Andrew Lunn
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).