linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: lee.jones@linaro.org (Lee Jones)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 13/13] ARM: ux500: Remove u9540.dts as it's been replaced
Date: Fri, 19 Jul 2013 15:13:49 +0100	[thread overview]
Message-ID: <1374243229-8585-14-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1374243229-8585-1-git-send-email-lee.jones@linaro.org>

This must have been a merge error. There was a patch which renamed the
u9540.dts to ccu9540.dts, however the u9540.dts was reincarnate with
the same patches which created it in the first place. Let's kill it
once and for all.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 arch/arm/boot/dts/u9540.dts | 72 ---------------------------------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 arch/arm/boot/dts/u9540.dts

diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts
deleted file mode 100644
index 95892ec..0000000
--- a/arch/arm/boot/dts/u9540.dts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2012 ST-Ericsson AB
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/dts-v1/;
-/include/ "dbx5x0.dtsi"
-
-/ {
-	model = "ST-Ericsson U9540 platform with Device Tree";
-	compatible = "st-ericsson,u9540";
-
-	memory {
-		reg = <0x00000000 0x20000000>;
-	};
-
-	soc-u9500 {
-		uart at 80120000 {
-			status = "okay";
-		};
-
-		uart at 80121000 {
-			status = "okay";
-		};
-
-		uart at 80007000 {
-			status = "okay";
-		};
-
-		// External Micro SD slot
-		sdi0_per1 at 80126000 {
-			arm,primecell-periphid = <0x10480180>;
-			max-frequency = <100000000>;
-			bus-width = <4>;
-			mmc-cap-sd-highspeed;
-			mmc-cap-mmc-highspeed;
-			vmmc-supply = <&ab8500_ldo_aux3_reg>;
-
-			cd-gpios  = <&gpio7 6 0x4>; // 230
-			cd-inverted;
-
-			status = "okay";
-		};
-
-
-		// WLAN SDIO channel
-		sdi1_per2 at 80118000 {
-			arm,primecell-periphid = <0x10480180>;
-			max-frequency = <50000000>;
-			bus-width = <4>;
-
-			status = "okay";
-		};
-
-		// On-board eMMC
-		sdi4_per2 at 80114000 {
-			arm,primecell-periphid = <0x10480180>;
-		        max-frequency = <100000000>;
-			bus-width = <8>;
-			mmc-cap-mmc-highspeed;
-			vmmc-supply = <&ab8500_ldo_aux2_reg>;
-
-			status = "okay";
-		};
-	};
-};
-- 
1.8.1.2

  parent reply	other threads:[~2013-07-19 14:13 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-19 14:13 [PATCH 00/13] ARM: ux500: Misc Device Tree patches Lee Jones
2013-07-19 14:13 ` [PATCH 01/13] ARM: ux500: Remove Toshiba TC35892 I/O Expander's DT entry from Snowball's DTS Lee Jones
2013-08-07 13:28   ` Linus Walleij
2013-07-19 14:13 ` [PATCH 02/13] ARM: ux500: Remove Snowball DTS entry for National Semiconductor LP5521 LED chip Lee Jones
2013-08-07 13:29   ` Linus Walleij
2013-07-19 14:13 ` [PATCH 03/13] ARM: ux500: Remove Snowball DTS entry for TPS61052 chip Lee Jones
2013-08-07 13:30   ` Linus Walleij
2013-07-19 14:13 ` [PATCH 04/13] ARM: ux500: Remove Snowball DTS entry for ROHM BH1780GLI ambient light sensor Lee Jones
2013-08-07 13:31   ` Linus Walleij
2013-07-19 14:13 ` [PATCH 05/13] ARM: ux500: Apply a ste-* prefix onto snowball.dts Lee Jones
2013-08-21  0:31   ` Olof Johansson
2013-08-21  8:21     ` Lee Jones
2013-08-21 22:37     ` Linus Walleij
2013-08-21 23:22       ` Olof Johansson
2013-08-22  7:18         ` Lee Jones
2013-07-19 14:13 ` [PATCH 06/13] ARM: ux500: Apply a ste-* prefix onto ccu8540.dts Lee Jones
2013-07-19 14:13 ` [PATCH 07/13] ARM: ux500: Apply a ste-* prefix onto ccu9540.dts Lee Jones
2013-07-19 14:13 ` [PATCH 08/13] ARM: ux500: Apply a ste-* prefix onto href.dtsi Lee Jones
2013-07-19 14:13 ` [PATCH 09/13] ARM: ux500: Apply a ste-* prefix onto hrefprev60.dts Signed-off-by: Lee Jones <lee.jones@linaro.org> Lee Jones
2013-07-19 14:13 ` [PATCH 10/13] ARM: ux500: Apply a ste-* prefix onto hrefv60plus.dts Lee Jones
2013-07-19 14:13 ` [PATCH 11/13] ARM: ux500: Apply a ste-* prefix onto stuib.dtsi Lee Jones
2013-07-19 14:13 ` [PATCH 12/13] ARM: ux500: Apply a ste-* prefix onto dbx5x0.dtsi Lee Jones
2013-07-19 14:13 ` Lee Jones [this message]
2013-08-07 13:48   ` [PATCH 13/13] ARM: ux500: Remove u9540.dts as it's been replaced Linus Walleij

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1374243229-8585-14-git-send-email-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).