summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorKishon Vijay Abraham I <kishon@ti.com>2015-07-29 16:39:42 +0530
committerTony Lindgren <tony@atomide.com>2015-09-14 12:13:38 -0700
commit423fe5f3c35ff0f374d5452eb2db93a28bf6b9e2 (patch)
tree3a2f7c17ec9ad9314f3993060941e9d27624101a /arch
parent87ee15ec26000c6edc10e63c415bee1239e042c8 (diff)
downloadlinux-stable-423fe5f3c35ff0f374d5452eb2db93a28bf6b9e2.tar.gz
linux-stable-423fe5f3c35ff0f374d5452eb2db93a28bf6b9e2.tar.bz2
linux-stable-423fe5f3c35ff0f374d5452eb2db93a28bf6b9e2.zip
ARM: dts: am57xx-beagle-x15: Fix regulator populated in MMC1 dt node
For beagle x15, both the vdd and io lines are connected to the same regulator (ldo1_reg). However vmmc_aux is populated to vdd_3v3. Remove it. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> Acked-by: Nishanth Menon <nm@ti.com> [tony@atomide.com: updated to apply] Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/am57xx-beagle-x15.dts1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15.dts b/arch/arm/boot/dts/am57xx-beagle-x15.dts
index 3a05b94f59ed..1ad3474efcf7 100644
--- a/arch/arm/boot/dts/am57xx-beagle-x15.dts
+++ b/arch/arm/boot/dts/am57xx-beagle-x15.dts
@@ -579,7 +579,6 @@
pinctrl-0 = <&mmc1_pins_default>;
vmmc-supply = <&ldo1_reg>;
- vmmc_aux-supply = <&vdd_3v3>;
bus-width = <4>;
cd-gpios = <&gpio6 27 0>; /* gpio 219 */
};