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

Commit 5136b2aa authored by Josh Coombs's avatar Josh Coombs Committed by Andrew Lunn
Browse files

ARM: Kirkwood: Initial DTS support for Kirkwood GoFlex Net 



This patch supplies the necessary DTS and supporting files to boot up
a Seagate GoFlex Net with 3.5.0-rc3.

Signed-off-by: default avatarJoshua Coombs <josh.coombs@gmail.com>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
parent 9eb61f47

arch/arm/boot/dts/kirkwood-goflexnet.dts

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



/include/ "kirkwood.dtsi"



/ {

	model = "Seagate GoFlex Net";

	compatible = "seagate,goflexnet", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x8000000>;

	};



	chosen {

		bootargs = "console=ttyS0,115200n8 earlyprintk root=/dev/sda1 rootdelay=10";

	};



	ocp@f1000000 {

		serial@12000 {

			clock-frequency = <200000000>;

			status = "ok";

		};



		nand@3000000 {

			status = "okay";



			partition@0 {

				label = "u-boot";

				reg = <0x0000000 0x100000>;

				read-only;

			};



			partition@100000 {

				label = "uImage";

				reg = <0x0100000 0x400000>;

			};



			partition@500000 {

				label = "pogoplug";

				reg = <0x0500000 0x2000000>;

			};



			partition@2500000 {

				label = "root";

				reg = <0x02500000 0xd800000>;

			};

		};

	};

};

arch/arm/mach-kirkwood/Kconfig

+7 −0
Original line number Original line Diff line number Diff line
@@ -94,6 +94,13 @@ config MACH_TS219_DT 
	  or MV6282. If you have the wrong one, the buttons will not

	  or MV6282. If you have the wrong one, the buttons will not

	  work.

	  work.





config MACH_GOFLEXNET_DT

	bool "Seagate GoFlex Net (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

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

	  Seagate GoFlex Net (Flattened Device Tree).



config MACH_TS219

config MACH_TS219

	bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"

	bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"

	help

	help

arch/arm/mach-kirkwood/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -26,3 +26,4 @@ obj-$(CONFIG_MACH_ICONNECT_DT) += board-iconnect.o 
obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT)	+= board-dnskw.o

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

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

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

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

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

obj-$(CONFIG_MACH_GOFLEXNET_DT)		+= board-goflexnet.o

arch/arm/mach-kirkwood/Makefile.boot

+1 −0
Original line number Original line Diff line number Diff line
@@ -8,3 +8,4 @@ dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns325.dtb 
dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb

dtb-$(CONFIG_MACH_ICONNECT_DT) += kirkwood-iconnect.dtb

dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb

dtb-$(CONFIG_MACH_IB62X0_DT) += kirkwood-ib62x0.dtb

dtb-$(CONFIG_MACH_TS219_DT)	+= kirkwood-qnap-ts219.dtb

dtb-$(CONFIG_MACH_TS219_DT)	+= kirkwood-qnap-ts219.dtb

dtb-$(CONFIG_MACH_GOFLEXNET_DT) += kirkwood-goflexnet.dtb

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ struct of_dev_auxdata kirkwood_auxdata_lookup[] __initdata = { 
		       NULL),

		       NULL),

	OF_DEV_AUXDATA("marvell,orion-wdt", 0xf1020300, "orion_wdt", NULL),

	OF_DEV_AUXDATA("marvell,orion-wdt", 0xf1020300, "orion_wdt", NULL),

	OF_DEV_AUXDATA("marvell,orion-sata", 0xf1080000, "sata_mv.0", NULL),

	OF_DEV_AUXDATA("marvell,orion-sata", 0xf1080000, "sata_mv.0", NULL),

	OF_DEV_AUXDATA("mrvl,orion-nand", 0xf4000000, "orion_nand", NULL),

	{},

	{},

};

};
@@ -80,6 +81,9 @@ static void __init kirkwood_dt_init(void) 
	if (of_machine_is_compatible("qnap,ts219"))

	if (of_machine_is_compatible("qnap,ts219"))

		qnap_dt_ts219_init();

		qnap_dt_ts219_init();





	if (of_machine_is_compatible("seagate,goflexnet"))

		goflexnet_init();



	of_platform_populate(NULL, kirkwood_dt_match_table,

	of_platform_populate(NULL, kirkwood_dt_match_table,

			     kirkwood_auxdata_lookup, NULL);

			     kirkwood_auxdata_lookup, NULL);

}

}
@@ -91,6 +95,7 @@ static const char *kirkwood_dt_board_compat[] = { 
	"iom,iconnect",

	"iom,iconnect",

	"raidsonic,ib-nas62x0",

	"raidsonic,ib-nas62x0",

	"qnap,ts219",

	"qnap,ts219",

	"seagate,goflexnet",

	NULL

	NULL

};

};