| From cbb34fc9897519c606de5f618075410ece434f4d Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Tue, 1 Oct 2013 19:33:43 +0900 |
| Subject: 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> |
| (cherry picked from commit 3d888121512f3d70b46ff67d02b41baf474a3123) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/boot/dts/Makefile | 3 +- |
| arch/arm/boot/dts/emev2-kzm9d-reference.dts | 57 ----------------------------- |
| 2 files changed, 1 insertion(+), 59 deletions(-) |
| delete mode 100644 arch/arm/boot/dts/emev2-kzm9d-reference.dts |
| |
| diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile |
| index 61f8b5143eee..5df751b250a1 100644 |
| --- a/arch/arm/boot/dts/Makefile |
| +++ b/arch/arm/boot/dts/Makefile |
| @@ -160,7 +160,6 @@ dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \ |
| hrefv60plus.dtb \ |
| ccu9540.dtb |
| dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ |
| - emev2-kzm9d-reference.dtb \ |
| r7s72100-genmai.dtb \ |
| r8a7740-armadillo800eva.dtb \ |
| r8a7778-bockw.dtb \ |
| @@ -176,7 +175,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \ |
| r8a73a4-ape6evm.dtb \ |
| r8a73a4-ape6evm-reference.dtb \ |
| sh7372-mackerel.dtb |
| -dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb |
| +dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d.dtb |
| dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \ |
| socfpga_vt.dtb |
| dtb-$(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 @@ |
| -/* |
| - * Device Tree Source for the KZM9D board |
| - * |
| - * Copyright (C) 2013 Renesas Solutions Corp. |
| - * |
| - * 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/ "emev2.dtsi" |
| - |
| -/ { |
| - model = "EMEV2 KZM9D Board"; |
| - compatible = "renesas,kzm9d-reference", "renesas,emev2"; |
| - |
| - memory { |
| - device_type = "memory"; |
| - reg = <0x40000000 0x8000000>; |
| - }; |
| - |
| - chosen { |
| - bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp"; |
| - }; |
| - |
| - reg_1p8v: regulator@0 { |
| - compatible = "regulator-fixed"; |
| - regulator-name = "fixed-1.8V"; |
| - regulator-min-microvolt = <1800000>; |
| - regulator-max-microvolt = <1800000>; |
| - regulator-always-on; |
| - regulator-boot-on; |
| - }; |
| - |
| - reg_3p3v: regulator@1 { |
| - compatible = "regulator-fixed"; |
| - regulator-name = "fixed-3.3V"; |
| - regulator-min-microvolt = <3300000>; |
| - regulator-max-microvolt = <3300000>; |
| - regulator-always-on; |
| - regulator-boot-on; |
| - }; |
| - |
| - lan9220@20000000 { |
| - compatible = "smsc,lan9220", "smsc,lan9115"; |
| - reg = <0x20000000 0x10000>; |
| - phy-mode = "mii"; |
| - interrupt-parent = <&gpio0>; |
| - interrupts = <1 1>; /* active high */ |
| - reg-io-width = <4>; |
| - smsc,irq-active-high; |
| - smsc,irq-push-pull; |
| - vddvario-supply = <®_1p8v>; |
| - vdd33a-supply = <®_3p3v>; |
| - }; |
| -}; |
| -- |
| 1.8.5.rc3 |
| |