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

Commit 9007d100 authored by Jamie Lentin's avatar Jamie Lentin Committed by Jason Cooper
Browse files

ARM: kirkwood: Basic support for DNS-320 and DNS-325 



Add support for the DNS-320 and DNS-325. Describe as much as currently possible
in the devicetree files, create a board-dnskw.c for everything else.

Changes since last submission (V3) [Addressing comments by]:-

* One MACH_DLINK_KIRKWOOD_DT for all dtb files [Grant Likely, Jason Cooper]
* Drop brain-dead select "select CONFIG_MTD_OF_PARTS" [Grant Likely]
* Don't add NAND support then throw it away immediately after [Grant Likely]
* Describe purpose of MPP 41, 42 & 49

Changes since last submission (V2):-

* Use IEEE-compliant "okay", rather than "ok" [Scott Wood]

Signed-off-by: default avatarJamie Lentin <jm@lentin.co.uk>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 36be5051

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

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



/include/ "kirkwood.dtsi"



/ {

	model = "D-Link DNS-320 NAS (Rev A1)";

	compatible = "dlink,dns-320-a1", "dlink,dns-320", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x8000000>;

	};



	chosen {

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

	};



	ocp@f1000000 {

		serial@12000 {

			clock-frequency = <166666667>;

			status = "okay";

		};



		serial@12100 {

			clock-frequency = <166666667>;

			status = "okay";

		};

	};

};

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

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



/include/ "kirkwood.dtsi"



/ {

	model = "D-Link DNS-325 NAS (Rev A1)";

	compatible = "dlink,dns-325-a1", "dlink,dns-325", "dlink,dns-kirkwood", "mrvl,kirkwood-88f6281", "mrvl,kirkwood";



	memory {

		device_type = "memory";

		reg = <0x00000000 0x10000000>;

	};



	chosen {

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

	};



	ocp@f1000000 {

		serial@12000 {

			clock-frequency = <200000000>;

			status = "okay";

		};

	};

};

arch/arm/mach-kirkwood/Kconfig

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

	  Marvell DreamPlug (Flattened Device Tree).



config MACH_DLINK_KIRKWOOD_DT

	bool "D-Link Kirkwood-based NAS (Flattened Device Tree)"

	select ARCH_KIRKWOOD_DT

	help

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

	  Kirkwood-based D-Link NASes such as DNS-320 & DNS-325,

	  using Flattened Device Tree.



config MACH_TS219

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

	help

arch/arm/mach-kirkwood/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,3 +22,4 @@ obj-$(CONFIG_MACH_T5325) += t5325-setup.o 
obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o

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

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

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

arch/arm/mach-kirkwood/Makefile.boot

+2 −0
Original line number Diff line number Diff line
@@ -3,3 +3,5 @@ params_phys-y := 0x00000100 
initrd_phys-y	:= 0x00800000



dtb-$(CONFIG_MACH_DREAMPLUG_DT) += kirkwood-dreamplug.dtb

dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns320.dtb

dtb-$(CONFIG_MACH_DLINK_KIRKWOOD_DT) += kirkwood-dns325.dtb