aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2013-10-01 06:33:43 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-10-07 21:02:21 -0400
commit3d888121512f3d70b46ff67d02b41baf474a3123 (patch)
treec4a38c430361bda543628dbcadd1fa0b3b1fa13e /arch/arm/boot/dts
parent91f6c56152c7d8ab874dbbf8146a6727d4dff426 (diff)
ARM: shmobile: Remove KZM9D reference DTS
Now when the legacy DTS file emev2-kzm9d.dts can be used with board-kzm9d.c and board-kzm9d-reference.c proceed with removing emev-kzm9d-reference.dts. Signed-off-by: Magnus Damm <damm@opensource.se> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/Makefile3
-rw-r--r--arch/arm/boot/dts/emev2-kzm9d-reference.dts57
2 files changed, 1 insertions, 59 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 295824d8410b..a72a9f4555b2 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -195,7 +195,6 @@ dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
195 ste-ccu9540.dtb 195 ste-ccu9540.dtb
196dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb 196dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
197dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ 197dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
198 emev2-kzm9d-reference.dtb \
199 r7s72100-genmai.dtb \ 198 r7s72100-genmai.dtb \
200 r8a7740-armadillo800eva.dtb \ 199 r8a7740-armadillo800eva.dtb \
201 r8a7778-bockw.dtb \ 200 r8a7778-bockw.dtb \
@@ -211,7 +210,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
211 r8a73a4-ape6evm.dtb \ 210 r8a73a4-ape6evm.dtb \
212 r8a73a4-ape6evm-reference.dtb \ 211 r8a73a4-ape6evm-reference.dtb \
213 sh7372-mackerel.dtb 212 sh7372-mackerel.dtb
214dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb 213dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb
215dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \ 214dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
216 socfpga_vt.dtb 215 socfpga_vt.dtb
217dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \ 216dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
diff --git a/arch/arm/boot/dts/emev2-kzm9d-reference.dts b/arch/arm/boot/dts/emev2-kzm9d-reference.dts
deleted file mode 100644
index cceefda268b6..000000000000
--- a/arch/arm/boot/dts/emev2-kzm9d-reference.dts
+++ /dev/null
@@ -1,57 +0,0 @@
1/*
2 * Device Tree Source for the KZM9D board
3 *
4 * Copyright (C) 2013 Renesas Solutions Corp.
5 *
6 * This file is licensed under the terms of the GNU General Public License
7 * version 2. This program is licensed "as is" without any warranty of any
8 * kind, whether express or implied.
9 */
10/dts-v1/;
11
12/include/ "emev2.dtsi"
13
14/ {
15 model = "EMEV2 KZM9D Board";
16 compatible = "renesas,kzm9d-reference", "renesas,emev2";
17
18 memory {
19 device_type = "memory";
20 reg = <0x40000000 0x8000000>;
21 };
22
23 chosen {
24 bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";
25 };
26
27 reg_1p8v: regulator@0 {
28 compatible = "regulator-fixed";
29 regulator-name = "fixed-1.8V";
30 regulator-min-microvolt = <1800000>;
31 regulator-max-microvolt = <1800000>;
32 regulator-always-on;
33 regulator-boot-on;
34 };
35
36 reg_3p3v: regulator@1 {
37 compatible = "regulator-fixed";
38 regulator-name = "fixed-3.3V";
39 regulator-min-microvolt = <3300000>;
40 regulator-max-microvolt = <3300000>;
41 regulator-always-on;
42 regulator-boot-on;
43 };
44
45 lan9220@20000000 {
46 compatible = "smsc,lan9220", "smsc,lan9115";
47 reg = <0x20000000 0x10000>;
48 phy-mode = "mii";
49 interrupt-parent = <&gpio0>;
50 interrupts = <1 1>; /* active high */
51 reg-io-width = <4>;
52 smsc,irq-active-high;
53 smsc,irq-push-pull;
54 vddvario-supply = <&reg_1p8v>;
55 vdd33a-supply = <&reg_3p3v>;
56 };
57};