* [PATCH] arm/dts: remove MMC/SD and SPI related entries from am33xx.dtsi
@ 2012-07-09 6:24 AnilKumar Ch
2012-07-09 9:14 ` Tony Lindgren
0 siblings, 1 reply; 2+ messages in thread
From: AnilKumar Ch @ 2012-07-09 6:24 UTC (permalink / raw)
To: linux-arm-kernel
The MMC/SD and SPI entries in this file are not tested yet. They
inadvertently came into the patch because of some work in progress
stuff I had in my repo.
These entries should not have been sent out in the first place and
I am sorry for the trouble and will be extra careful in future.
Since the offending commit is not sent upstream yet, I hope this can
be merged into the commit 5fc0b42a98556bd9f01cecc6a64fcbd15ec363f0
(arm/dts: Add initial DT support for AM33XX SoC family) on the devel-dt
branch of linux-omap tree.
Signed-off-by: AnilKumar Ch <anilkumar@ti.com>
---
arch/arm/boot/dts/am33xx.dtsi | 31 -------------------------------
1 file changed, 31 deletions(-)
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index f46e353..59509c4 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -154,36 +154,5 @@
#size-cells = <0>;
ti,hwmods = "i2c3";
};
-
- mcspi1: spi at 48030000 {
- compatible = "ti,omap2-mcspi";
- #address-cells = <1>;
- #size-cells = <0>;
- ti,hwmods = "spi0";
- ti,spi-num-cs = <4>;
- };
-
- mcspi2: spi at 481Aa000 {
- compatible = "ti,omap2-mcspi";
- #address-cells = <1>;
- #size-cells = <0>;
- ti,hwmods = "spi1";
- ti,spi-num-cs = <2>;
- };
-
- mmc1: mmc at 48060000 {
- compatible = "ti,omap3-hsmmc";
- ti,hwmods = "mmc1";
- };
-
- mmc2: mmc at 481D8000 {
- compatible = "ti,omap3-hsmmc";
- ti,hwmods = "mmc2";
- };
-
- mmc3: mmc at 47810000 {
- compatible = "ti,omap3-hsmmc";
- ti,hwmods = "mmc3";
- };
};
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* [PATCH] arm/dts: remove MMC/SD and SPI related entries from am33xx.dtsi
2012-07-09 6:24 [PATCH] arm/dts: remove MMC/SD and SPI related entries from am33xx.dtsi AnilKumar Ch
@ 2012-07-09 9:14 ` Tony Lindgren
0 siblings, 0 replies; 2+ messages in thread
From: Tony Lindgren @ 2012-07-09 9:14 UTC (permalink / raw)
To: linux-arm-kernel
* AnilKumar Ch <anilkumar@ti.com> [120708 23:29]:
> The MMC/SD and SPI entries in this file are not tested yet. They
> inadvertently came into the patch because of some work in progress
> stuff I had in my repo.
>
> These entries should not have been sent out in the first place and
> I am sorry for the trouble and will be extra careful in future.
>
> Since the offending commit is not sent upstream yet, I hope this can
> be merged into the commit 5fc0b42a98556bd9f01cecc6a64fcbd15ec363f0
> (arm/dts: Add initial DT support for AM33XX SoC family) on the devel-dt
> branch of linux-omap tree.
Thanks applying into omap devel-dt branch.
Tony
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-07-09 9:14 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-09 6:24 [PATCH] arm/dts: remove MMC/SD and SPI related entries from am33xx.dtsi AnilKumar Ch
2012-07-09 9:14 ` Tony Lindgren
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).