summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/dm8148-evm.dts
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-06-03 12:28:10 -0700
committerOlof Johansson <olof@lixom.net>2016-06-03 12:28:10 -0700
commit80084632e2abf9968f0a582ef044889c686e2954 (patch)
tree426d3e7205cb02988b8c6eec80a0e048f02b5b77 /arch/arm/boot/dts/dm8148-evm.dts
parentc2b8d9200fc61298cd74b258a453b526ffa74d17 (diff)
parenta1f6ad14176d466c00e6a687f9c78ec6c7ad6bf8 (diff)
downloadlinux-80084632e2abf9968f0a582ef044889c686e2954.tar.gz
linux-80084632e2abf9968f0a582ef044889c686e2954.tar.bz2
linux-80084632e2abf9968f0a582ef044889c686e2954.zip
Merge tag 'omap-for-v4.7-dts-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
DTS fixes for omaps for v4.7 merge window for issues noted with patches in Linux next: - Fix omap5 and am57xx-idk input voltages to fix micro-sd probing at least for some omap5-uevm configurations - Fix unhandled fault for igepv5 audio - Fix UART wakeirqs for omap5 by removing WAKUP_EN flags, those are managed by the wakeirq and can currently confuse the wakeirqs as there is no handler necessarily registered - Fix LDO7 source for igepv5 Also included are few minor changes not strictly fixes are good to have merged: - Fix HP T410 boot time warnings for eMMC and disable the unused MMC interfaces while at it - Add dra7 gpmc dma channel - Add igep00x0 SD card detect and write protect GPIOs * tag 'omap-for-v4.7-dts-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: igep0020: Add SD card write-protect pin. ARM: dts: igep00x0: Add SD card-detect. ARM: dts: am57xx-idk-common: Fix input supply names ARM: dts: dra7: Add gpmc dma channel ARM: dts: disable mmc by default and enable when needed for dm814x ARM: dts: Add non-removable to hsmmc on hp-t410 ARM: dts: Fix ldo7 source for HDMI on igepv5 ARM: dts: Fix uart wakeirq on omap5 by removing WAKEUP_EN for omaps ARM: dts: Fix igepv5 audiopwon-gpio ARM: dts: omap5-board-common: Describe the voltage supply mapping accurately Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/dm8148-evm.dts')
-rw-r--r--arch/arm/boot/dts/dm8148-evm.dts8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dm8148-evm.dts b/arch/arm/boot/dts/dm8148-evm.dts
index cbc17b0794b1..4128fa91823c 100644
--- a/arch/arm/boot/dts/dm8148-evm.dts
+++ b/arch/arm/boot/dts/dm8148-evm.dts
@@ -93,6 +93,10 @@
};
};
+&mmc1 {
+ status = "disabled";
+};
+
&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&sd1_pins>;
@@ -101,6 +105,10 @@
cd-gpios = <&gpio2 6 GPIO_ACTIVE_LOW>;
};
+&mmc3 {
+ status = "disabled";
+};
+
&pincntl {
sd1_pins: pinmux_sd1_pins {
pinctrl-single,pins = <