* [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
2014-05-15 14:23 ` [PATCH v3 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big Andrew Lunn
` (13 subsequent siblings)
14 siblings, 1 reply; 40+ 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] 40+ 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; 40+ 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] 40+ 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; 40+ 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] 40+ messages in thread
* [PATCH v3 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big.
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:23 ` Andrew Lunn
2014-05-15 14:23 ` [PATCH RFC 02/11] sound: ASoC: kirkwood: Remove unused drivers Andrew Lunn
` (12 subsequent siblings)
14 siblings, 0 replies; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:23 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] 40+ messages in thread* [PATCH RFC 02/11] sound: ASoC: kirkwood: Remove unused drivers
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:23 ` [PATCH v3 2/4] ARM: Kirkwood: Add DT descriptions for net2big and net5big Andrew Lunn
@ 2014-05-15 14:23 ` Andrew Lunn
2014-05-26 15:59 ` Mark Brown
2014-05-15 14:23 ` [PATCH v3 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2 Andrew Lunn
` (11 subsequent siblings)
14 siblings, 1 reply; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:23 UTC (permalink / raw)
To: linux-arm-kernel
Both kirkwood-openrd and kirkwood-t5325 drivers have been replaced
with DT based simple-card equivelents.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Mark Brown <broonie@kernel.org>
Cc: alsa-devel at alsa-project.org
---
sound/soc/kirkwood/Kconfig | 17 -----
sound/soc/kirkwood/Makefile | 4 --
sound/soc/kirkwood/kirkwood-openrd.c | 109 -----------------------------
sound/soc/kirkwood/kirkwood-t5325.c | 129 -----------------------------------
4 files changed, 259 deletions(-)
delete mode 100644 sound/soc/kirkwood/kirkwood-openrd.c
delete mode 100644 sound/soc/kirkwood/kirkwood-t5325.c
diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
index 06f4e8aa93ae..1f7c7ee3527a 100644
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@ -15,20 +15,3 @@ config SND_KIRKWOOD_SOC_ARMADA370_DB
Say Y if you want to add support for SoC audio on
the Armada 370 Development Board.
-config SND_KIRKWOOD_SOC_OPENRD
- tristate "SoC Audio support for Kirkwood Openrd Client"
- depends on SND_KIRKWOOD_SOC && (MACH_OPENRD_CLIENT || MACH_OPENRD_ULTIMATE || COMPILE_TEST)
- depends on I2C
- select SND_SOC_CS42L51
- help
- Say Y if you want to add support for SoC audio on
- Openrd Client.
-
-config SND_KIRKWOOD_SOC_T5325
- tristate "SoC Audio support for HP t5325"
- depends on SND_KIRKWOOD_SOC && (MACH_T5325 || COMPILE_TEST) && I2C
- select SND_SOC_ALC5623
- help
- Say Y if you want to add support for SoC audio on
- the HP t5325 thin client.
-
diff --git a/sound/soc/kirkwood/Makefile b/sound/soc/kirkwood/Makefile
index 7c1d8fe09e6b..c36b03d8006c 100644
--- a/sound/soc/kirkwood/Makefile
+++ b/sound/soc/kirkwood/Makefile
@@ -2,10 +2,6 @@ snd-soc-kirkwood-objs := kirkwood-dma.o kirkwood-i2s.o
obj-$(CONFIG_SND_KIRKWOOD_SOC) += snd-soc-kirkwood.o
-snd-soc-openrd-objs := kirkwood-openrd.o
-snd-soc-t5325-objs := kirkwood-t5325.o
snd-soc-armada-370-db-objs := armada-370-db.o
obj-$(CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB) += snd-soc-armada-370-db.o
-obj-$(CONFIG_SND_KIRKWOOD_SOC_OPENRD) += snd-soc-openrd.o
-obj-$(CONFIG_SND_KIRKWOOD_SOC_T5325) += snd-soc-t5325.o
diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c
deleted file mode 100644
index 65f2a5b9ec3b..000000000000
--- a/sound/soc/kirkwood/kirkwood-openrd.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * kirkwood-openrd.c
- *
- * (c) 2010 Arnaud Patard <apatard@mandriva.com>
- * (c) 2010 Arnaud Patard <arnaud.patard@rtp-net.org>
- *
- * 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.
- */
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <sound/soc.h>
-#include <linux/platform_data/asoc-kirkwood.h>
-#include "../codecs/cs42l51.h"
-
-static int openrd_client_hw_params(struct snd_pcm_substream *substream,
- struct snd_pcm_hw_params *params)
-{
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
- struct snd_soc_dai *codec_dai = rtd->codec_dai;
- unsigned int freq;
-
- switch (params_rate(params)) {
- default:
- case 44100:
- freq = 11289600;
- break;
- case 48000:
- freq = 12288000;
- break;
- case 96000:
- freq = 24576000;
- break;
- }
-
- return snd_soc_dai_set_sysclk(codec_dai, 0, freq, SND_SOC_CLOCK_IN);
-
-}
-
-static struct snd_soc_ops openrd_client_ops = {
- .hw_params = openrd_client_hw_params,
-};
-
-
-static struct snd_soc_dai_link openrd_client_dai[] = {
-{
- .name = "CS42L51",
- .stream_name = "CS42L51 HiFi",
- .cpu_dai_name = "i2s",
- .platform_name = "mvebu-audio",
- .codec_dai_name = "cs42l51-hifi",
- .codec_name = "cs42l51-codec.0-004a",
- .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
- .ops = &openrd_client_ops,
-},
-};
-
-
-static struct snd_soc_card openrd_client = {
- .name = "OpenRD Client",
- .owner = THIS_MODULE,
- .dai_link = openrd_client_dai,
- .num_links = ARRAY_SIZE(openrd_client_dai),
-};
-
-static int openrd_probe(struct platform_device *pdev)
-{
- struct snd_soc_card *card = &openrd_client;
- int ret;
-
- card->dev = &pdev->dev;
-
- ret = snd_soc_register_card(card);
- if (ret)
- dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
- ret);
- return ret;
-}
-
-static int openrd_remove(struct platform_device *pdev)
-{
- struct snd_soc_card *card = platform_get_drvdata(pdev);
-
- snd_soc_unregister_card(card);
- return 0;
-}
-
-static struct platform_driver openrd_driver = {
- .driver = {
- .name = "openrd-client-audio",
- .owner = THIS_MODULE,
- },
- .probe = openrd_probe,
- .remove = openrd_remove,
-};
-
-module_platform_driver(openrd_driver);
-
-/* Module information */
-MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
-MODULE_DESCRIPTION("ALSA SoC OpenRD Client");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:openrd-client-audio");
diff --git a/sound/soc/kirkwood/kirkwood-t5325.c b/sound/soc/kirkwood/kirkwood-t5325.c
deleted file mode 100644
index d213832b0c72..000000000000
--- a/sound/soc/kirkwood/kirkwood-t5325.c
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * kirkwood-t5325.c
- *
- * (c) 2010 Arnaud Patard <arnaud.patard@rtp-net.org>
- *
- * 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.
- */
-
-#include <linux/module.h>
-#include <linux/moduleparam.h>
-#include <linux/interrupt.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <sound/soc.h>
-#include <linux/platform_data/asoc-kirkwood.h>
-#include "../codecs/alc5623.h"
-
-static int t5325_hw_params(struct snd_pcm_substream *substream,
- struct snd_pcm_hw_params *params)
-{
- struct snd_soc_pcm_runtime *rtd = substream->private_data;
- struct snd_soc_dai *codec_dai = rtd->codec_dai;
- unsigned int freq;
-
- freq = params_rate(params) * 256;
-
- return snd_soc_dai_set_sysclk(codec_dai, 0, freq, SND_SOC_CLOCK_IN);
-
-}
-
-static struct snd_soc_ops t5325_ops = {
- .hw_params = t5325_hw_params,
-};
-
-static const struct snd_soc_dapm_widget t5325_dapm_widgets[] = {
- SND_SOC_DAPM_HP("Headphone Jack", NULL),
- SND_SOC_DAPM_SPK("Speaker", NULL),
- SND_SOC_DAPM_MIC("Mic Jack", NULL),
-};
-
-static const struct snd_soc_dapm_route t5325_route[] = {
- { "Headphone Jack", NULL, "HPL" },
- { "Headphone Jack", NULL, "HPR" },
-
- {"Speaker", NULL, "SPKOUT"},
- {"Speaker", NULL, "SPKOUTN"},
-
- { "MIC1", NULL, "Mic Jack" },
- { "MIC2", NULL, "Mic Jack" },
-};
-
-static int t5325_dai_init(struct snd_soc_pcm_runtime *rtd)
-{
- struct snd_soc_codec *codec = rtd->codec;
- struct snd_soc_dapm_context *dapm = &codec->dapm;
-
- snd_soc_dapm_enable_pin(dapm, "Mic Jack");
- snd_soc_dapm_enable_pin(dapm, "Headphone Jack");
- snd_soc_dapm_enable_pin(dapm, "Speaker");
-
- return 0;
-}
-
-static struct snd_soc_dai_link t5325_dai[] = {
-{
- .name = "ALC5621",
- .stream_name = "ALC5621 HiFi",
- .cpu_dai_name = "i2s",
- .platform_name = "mvebu-audio",
- .codec_dai_name = "alc5621-hifi",
- .codec_name = "alc562x-codec.0-001a",
- .dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS,
- .ops = &t5325_ops,
- .init = t5325_dai_init,
-},
-};
-
-static struct snd_soc_card t5325 = {
- .name = "t5325",
- .owner = THIS_MODULE,
- .dai_link = t5325_dai,
- .num_links = ARRAY_SIZE(t5325_dai),
-
- .dapm_widgets = t5325_dapm_widgets,
- .num_dapm_widgets = ARRAY_SIZE(t5325_dapm_widgets),
- .dapm_routes = t5325_route,
- .num_dapm_routes = ARRAY_SIZE(t5325_route),
-};
-
-static int t5325_probe(struct platform_device *pdev)
-{
- struct snd_soc_card *card = &t5325;
- int ret;
-
- card->dev = &pdev->dev;
-
- ret = snd_soc_register_card(card);
- if (ret)
- dev_err(&pdev->dev, "snd_soc_register_card() failed: %d\n",
- ret);
- return ret;
-}
-
-static int t5325_remove(struct platform_device *pdev)
-{
- struct snd_soc_card *card = platform_get_drvdata(pdev);
-
- snd_soc_unregister_card(card);
- return 0;
-}
-
-static struct platform_driver t5325_driver = {
- .driver = {
- .name = "t5325-audio",
- .owner = THIS_MODULE,
- },
- .probe = t5325_probe,
- .remove = t5325_remove,
-};
-
-module_platform_driver(t5325_driver);
-
-MODULE_AUTHOR("Arnaud Patard <arnaud.patard@rtp-net.org>");
-MODULE_DESCRIPTION("ALSA SoC t5325 audio client");
-MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:t5325-audio");
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH RFC 02/11] sound: ASoC: kirkwood: Remove unused drivers
2014-05-15 14:23 ` [PATCH RFC 02/11] sound: ASoC: kirkwood: Remove unused drivers Andrew Lunn
@ 2014-05-26 15:59 ` Mark Brown
2014-05-27 16:45 ` Andrew Lunn
0 siblings, 1 reply; 40+ messages in thread
From: Mark Brown @ 2014-05-26 15:59 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 15, 2014 at 04:23:45PM +0200, Andrew Lunn wrote:
> Both kirkwood-openrd and kirkwood-t5325 drivers have been replaced
> with DT based simple-card equivelents.
Applied, thanks. Please do try to use subject lines matching the style
for the subsystem.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140526/65636297/attachment.sig>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 02/11] sound: ASoC: kirkwood: Remove unused drivers
2014-05-26 15:59 ` Mark Brown
@ 2014-05-27 16:45 ` Andrew Lunn
2014-05-27 18:00 ` Mark Brown
0 siblings, 1 reply; 40+ messages in thread
From: Andrew Lunn @ 2014-05-27 16:45 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 26, 2014 at 04:59:01PM +0100, Mark Brown wrote:
> On Thu, May 15, 2014 at 04:23:45PM +0200, Andrew Lunn wrote:
> > Both kirkwood-openrd and kirkwood-t5325 drivers have been replaced
> > with DT based simple-card equivelents.
>
> Applied, thanks.
Hi Mark
This is an RFC patch, as it says in the Subject line, and the cover
note. It is not intended to be applied yet. Please unapply it, and the
other one in the series you have applied.
> Please do try to use subject lines matching the style for the
> subsystem.
O.K, i will fix this when i send the real, not RFC, to be applied,
patches.
Thanks
Andrew
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 02/11] sound: ASoC: kirkwood: Remove unused drivers
2014-05-27 16:45 ` Andrew Lunn
@ 2014-05-27 18:00 ` Mark Brown
2014-05-27 18:18 ` Andrew Lunn
0 siblings, 1 reply; 40+ messages in thread
From: Mark Brown @ 2014-05-27 18:00 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 27, 2014 at 06:45:30PM +0200, Andrew Lunn wrote:
> This is an RFC patch, as it says in the Subject line, and the cover
> note. It is not intended to be applied yet. Please unapply it, and the
> other one in the series you have applied.
Eh? I thought the discussion was that everything was OK and we were
going to go ahead with this approach. Or to put it another way what's
wrong with this and what's expected to change? The only issue you
identified in the cover letter was me applying some patches I'd already
applied (BTW, please always include plain text descriptions of external
things you're referring to in mails - this applies to links as much as
it does to commit IDs).
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140527/5562d3cb/attachment.sig>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 02/11] sound: ASoC: kirkwood: Remove unused drivers
2014-05-27 18:00 ` Mark Brown
@ 2014-05-27 18:18 ` Andrew Lunn
2014-05-27 19:52 ` Mark Brown
0 siblings, 1 reply; 40+ messages in thread
From: Andrew Lunn @ 2014-05-27 18:18 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 27, 2014 at 07:00:47PM +0100, Mark Brown wrote:
> On Tue, May 27, 2014 at 06:45:30PM +0200, Andrew Lunn wrote:
>
> > This is an RFC patch, as it says in the Subject line, and the cover
> > note. It is not intended to be applied yet. Please unapply it, and the
> > other one in the series you have applied.
>
> Eh? I thought the discussion was that everything was OK and we were
> going to go ahead with this approach. Or to put it another way what's
> wrong with this and what's expected to change?
Hi Mark
What is wrong is that the merge path for the first patch, which
removes the boards making use of these drivers, has already closed for
patches. So we now have boards left in the tree with broken audio. We
can leave it that way, because these boards are actually in the tree
twice. One using DT, which will work as things are now, and old style
board file boards which are broken.
> The only issue you identified in the cover letter was me applying
> some patches I'd already applied
That was my error. I should of also added that you need to apply those
patches before arm-soc closes, so we have time to feed in these
patches. arm-soc generally closes around rc6/rc7, with the mvebu
maintainer closing a little before that.
Since we are past that now, i planned to send these patches next
cycle, without the RFC tag.
Andrew
^ permalink raw reply [flat|nested] 40+ messages in thread* [PATCH RFC 02/11] sound: ASoC: kirkwood: Remove unused drivers
2014-05-27 18:18 ` Andrew Lunn
@ 2014-05-27 19:52 ` Mark Brown
2014-05-27 23:46 ` Jason Cooper
0 siblings, 1 reply; 40+ messages in thread
From: Mark Brown @ 2014-05-27 19:52 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 27, 2014 at 08:18:18PM +0200, Andrew Lunn wrote:
> On Tue, May 27, 2014 at 07:00:47PM +0100, Mark Brown wrote:
> > On Tue, May 27, 2014 at 06:45:30PM +0200, Andrew Lunn wrote:
> > > This is an RFC patch, as it says in the Subject line, and the cover
> > > note. It is not intended to be applied yet. Please unapply it, and the
> > > other one in the series you have applied.
> > Eh? I thought the discussion was that everything was OK and we were
> > going to go ahead with this approach. Or to put it another way what's
> > wrong with this and what's expected to change?
> What is wrong is that the merge path for the first patch, which
> removes the boards making use of these drivers, has already closed for
> patches. So we now have boards left in the tree with broken audio. We
> can leave it that way, because these boards are actually in the tree
> twice. One using DT, which will work as things are now, and old style
> board file boards which are broken.
OK, so another part of this is that you didn't send the first patch to
me so I didn't realise that the boards were still there. TBH I'd have
expected that removal to just be going in independently of cleaning up
the drivers.
Anyway, I dropped the patches.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140527/a5aa8568/attachment.sig>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 02/11] sound: ASoC: kirkwood: Remove unused drivers
2014-05-27 19:52 ` Mark Brown
@ 2014-05-27 23:46 ` Jason Cooper
0 siblings, 0 replies; 40+ messages in thread
From: Jason Cooper @ 2014-05-27 23:46 UTC (permalink / raw)
To: linux-arm-kernel
On Tue, May 27, 2014 at 08:52:12PM +0100, Mark Brown wrote:
> On Tue, May 27, 2014 at 08:18:18PM +0200, Andrew Lunn wrote:
> > On Tue, May 27, 2014 at 07:00:47PM +0100, Mark Brown wrote:
> > > On Tue, May 27, 2014 at 06:45:30PM +0200, Andrew Lunn wrote:
>
> > > > This is an RFC patch, as it says in the Subject line, and the cover
> > > > note. It is not intended to be applied yet. Please unapply it, and the
> > > > other one in the series you have applied.
>
> > > Eh? I thought the discussion was that everything was OK and we were
> > > going to go ahead with this approach. Or to put it another way what's
> > > wrong with this and what's expected to change?
>
> > What is wrong is that the merge path for the first patch, which
> > removes the boards making use of these drivers, has already closed for
> > patches. So we now have boards left in the tree with broken audio. We
> > can leave it that way, because these boards are actually in the tree
> > twice. One using DT, which will work as things are now, and old style
> > board file boards which are broken.
>
> OK, so another part of this is that you didn't send the first patch to
> me so I didn't realise that the boards were still there. TBH I'd have
> expected that removal to just be going in independently of cleaning up
> the drivers.
>
> Anyway, I dropped the patches.
Thanks Mark, sorry for the confusion.
thx,
Jason.
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v3 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2
2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn
` (2 preceding siblings ...)
2014-05-15 14:23 ` [PATCH RFC 02/11] sound: ASoC: kirkwood: Remove unused drivers Andrew Lunn
@ 2014-05-15 14:23 ` Andrew Lunn
2014-05-15 14:23 ` [PATCH RFC 03/11] sound: ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency Andrew Lunn
` (10 subsequent siblings)
14 siblings, 0 replies; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:23 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] 40+ messages in thread* [PATCH RFC 03/11] sound: ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency
2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn
` (3 preceding siblings ...)
2014-05-15 14:23 ` [PATCH v3 3/4] ARM: mvebu: Add LaCie 2Big and 5Big Network v2 Andrew Lunn
@ 2014-05-15 14:23 ` Andrew Lunn
2014-05-15 22:01 ` Adam Baker
2014-05-26 15:59 ` Mark Brown
2014-05-15 14:23 ` [PATCH v3 4/4] ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2 Andrew Lunn
` (9 subsequent siblings)
14 siblings, 2 replies; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:23 UTC (permalink / raw)
To: linux-arm-kernel
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Mark Brown <broonie@kernel.org>
Cc: alsa-devel at alsa-project.org
---
sound/soc/kirkwood/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
index 1f7c7ee3527a..6a0f79d2bb33 100644
--- a/sound/soc/kirkwood/Kconfig
+++ b/sound/soc/kirkwood/Kconfig
@@ -1,6 +1,6 @@
config SND_KIRKWOOD_SOC
tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
- depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || MACH_KIRKWOOD || COMPILE_TEST
+ depends on ARCH_DOVE || ARCH_MVEBU || MACH_KIRKWOOD || COMPILE_TEST
help
Say Y or M if you want to add support for codecs attached to
the Kirkwood I2S interface. You will also need to select the
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH RFC 03/11] sound: ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency
2014-05-15 14:23 ` [PATCH RFC 03/11] sound: ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency Andrew Lunn
@ 2014-05-15 22:01 ` Adam Baker
2014-05-15 22:17 ` Andrew Lunn
2014-05-26 15:59 ` Mark Brown
1 sibling, 1 reply; 40+ messages in thread
From: Adam Baker @ 2014-05-15 22:01 UTC (permalink / raw)
To: linux-arm-kernel
On 15/05/14 15:23, Andrew Lunn wrote:
> mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
Most of the descriptions in the series say remove mach-kirkwood and most
of the actual patches remove ARCH_KIRKWOOD and leave MACH_KIRKWOOD
untouched. Patch 01/11 hasn't turned up here so I'm not certain which
you meant but consistency would be good.
>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> Cc: Mark Brown <broonie@kernel.org>
> Cc: alsa-devel at alsa-project.org
> ---
> sound/soc/kirkwood/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/kirkwood/Kconfig b/sound/soc/kirkwood/Kconfig
> index 1f7c7ee3527a..6a0f79d2bb33 100644
> --- a/sound/soc/kirkwood/Kconfig
> +++ b/sound/soc/kirkwood/Kconfig
> @@ -1,6 +1,6 @@
> config SND_KIRKWOOD_SOC
> tristate "SoC Audio for the Marvell Kirkwood and Dove chips"
> - depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU || MACH_KIRKWOOD || COMPILE_TEST
> + depends on ARCH_DOVE || ARCH_MVEBU || MACH_KIRKWOOD || COMPILE_TEST
> help
> Say Y or M if you want to add support for codecs attached to
> the Kirkwood I2S interface. You will also need to select the
>
Regards
Adam Baker
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 03/11] sound: ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency
2014-05-15 22:01 ` Adam Baker
@ 2014-05-15 22:17 ` Andrew Lunn
0 siblings, 0 replies; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 22:17 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 15, 2014 at 11:01:14PM +0100, Adam Baker wrote:
> On 15/05/14 15:23, Andrew Lunn wrote:
> >mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
>
> Most of the descriptions in the series say remove mach-kirkwood and
> most of the actual patches remove ARCH_KIRKWOOD and leave
> MACH_KIRKWOOD untouched. Patch 01/11 hasn't turned up here so I'm
> not certain which you meant but consistency would be good.
01/11 is big, since it is an rm -fr arch/arm/mach-kirkwood. It is
bigger than the list message size limit and so has been put to one
side for the list moderator to approve.
The comment is consistent with the code, the code is however somewhat
confusing. arch/arm/mach-kirkwood uses ARCH_KIRKWOOD. kirkwood in its
new home inside arch/arm/mach-mvebu uses MACH_KIRKWOOD.
Andrew
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 03/11] sound: ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency
2014-05-15 14:23 ` [PATCH RFC 03/11] sound: ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency Andrew Lunn
2014-05-15 22:01 ` Adam Baker
@ 2014-05-26 15:59 ` Mark Brown
1 sibling, 0 replies; 40+ messages in thread
From: Mark Brown @ 2014-05-26 15:59 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 15, 2014 at 04:23:47PM +0200, Andrew Lunn wrote:
> mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
Applied, thanks.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140526/de0f2067/attachment.sig>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v3 4/4] ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2
2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn
` (4 preceding siblings ...)
2014-05-15 14:23 ` [PATCH RFC 03/11] sound: ASoC: kirkwood: Remove ARCH_KIRKWOOD dependency Andrew Lunn
@ 2014-05-15 14:23 ` Andrew Lunn
2014-05-19 9:05 ` Sebastian Hesselbarth
2014-05-15 14:23 ` [PATCH RFC 04/11] cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency Andrew Lunn
` (8 subsequent siblings)
14 siblings, 1 reply; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:23 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] 40+ messages in thread* [PATCH v3 4/4] ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2
2014-05-15 14:23 ` [PATCH v3 4/4] ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2 Andrew Lunn
@ 2014-05-19 9:05 ` Sebastian Hesselbarth
2014-05-19 14:45 ` Jason Cooper
0 siblings, 1 reply; 40+ messages in thread
From: Sebastian Hesselbarth @ 2014-05-19 9:05 UTC (permalink / raw)
To: linux-arm-kernel
[Added arm at kernel.org so they can spot the patch more easily]
On 05/15/2014 04:23 PM, 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
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH v3 4/4] ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2
2014-05-19 9:05 ` Sebastian Hesselbarth
@ 2014-05-19 14:45 ` Jason Cooper
0 siblings, 0 replies; 40+ messages in thread
From: Jason Cooper @ 2014-05-19 14:45 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, May 19, 2014 at 11:05:03AM +0200, Sebastian Hesselbarth wrote:
> [Added arm at kernel.org so they can spot the patch more easily]
Thanks, but we're really only worried about multi_v7_defconfig.
multi_v5_defconfig hasn't proven to be conflict-prone yet.
thx,
Jason.
> On 05/15/2014 04:23 PM, 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
> >
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 04/11] cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency
2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn
` (5 preceding siblings ...)
2014-05-15 14:23 ` [PATCH v3 4/4] ARM: multi_v5: Enable LaCie 2Big and 5Big Network v2 Andrew Lunn
@ 2014-05-15 14:23 ` Andrew Lunn
2014-05-15 14:23 ` [PATCH RFC 05/11] ata: " Andrew Lunn
` (7 subsequent siblings)
14 siblings, 0 replies; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:23 UTC (permalink / raw)
To: linux-arm-kernel
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Rafael J. Wysocki <rjw@rjwysocki.net>
Cc: linux-pm at vger.kernel.org
---
drivers/cpuidle/Kconfig.arm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/cpuidle/Kconfig.arm b/drivers/cpuidle/Kconfig.arm
index 5bb94780d377..a56c17928534 100644
--- a/drivers/cpuidle/Kconfig.arm
+++ b/drivers/cpuidle/Kconfig.arm
@@ -27,7 +27,7 @@ config ARM_HIGHBANK_CPUIDLE
config ARM_KIRKWOOD_CPUIDLE
bool "CPU Idle Driver for Marvell Kirkwood SoCs"
- depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+ depends on MACH_KIRKWOOD
help
This adds the CPU Idle driver for Marvell Kirkwood SoCs.
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH RFC 05/11] ata: Remove ARCH_KIRKWOOD dependency
2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn
` (6 preceding siblings ...)
2014-05-15 14:23 ` [PATCH RFC 04/11] cpuidle: kirkwood: Remove ARCH_KIRKWOOD dependency Andrew Lunn
@ 2014-05-15 14:23 ` Andrew Lunn
2014-05-15 17:46 ` Tejun Heo
2014-05-15 14:23 ` [PATCH RFC 06/11] thermal: " Andrew Lunn
` (6 subsequent siblings)
14 siblings, 1 reply; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:23 UTC (permalink / raw)
To: linux-arm-kernel
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Tejun Heo <tj@kernel.org>
Cc: linux-ide at vger.kernel.org
---
drivers/ata/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 20e03a7eb8b4..771f226cf8f4 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -281,7 +281,7 @@ config SATA_HIGHBANK
config SATA_MV
tristate "Marvell SATA support"
- depends on PCI || ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
+ depends on PCI || ARCH_DOVE || ARCH_MV78XX0 || \
ARCH_MVEBU || ARCH_ORION5X || COMPILE_TEST
select GENERIC_PHY
help
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH RFC 06/11] thermal: Remove ARCH_KIRKWOOD dependency
2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn
` (7 preceding siblings ...)
2014-05-15 14:23 ` [PATCH RFC 05/11] ata: " Andrew Lunn
@ 2014-05-15 14:23 ` Andrew Lunn
2014-05-15 14:23 ` [PATCH RFC 07/11] leds: " Andrew Lunn
` (5 subsequent siblings)
14 siblings, 0 replies; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:23 UTC (permalink / raw)
To: linux-arm-kernel
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: linux-pm at vger.kernel.org
---
drivers/thermal/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/Kconfig b/drivers/thermal/Kconfig
index 2d51912a6e40..14d15043b6f2 100644
--- a/drivers/thermal/Kconfig
+++ b/drivers/thermal/Kconfig
@@ -143,7 +143,7 @@ config RCAR_THERMAL
config KIRKWOOD_THERMAL
tristate "Temperature sensor on Marvell Kirkwood SoCs"
- depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+ depends on MACH_KIRKWOOD
depends on OF
help
Support for the Kirkwood thermal sensor driver into the Linux thermal
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH RFC 07/11] leds: Remove ARCH_KIRKWOOD dependency
2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn
` (8 preceding siblings ...)
2014-05-15 14:23 ` [PATCH RFC 06/11] thermal: " Andrew Lunn
@ 2014-05-15 14:23 ` Andrew Lunn
2014-06-25 23:08 ` Bryan Wu
2014-05-15 14:23 ` [PATCH RFC 08/11] PCI: " Andrew Lunn
` (4 subsequent siblings)
14 siblings, 1 reply; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:23 UTC (permalink / raw)
To: linux-arm-kernel
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Bryan Wu <cooloney@gmail.com>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: linux-leds at vger.kernel.org
---
drivers/leds/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 6de9dfbf61c1..01ebebfcc891 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -421,7 +421,7 @@ config LEDS_MC13783
config LEDS_NS2
tristate "LED support for Network Space v2 GPIO LEDs"
depends on LEDS_CLASS
- depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+ depends on MACH_KIRKWOOD
default y
help
This option enable support for the dual-GPIO LED found on the
@@ -431,7 +431,7 @@ config LEDS_NS2
config LEDS_NETXBIG
tristate "LED support for Big Network series LEDs"
depends on LEDS_CLASS
- depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
+ depends on MACH_KIRKWOOD
default y
help
This option enable support for LEDs found on the LaCie 2Big
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH RFC 07/11] leds: Remove ARCH_KIRKWOOD dependency
2014-05-15 14:23 ` [PATCH RFC 07/11] leds: " Andrew Lunn
@ 2014-06-25 23:08 ` Bryan Wu
0 siblings, 0 replies; 40+ messages in thread
From: Bryan Wu @ 2014-06-25 23:08 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 15, 2014 at 7:23 AM, Andrew Lunn <andrew@lunn.ch> wrote:
> mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
>
Sorry for the delay.
Please take my Ack for merging this change.
Acked-by: Bryan Wu <cooloney@gmail.com>
> Signed-off-by: Andrew Lunn <andrew@lunn.ch>
> Cc: Bryan Wu <cooloney@gmail.com>
> Cc: Richard Purdie <rpurdie@rpsys.net>
> Cc: linux-leds at vger.kernel.org
> ---
> drivers/leds/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
> index 6de9dfbf61c1..01ebebfcc891 100644
> --- a/drivers/leds/Kconfig
> +++ b/drivers/leds/Kconfig
> @@ -421,7 +421,7 @@ config LEDS_MC13783
> config LEDS_NS2
> tristate "LED support for Network Space v2 GPIO LEDs"
> depends on LEDS_CLASS
> - depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
> + depends on MACH_KIRKWOOD
> default y
> help
> This option enable support for the dual-GPIO LED found on the
> @@ -431,7 +431,7 @@ config LEDS_NS2
> config LEDS_NETXBIG
> tristate "LED support for Big Network series LEDs"
> depends on LEDS_CLASS
> - depends on ARCH_KIRKWOOD || MACH_KIRKWOOD
> + depends on MACH_KIRKWOOD
> default y
> help
> This option enable support for LEDs found on the LaCie 2Big
> --
> 2.0.0.rc2
>
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 08/11] PCI: Remove ARCH_KIRKWOOD dependency
2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn
` (9 preceding siblings ...)
2014-05-15 14:23 ` [PATCH RFC 07/11] leds: " Andrew Lunn
@ 2014-05-15 14:23 ` Andrew Lunn
2014-05-15 14:23 ` [PATCH RFC 09/11] phy: " Andrew Lunn
` (3 subsequent siblings)
14 siblings, 0 replies; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:23 UTC (permalink / raw)
To: linux-arm-kernel
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci at vger.kernel.org
---
drivers/pci/host/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index a6f67ec8882f..1b32836d435a 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -3,7 +3,7 @@ menu "PCI host controller drivers"
config PCI_MVEBU
bool "Marvell EBU PCIe controller"
- depends on ARCH_MVEBU || ARCH_DOVE || ARCH_KIRKWOOD
+ depends on ARCH_MVEBU || ARCH_DOVE
depends on OF
config PCIE_DW
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH RFC 09/11] phy: Remove ARCH_KIRKWOOD dependency
2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn
` (10 preceding siblings ...)
2014-05-15 14:23 ` [PATCH RFC 08/11] PCI: " Andrew Lunn
@ 2014-05-15 14:23 ` Andrew Lunn
2014-05-15 14:23 ` [PATCH RFC 10/11] rtc: " Andrew Lunn
` (2 subsequent siblings)
14 siblings, 0 replies; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:23 UTC (permalink / raw)
To: linux-arm-kernel
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
---
drivers/phy/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/phy/Kconfig b/drivers/phy/Kconfig
index 3bb05f17b9b4..996b11bab7c6 100644
--- a/drivers/phy/Kconfig
+++ b/drivers/phy/Kconfig
@@ -27,7 +27,7 @@ config PHY_EXYNOS_MIPI_VIDEO
config PHY_MVEBU_SATA
def_bool y
- depends on ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || MACH_KIRKWOOD
+ depends on ARCH_DOVE || MACH_DOVE || MACH_KIRKWOOD
depends on OF
select GENERIC_PHY
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH RFC 10/11] rtc: Remove ARCH_KIRKWOOD dependency
2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn
` (11 preceding siblings ...)
2014-05-15 14:23 ` [PATCH RFC 09/11] phy: " Andrew Lunn
@ 2014-05-15 14:23 ` Andrew Lunn
2014-05-15 14:23 ` [PATCH RFC 11/11] watchdog: " Andrew Lunn
2014-05-15 14:36 ` [PATCH RFC 00/11] Remove mach-kirkwood Arnd Bergmann
14 siblings, 0 replies; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:23 UTC (permalink / raw)
To: linux-arm-kernel
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: rtc-linux at googlegroups.com
---
drivers/rtc/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/rtc/Kconfig b/drivers/rtc/Kconfig
index 2e565f8e5165..93be35954cee 100644
--- a/drivers/rtc/Kconfig
+++ b/drivers/rtc/Kconfig
@@ -1161,7 +1161,7 @@ config RTC_DRV_TX4939
config RTC_DRV_MV
tristate "Marvell SoC RTC"
- depends on ARCH_KIRKWOOD || ARCH_DOVE || ARCH_MVEBU
+ depends on ARCH_DOVE || ARCH_MVEBU
help
If you say yes here you will get support for the in-chip RTC
that can be found in some of Marvell's SoC devices, such as
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH RFC 11/11] watchdog: Remove ARCH_KIRKWOOD dependency
2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn
` (12 preceding siblings ...)
2014-05-15 14:23 ` [PATCH RFC 10/11] rtc: " Andrew Lunn
@ 2014-05-15 14:23 ` Andrew Lunn
2014-05-15 14:36 ` [PATCH RFC 00/11] Remove mach-kirkwood Arnd Bergmann
14 siblings, 0 replies; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:23 UTC (permalink / raw)
To: linux-arm-kernel
mach-kirkwood has been removed, now that kirkwood lives in mach-mvebu.
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Cc: Wim Van Sebroeck <wim@iguana.be>
Cc: linux-watchdog at vger.kernel.org
---
drivers/watchdog/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig
index 74ec8fc5cc03..e68f2b9a3b31 100644
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -301,7 +301,7 @@ config DAVINCI_WATCHDOG
config ORION_WATCHDOG
tristate "Orion watchdog"
- depends on ARCH_ORION5X || ARCH_KIRKWOOD || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
+ depends on ARCH_ORION5X || ARCH_DOVE || MACH_DOVE || ARCH_MVEBU
select WATCHDOG_CORE
help
Say Y here if to include support for the watchdog timer
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 40+ messages in thread* [PATCH RFC 00/11] Remove mach-kirkwood
2014-05-15 14:23 [PATCH RFC 00/11] Remove mach-kirkwood Andrew Lunn
` (13 preceding siblings ...)
2014-05-15 14:23 ` [PATCH RFC 11/11] watchdog: " Andrew Lunn
@ 2014-05-15 14:36 ` Arnd Bergmann
2014-05-15 14:46 ` Andrew Lunn
` (2 more replies)
14 siblings, 3 replies; 40+ messages in thread
From: Arnd Bergmann @ 2014-05-15 14:36 UTC (permalink / raw)
To: linux-arm-kernel
On Thursday 15 May 2014 16:23:41 Andrew Lunn wrote:
> 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.
Very nice!
We had a couple of conflicts in 3.15 between kirkwood and dove both
getting moved to multiplatform. Any idea how this can be done better
this time?
There are three other series that may or may not make it into 3.16
and that will have conflicts with this one:
- remove mv78xx0
- remove mach-dove
- convert orion5x to multiplatform
If we can decide which ones we should have, we can make sure the
patches correctly build on top of one another or get merged into
one per subsystem.
Arnd
^ permalink raw reply [flat|nested] 40+ messages in thread* [PATCH RFC 00/11] Remove mach-kirkwood
2014-05-15 14:36 ` [PATCH RFC 00/11] Remove mach-kirkwood Arnd Bergmann
@ 2014-05-15 14:46 ` Andrew Lunn
2014-05-15 23:08 ` Jason Cooper
2014-05-16 7:59 ` Thomas Petazzoni
2 siblings, 0 replies; 40+ messages in thread
From: Andrew Lunn @ 2014-05-15 14:46 UTC (permalink / raw)
To: linux-arm-kernel
> We had a couple of conflicts in 3.15 between kirkwood and dove both
> getting moved to multiplatform. Any idea how this can be done better
> this time?
>
> There are three other series that may or may not make it into 3.16
> and that will have conflicts with this one:
>
> - remove mv78xx0
> - remove mach-dove
> - convert orion5x to multiplatform
>
> If we can decide which ones we should have, we can make sure the
> patches correctly build on top of one another or get merged into
> one per subsystem.
I've not tried, but i doubt there will be conflicts between orion5x
and kirkwood.
For the three removal patchsets, i guess the simple option is to
pre-merge them and send it all as one big patchset.
Andrew
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 00/11] Remove mach-kirkwood
2014-05-15 14:36 ` [PATCH RFC 00/11] Remove mach-kirkwood Arnd Bergmann
2014-05-15 14:46 ` Andrew Lunn
@ 2014-05-15 23:08 ` Jason Cooper
2014-05-16 8:18 ` Gregory CLEMENT
2014-05-16 7:59 ` Thomas Petazzoni
2 siblings, 1 reply; 40+ messages in thread
From: Jason Cooper @ 2014-05-15 23:08 UTC (permalink / raw)
To: linux-arm-kernel
On Thu, May 15, 2014 at 04:36:35PM +0200, Arnd Bergmann wrote:
> On Thursday 15 May 2014 16:23:41 Andrew Lunn wrote:
> > 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.
>
> Very nice!
>
> We had a couple of conflicts in 3.15 between kirkwood and dove both
> getting moved to multiplatform. Any idea how this can be done better
> this time?
Yes, once the changes have matured in -next, I'll merge them into a
single branch to pull instead of separately like I did before.
> There are three other series that may or may not make it into 3.16
> and that will have conflicts with this one:
>
> - remove mv78xx0
> - remove mach-dove
? I haven't seen anything on these...
> - convert orion5x to multiplatform
I have this one already.
> If we can decide which ones we should have, we can make sure the
> patches correctly build on top of one another or get merged into
> one per subsystem.
hmmm, yes, if only we had some people assigned to do that. ;-)
thx,
Jason.
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 00/11] Remove mach-kirkwood
2014-05-15 23:08 ` Jason Cooper
@ 2014-05-16 8:18 ` Gregory CLEMENT
2014-05-16 13:01 ` Jason Cooper
2014-05-16 19:09 ` Jason Cooper
0 siblings, 2 replies; 40+ messages in thread
From: Gregory CLEMENT @ 2014-05-16 8:18 UTC (permalink / raw)
To: linux-arm-kernel
On 16/05/2014 01:08, Jason Cooper wrote:
> On Thu, May 15, 2014 at 04:36:35PM +0200, Arnd Bergmann wrote:
>> On Thursday 15 May 2014 16:23:41 Andrew Lunn wrote:
>>> 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.
>>
>> Very nice!
>>
>> We had a couple of conflicts in 3.15 between kirkwood and dove both
>> getting moved to multiplatform. Any idea how this can be done better
>> this time?
>
> Yes, once the changes have matured in -next, I'll merge them into a
> single branch to pull instead of separately like I did before.
>
>> There are three other series that may or may not make it into 3.16
>> and that will have conflicts with this one:
>>
>> - remove mv78xx0
Actually I planned to try to convert this to multiplatform
through mvebu. Based on the patches I already sent a few monthes ago
and on the work done by Thomas for orion5x. I have a slot to do
it on Tuesday, but I don't expect it was merged in 3.16.
>> - remove mach-dove
>
> ? I haven't seen anything on these...
>
>> - convert orion5x to multiplatform
>
> I have this one already.
>
>> If we can decide which ones we should have, we can make sure the
>> patches correctly build on top of one another or get merged into
>> one per subsystem.
>
> hmmm, yes, if only we had some people assigned to do that. ;-)
>
> thx,
>
> Jason.
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 00/11] Remove mach-kirkwood
2014-05-16 8:18 ` Gregory CLEMENT
@ 2014-05-16 13:01 ` Jason Cooper
2014-05-16 19:09 ` Jason Cooper
1 sibling, 0 replies; 40+ messages in thread
From: Jason Cooper @ 2014-05-16 13:01 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, May 16, 2014 at 10:18:50AM +0200, Gregory CLEMENT wrote:
> On 16/05/2014 01:08, Jason Cooper wrote:
> > On Thu, May 15, 2014 at 04:36:35PM +0200, Arnd Bergmann wrote:
> >> On Thursday 15 May 2014 16:23:41 Andrew Lunn wrote:
> >>> 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.
> >>
> >> Very nice!
> >>
> >> We had a couple of conflicts in 3.15 between kirkwood and dove both
> >> getting moved to multiplatform. Any idea how this can be done better
> >> this time?
> >
> > Yes, once the changes have matured in -next, I'll merge them into a
> > single branch to pull instead of separately like I did before.
> >
> >> There are three other series that may or may not make it into 3.16
> >> and that will have conflicts with this one:
> >>
> >> - remove mv78xx0
>
> Actually I planned to try to convert this to multiplatform
> through mvebu.
afaict, the only current users of this were the Debian build farm. But
they've moved on to better hardware thanks to a generous donation :)
Are we aware of any other users?
thx,
Jason.
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 00/11] Remove mach-kirkwood
2014-05-16 8:18 ` Gregory CLEMENT
2014-05-16 13:01 ` Jason Cooper
@ 2014-05-16 19:09 ` Jason Cooper
1 sibling, 0 replies; 40+ messages in thread
From: Jason Cooper @ 2014-05-16 19:09 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, May 16, 2014 at 10:18:50AM +0200, Gregory CLEMENT wrote:
> On 16/05/2014 01:08, Jason Cooper wrote:
> > On Thu, May 15, 2014 at 04:36:35PM +0200, Arnd Bergmann wrote:
> >> On Thursday 15 May 2014 16:23:41 Andrew Lunn wrote:
> >>> 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.
> >>
> >> Very nice!
> >>
> >> We had a couple of conflicts in 3.15 between kirkwood and dove both
> >> getting moved to multiplatform. Any idea how this can be done better
> >> this time?
> >
> > Yes, once the changes have matured in -next, I'll merge them into a
> > single branch to pull instead of separately like I did before.
> >
> >> There are three other series that may or may not make it into 3.16
> >> and that will have conflicts with this one:
> >>
> >> - remove mv78xx0
>
> Actually I planned to try to convert this to multiplatform
> through mvebu.
afaict, the only current users of this were the Debian build farm. But
they've moved on to better hardware thanks to a generous donation :)
Are we aware of any other users?
thx,
Jason.
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 00/11] Remove mach-kirkwood
2014-05-15 14:36 ` [PATCH RFC 00/11] Remove mach-kirkwood Arnd Bergmann
2014-05-15 14:46 ` Andrew Lunn
2014-05-15 23:08 ` Jason Cooper
@ 2014-05-16 7:59 ` Thomas Petazzoni
2014-05-19 9:12 ` Arnd Bergmann
2 siblings, 1 reply; 40+ messages in thread
From: Thomas Petazzoni @ 2014-05-16 7:59 UTC (permalink / raw)
To: linux-arm-kernel
Dear Arnd Bergmann,
On Thu, 15 May 2014 16:36:35 +0200, Arnd Bergmann wrote:
> There are three other series that may or may not make it into 3.16
> and that will have conflicts with this one:
>
> - remove mv78xx0
> - remove mach-dove
> - convert orion5x to multiplatform
The work on Orion5x is still on-going. I'd like to progressively
continue the DT migration of Orion5x, moving to multiplatform, and then
once it's done, move into mach-mvebu. I'd appreciate to not rush things
more than necessary.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 00/11] Remove mach-kirkwood
2014-05-16 7:59 ` Thomas Petazzoni
@ 2014-05-19 9:12 ` Arnd Bergmann
2014-05-19 9:30 ` Sebastian Hesselbarth
2014-05-19 9:34 ` Thomas Petazzoni
0 siblings, 2 replies; 40+ messages in thread
From: Arnd Bergmann @ 2014-05-19 9:12 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 16 May 2014 09:59:53 Thomas Petazzoni wrote:
> Dear Arnd Bergmann,
>
> On Thu, 15 May 2014 16:36:35 +0200, Arnd Bergmann wrote:
>
> > There are three other series that may or may not make it into 3.16
> > and that will have conflicts with this one:
> >
> > - remove mv78xx0
> > - remove mach-dove
> > - convert orion5x to multiplatform
>
> The work on Orion5x is still on-going. I'd like to progressively
> continue the DT migration of Orion5x, moving to multiplatform, and then
> once it's done, move into mach-mvebu. I'd appreciate to not rush things
> more than necessary.
Yes, that's fine. I'd just want to be sure we all understand what is
going into 3.16 and what isn't.
So your plan for now is to do DT support in 3.16 and multiplatform after
3.16? That won't have any conflicts with the kirkwood patches then, as
far as I can tell.
What about dove? Are we ready to remove it or do we give it another
cycle?
Arnd
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 00/11] Remove mach-kirkwood
2014-05-19 9:12 ` Arnd Bergmann
@ 2014-05-19 9:30 ` Sebastian Hesselbarth
2014-05-19 9:34 ` Thomas Petazzoni
1 sibling, 0 replies; 40+ messages in thread
From: Sebastian Hesselbarth @ 2014-05-19 9:30 UTC (permalink / raw)
To: linux-arm-kernel
On 05/19/2014 11:12 AM, Arnd Bergmann wrote:
> On Friday 16 May 2014 09:59:53 Thomas Petazzoni wrote:
>> Dear Arnd Bergmann,
>>
>> On Thu, 15 May 2014 16:36:35 +0200, Arnd Bergmann wrote:
>>
>>> There are three other series that may or may not make it into 3.16
>>> and that will have conflicts with this one:
>>>
>>> - remove mv78xx0
>>> - remove mach-dove
>>> - convert orion5x to multiplatform
>>
>> The work on Orion5x is still on-going. I'd like to progressively
>> continue the DT migration of Orion5x, moving to multiplatform, and then
>> once it's done, move into mach-mvebu. I'd appreciate to not rush things
>> more than necessary.
>
> Yes, that's fine. I'd just want to be sure we all understand what is
> going into 3.16 and what isn't.
>
> So your plan for now is to do DT support in 3.16 and multiplatform after
> 3.16? That won't have any conflicts with the kirkwood patches then, as
> far as I can tell.
>
> What about dove? Are we ready to remove it or do we give it another
> cycle?
I still have some pending fixes for mmc subsystem. The
ARCH_DOVE/MACH_DOVE patch didn't make it in, and I wasn't able
to get any mmc feedback on 2-3 pings. I'll do a proper RESEND
and see what happens.
So removing legacy dove will definitely _not_ happen for v3.16.
Sebastian
^ permalink raw reply [flat|nested] 40+ messages in thread
* [PATCH RFC 00/11] Remove mach-kirkwood
2014-05-19 9:12 ` Arnd Bergmann
2014-05-19 9:30 ` Sebastian Hesselbarth
@ 2014-05-19 9:34 ` Thomas Petazzoni
1 sibling, 0 replies; 40+ messages in thread
From: Thomas Petazzoni @ 2014-05-19 9:34 UTC (permalink / raw)
To: linux-arm-kernel
Dear Arnd Bergmann,
On Mon, 19 May 2014 11:12:05 +0200, Arnd Bergmann wrote:
> > The work on Orion5x is still on-going. I'd like to progressively
> > continue the DT migration of Orion5x, moving to multiplatform, and then
> > once it's done, move into mach-mvebu. I'd appreciate to not rush things
> > more than necessary.
>
> Yes, that's fine. I'd just want to be sure we all understand what is
> going into 3.16 and what isn't.
>
> So your plan for now is to do DT support in 3.16 and multiplatform after
> 3.16? That won't have any conflicts with the kirkwood patches then, as
> far as I can tell.
Yes, my plan is to have what's already in the 'mvebu' branches for
3.16, i.e the migration to DT of a small number of Orion5x machines, as
well as the corresponding dependencies (pinctrl support, clock support,
etc.).
Then, for 3.17, I'll try to:
* convert more Orion5x boards to DT
* support PCIe through DT
* move to multiplatform
Of course, that's a purely tentative schedule, Orion5x is really a
spare time effort today.
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 40+ messages in thread