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

Commit 9b47a4fb authored by Willy Tarreau's avatar Willy Tarreau Committed by Arnd Bergmann
Browse files

ARM: kirkwood: convert Guruplug Server Plus to use the device tree 



Add a device tree entry for the Guruplug Server Plus board. This port
was based both on the work done on the dreamplug and the dockstar.

It builds, boots and works on my Guruplug Server Plus.

Signed-off-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 49122145

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-dns320.dtb \ 
	kirkwood-dockstar.dtb \

	kirkwood-dreamplug.dtb \

	kirkwood-goflexnet.dtb \

	kirkwood-guruplug-server-plus.dtb \

	kirkwood-ib62x0.dtb \

	kirkwood-iconnect.dtb \

	kirkwood-iomega_ix2_200.dtb \

arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts

0 → 100644
+94 −0
Original line number Diff line number Diff line 
/dts-v1/;



/include/ "kirkwood.dtsi"

/include/ "kirkwood-6281.dtsi"



/ {

	model = "Globalscale Technologies Guruplug Server Plus";

	compatible = "globalscale,guruplug-server-plus", "globalscale,guruplug", "marvell,kirkwood-88f6281", "marvell,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x20000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8 earlyprintk";

	};



	ocp@f1000000 {

		pinctrl: pinctrl@10000 {



			pinctrl-0 = < &pmx_led_health_r &pmx_led_health_g

				      &pmx_led_wmode_r &pmx_led_wmode_g >;

			pinctrl-names = "default";



			pmx_led_health_r: pmx-led-health-r {

				marvell,pins = "mpp46";

				marvell,function = "gpio";

			};

			pmx_led_health_g: pmx-led-health-g {

				marvell,pins = "mpp47";

				marvell,function = "gpio";

			};

			pmx_led_wmode_r: pmx-led-wmode-r {

				marvell,pins = "mpp48";

				marvell,function = "gpio";

			};

			pmx_led_wmode_g: pmx-led-wmode-g {

				marvell,pins = "mpp49";

				marvell,function = "gpio";

			};

		};

		serial@12000 {

			clock-frequency = <200000000>;

			status = "ok";

		};



		nand@3000000 {

			status = "okay";



			partition@0 {

				label = "u-boot";

				reg = <0x00000000 0x00100000>;

				read-only;

			};



			partition@100000 {

				label = "uImage";

				reg = <0x00100000 0x00400000>;

			};



			partition@500000 {

				label = "data";

				reg = <0x00500000 0x1fb00000>;

			};

		};



		sata@80000 {

			status = "okay";

			nr-ports = <1>;

		};

	};



	gpio-leds {

		compatible = "gpio-leds";



		health-r {

			label = "guruplug:red:health";

			gpios = <&gpio1 14 1>;

		};

		health-g {

			label = "guruplug:green:health";

			gpios = <&gpio1 15 1>;

		};

		wmode-r {

			label = "guruplug:red:wmode";

			gpios = <&gpio1 16 1>;

		};

		wmode-g {

			label = "guruplug:green:wmode";

			gpios = <&gpio1 17 1>;

		};

	};

};

arch/arm/mach-kirkwood/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -58,6 +58,13 @@ config ARCH_KIRKWOOD_DT 
	  Say 'Y' here if you want your kernel to support the

	  Marvell Kirkwood using flattened device tree.



config MACH_GURUPLUG_DT

	bool "Marvell GuruPlug Reference Board (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

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

	  Marvell GuruPlug Reference Board (Flattened Device Tree).



config MACH_DREAMPLUG_DT

	bool "Marvell DreamPlug (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

arch/arm/mach-kirkwood/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ obj-$(CONFIG_MACH_T5325) += t5325-setup.o 


obj-$(CONFIG_ARCH_KIRKWOOD_DT)		+= board-dt.o

obj-$(CONFIG_MACH_DREAMPLUG_DT)		+= board-dreamplug.o

obj-$(CONFIG_MACH_GURUPLUG_DT)		+= board-guruplug.o

obj-$(CONFIG_MACH_ICONNECT_DT)		+= board-iconnect.o

obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT)	+= board-dnskw.o

obj-$(CONFIG_MACH_IB62X0_DT)		+= board-ib62x0.o

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

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

		dreamplug_init();



	if (of_machine_is_compatible("globalscale,guruplug"))

		guruplug_dt_init();



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

		dnskw_init();
@@ -149,6 +152,7 @@ static void __init kirkwood_dt_init(void) 


static const char * const kirkwood_dt_board_compat[] = {

	"globalscale,dreamplug",

	"globalscale,guruplug",

	"dlink,dns-320",

	"dlink,dns-325",

	"iom,iconnect",