summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2013-01-06 01:47:29 +0100
committerLinus Walleij <linus.walleij@linaro.org>2013-01-28 23:24:40 +0100
commit4fd243c6c083ea159ae1a9f9a24198c350034439 (patch)
tree8cf4746a6d0edc06aae4f2ae4b1e4d82a4b401c0 /arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
parentARM: nomadik: convert SMSC91x ethernet to device tree (diff)
downloadlinux-4fd243c6c083ea159ae1a9f9a24198c350034439.tar.xz
linux-4fd243c6c083ea159ae1a9f9a24198c350034439.zip
ARM: nomadik: migrate MMC/SD card support to device tree
This moves over the MMC/SD card support to the device tree probe path. The special GPIO to bias the card detect line is kept, but the pin property is moved to the device tree as part of the MMC/SD card node. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot/dts/ste-nomadik-stn8815.dtsi')
-rw-r--r--arch/arm/boot/dts/ste-nomadik-stn8815.dtsi13
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index f129425883a4..0164edc78eed 100644
--- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@ -190,5 +190,18 @@
interrupt-parent = <&vica>;
interrupts = <10>;
};
+
+ mmcsd: sdi@101f6000 {
+ compatible = "arm,pl18x", "arm,primecell";
+ reg = <0x101f6000 0x1000>;
+ interrupt-parent = <&vica>;
+ interrupts = <22>;
+ max-frequency = <48000000>;
+ bus-width = <4>;
+ mmc-cap-mmc-highspeed;
+ mmc-cap-sd-highspeed;
+ cd-gpios = <&gpio3 15 0x1>;
+ cd-inverted;
+ };
};
};