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

Commit 07f645df authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Jason Cooper
Browse files

arm: orion5x: convert 'LaCie Ethernet Disk mini v2' to Device Tree 



This commit converts the 'LaCie Ethernet Disk mini v2' board to the
Device Tree. All devices that have existing Device Tree bindings are
converted over to the Device Tree, the other devices remain
instantiated in the old way, until the respective drivers get the
needed Device Tree bindings.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested by: Maxime Hadjinlian <mhadjinlian@lacie.com>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
parent 1bffb4a8

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	omap5-evm.dtb \

	am335x-evm.dtb \

	am335x-bone.dtb

dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

dtb-$(CONFIG_ARCH_U8500) += snowball.dtb

dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \

arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts

0 → 100644
+55 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2012 Thomas Petazzoni <thomas.petazzoni@free-electrons.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/ "orion5x.dtsi"



/ {

	model = "LaCie Ethernet Disk mini V2";

	compatible = "lacie,ethernet-disk-mini-v2", "marvell-orion5x-88f5182", "marvell,orion5x";



	memory {

		reg = <0x00000000 0x4000000>; /* 64 MB */

	};



	chosen {

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

	};



	ocp@f1000000 {

		serial@12000 {

			clock-frequency = <166666667>;

			status = "okay";

		};



		sata@80000 {

			status = "okay";

			nr-ports = <2>;

		};

	};



	gpio_keys {

		compatible = "gpio-keys";

		#address-cells = <1>;

		#size-cells = <0>;

		button@1 {

			label = "Power-on Switch";

			linux,code = <116>; /* KEY_POWER */

			gpios = <&gpio0 18 0>;

		};

	};



	gpio_leds {

		compatible = "gpio-leds";



		led@1 {

			label = "power:blue";

			gpios = <&gpio0 16 1>;

		};

	};

};

arch/arm/mach-orion5x/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -103,12 +103,13 @@ config MACH_MV2120 
	  Say 'Y' here if you want your kernel to support the

	  HP Media Vault mv2120 or mv5100.



config MACH_EDMINI_V2

	bool "LaCie Ethernet Disk mini V2"

config MACH_EDMINI_V2_DT

	bool "LaCie Ethernet Disk mini V2 (Flattened Device Tree)"

	select I2C_BOARDINFO

	select ARCH_ORION5X_DT

	help

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

	  LaCie Ethernet Disk mini V2.

	  LaCie Ethernet Disk mini V2 (Flattened Device Tree).



config MACH_D2NET

	bool "LaCie d2 Network"

arch/arm/mach-orion5x/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,6 @@ obj-$(CONFIG_MACH_TS409) += ts409-setup.o tsx09-common.o 
obj-$(CONFIG_MACH_WRT350N_V2)	+= wrt350n-v2-setup.o

obj-$(CONFIG_MACH_TS78XX)	+= ts78xx-setup.o

obj-$(CONFIG_MACH_MV2120)	+= mv2120-setup.o

obj-$(CONFIG_MACH_EDMINI_V2)	+= edmini_v2-setup.o

obj-$(CONFIG_MACH_D2NET)	+= d2net-setup.o

obj-$(CONFIG_MACH_BIGDISK)	+= d2net-setup.o

obj-$(CONFIG_MACH_NET2BIG)	+= net2big-setup.o
@@ -24,3 +23,4 @@ obj-$(CONFIG_MACH_RD88F6183AP_GE) += rd88f6183ap-ge-setup.o 
obj-$(CONFIG_MACH_LINKSTATION_LSCHL)	+= ls-chl-setup.o



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

obj-$(CONFIG_MACH_EDMINI_V2_DT)	+= edmini_v2-setup.o

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

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ static void __init orion5x_dt_init(void) 
		disable_hlt();

	}



	if (of_machine_is_compatible("lacie,ethernet-disk-mini-v2"))

		edmini_v2_init();



	of_platform_populate(NULL, of_default_bus_match_table,

			     orion5x_auxdata_lookup, NULL);

}