Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75ae47f9 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'boards-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/boards 



From Jason Cooper, mvebu board changes for v3.11.

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>

* tag 'boards-3.11-2' of git://git.infradead.org/users/jcooper/linux:
  ARM: Kirkwood: Convert LSXL to restart-poweroff driver.
  ARM: Kirkwood: Make use of the QNAP Power off driver.
  ARM: Kirkwood: add DT support for Sheevaplug and Sheevaplug eSATA
parents e4aa937e 391a16c7

arch/arm/boot/dts/kirkwood-lsxl.dtsi

+4 −0
Original line number Original line Diff line number Diff line
@@ -172,6 +172,10 @@ 
		alarm-gpios = <&gpio1 8 0>;

		alarm-gpios = <&gpio1 8 0>;

	};

	};





	restart_poweroff {

		compatible = "restart-poweroff";

	};



	regulators {

	regulators {

		compatible = "simple-bus";

		compatible = "simple-bus";

		#address-cells = <1>;

		#address-cells = <1>;

arch/arm/boot/dts/kirkwood-ts219.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,11 @@ 
			clock-frequency = <200000000>;

			clock-frequency = <200000000>;

			status = "okay";

			status = "okay";

		};

		};

		poweroff@12100 {

			compatible = "qnap,power-off";

			reg = <0x12000 0x100>;

			clocks = <&gate_clk 7>;

		};

		spi@10600 {

		spi@10600 {

			status = "okay";

			status = "okay";

arch/arm/mach-kirkwood/Kconfig

+9 −0
Original line number Original line Diff line number Diff line
@@ -227,6 +227,7 @@ config MACH_KM_KIRKWOOD_DT 
config MACH_LSXL_DT

config MACH_LSXL_DT

	bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)"

	bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	select ARCH_KIRKWOOD_DT

	select POWER_RESET_RESTART

	help

	help

	  Say 'Y' here if you want your kernel to support the

	  Say 'Y' here if you want your kernel to support the

	  Buffalo Linkstation LS-XHL & LS-CHLv2 devices, using

	  Buffalo Linkstation LS-XHL & LS-CHLv2 devices, using
@@ -296,6 +297,13 @@ config MACH_READYNAS_DT 
	  Say 'Y' here if you want your kernel to support the

	  Say 'Y' here if you want your kernel to support the

	  NETGEAR ReadyNAS Duo v2 using Fattened Device Tree.

	  NETGEAR ReadyNAS Duo v2 using Fattened Device Tree.





config MACH_SHEEVAPLUG_DT

	bool "Marvell (eSATA) SheevaPlug (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

	  Say 'Y' here if you want your kernel to support the

	  Marvell (eSATA) SheevaPlug (Flattened Device Tree).



config MACH_TOPKICK_DT

config MACH_TOPKICK_DT

	bool "USI Topkick (Flattened Device Tree)"

	bool "USI Topkick (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	select ARCH_KIRKWOOD_DT
@@ -308,6 +316,7 @@ config MACH_TS219_DT 
	select ARCH_KIRKWOOD_DT

	select ARCH_KIRKWOOD_DT

	select ARM_APPENDED_DTB

	select ARM_APPENDED_DTB

	select ARM_ATAG_DTB_COMPAT

	select ARM_ATAG_DTB_COMPAT

	select POWER_RESET_QNAP

	help

	help

	  Say 'Y' here if you want your kernel to support the QNAP

	  Say 'Y' here if you want your kernel to support the QNAP

	  TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and

	  TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and

arch/arm/mach-kirkwood/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -40,5 +40,6 @@ obj-$(CONFIG_MACH_NETSPACE_V2_DT) += board-ns2.o 
obj-$(CONFIG_MACH_NSA310_DT)		+= board-nsa310.o

obj-$(CONFIG_MACH_NSA310_DT)		+= board-nsa310.o

obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT)	+= board-openblocks_a6.o

obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT)	+= board-openblocks_a6.o

obj-$(CONFIG_MACH_READYNAS_DT)		+= board-readynas.o

obj-$(CONFIG_MACH_READYNAS_DT)		+= board-readynas.o

obj-$(CONFIG_MACH_SHEEVAPLUG_DT)	+= board-sheevaplug.o

obj-$(CONFIG_MACH_TOPKICK_DT)		+= board-usi_topkick.o

obj-$(CONFIG_MACH_TOPKICK_DT)		+= board-usi_topkick.o

obj-$(CONFIG_MACH_TS219_DT)		+= board-ts219.o tsx1x-common.o
 
obj-$(CONFIG_MACH_TS219_DT)		+= board-ts219.o tsx1x-common.o

arch/arm/mach-kirkwood/board-dt.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -112,6 +112,9 @@ static void __init kirkwood_dt_init(void) 
	if (of_machine_is_compatible("globalscale,guruplug"))

	if (of_machine_is_compatible("globalscale,guruplug"))

		guruplug_dt_init();

		guruplug_dt_init();





	if (of_machine_is_compatible("globalscale,sheevaplug"))

		sheevaplug_dt_init();



	if (of_machine_is_compatible("dlink,dns-kirkwood"))

	if (of_machine_is_compatible("dlink,dns-kirkwood"))

		dnskw_init();

		dnskw_init();
@@ -165,6 +168,7 @@ static void __init kirkwood_dt_init(void) 
static const char * const kirkwood_dt_board_compat[] = {

static const char * const kirkwood_dt_board_compat[] = {

	"globalscale,dreamplug",

	"globalscale,dreamplug",

	"globalscale,guruplug",

	"globalscale,guruplug",

	"globalscale,sheevaplug",

	"dlink,dns-320",

	"dlink,dns-320",

	"dlink,dns-325",

	"dlink,dns-325",

	"iom,iconnect",

	"iom,iconnect",