summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/ste-nomadik-s8815.dts
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-s8815.dts
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-s8815.dts')
-rw-r--r--arch/arm/boot/dts/ste-nomadik-s8815.dts4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index cc777109f98f..b28fbf3408e3 100644
--- a/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@ -22,5 +22,9 @@
interrupts = <19 0x1>;
interrupt-parent = <&gpio3>;
};
+ /* This will bias the MMC/SD card detect line */
+ mmcsd-gpio {
+ gpios = <&gpio3 16 0x1>;
+ };
};
};