summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts
diff options
context:
space:
mode:
authorAnilKumar Ch <anilkumar@ti.com>2012-07-09 11:54:09 +0530
committerTony Lindgren <tony@atomide.com>2012-07-09 02:13:47 -0700
commitb7e0683d74c36b6477e2c53baf045202b9d2054a (patch)
tree71857773cde777df6f4fab4334dfb489ab0000e3 /arch/arm/boot/dts
parente6ca04eaabbd5599b79c54db9a4dd8e9bfb424ec (diff)
downloadop-kernel-dev-b7e0683d74c36b6477e2c53baf045202b9d2054a.zip
op-kernel-dev-b7e0683d74c36b6477e2c53baf045202b9d2054a.tar.gz
arm/dts: remove MMC/SD and SPI related entries from am33xx.dtsi
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> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/boot/dts')
-rw-r--r--arch/arm/boot/dts/am33xx.dtsi31
1 files changed, 0 insertions, 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@48030000 {
- compatible = "ti,omap2-mcspi";
- #address-cells = <1>;
- #size-cells = <0>;
- ti,hwmods = "spi0";
- ti,spi-num-cs = <4>;
- };
-
- mcspi2: spi@481Aa000 {
- compatible = "ti,omap2-mcspi";
- #address-cells = <1>;
- #size-cells = <0>;
- ti,hwmods = "spi1";
- ti,spi-num-cs = <2>;
- };
-
- mmc1: mmc@48060000 {
- compatible = "ti,omap3-hsmmc";
- ti,hwmods = "mmc1";
- };
-
- mmc2: mmc@481D8000 {
- compatible = "ti,omap3-hsmmc";
- ti,hwmods = "mmc2";
- };
-
- mmc3: mmc@47810000 {
- compatible = "ti,omap3-hsmmc";
- ti,hwmods = "mmc3";
- };
};
};
OpenPOWER on IntegriCloud