From: Tony Lindgren <tony@atomide.com>
Date: Thu, 10 Aug 2017 16:11:13 +0000 (-0700)
Subject: Merge branch 'omap-for-v4.14/mmc-regulator' into omap-for-v4.14/dt
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4a568f7f4facd5a9e4b2e5f3c07465c17cdfec23;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'omap-for-v4.14/mmc-regulator' into omap-for-v4.14/dt
---

4a568f7f4facd5a9e4b2e5f3c07465c17cdfec23
diff --cc arch/arm/boot/dts/am572x-idk.dts
index 940fcbe5380b,21383924a947..cb2632225220
--- a/arch/arm/boot/dts/am572x-idk.dts
+++ b/arch/arm/boot/dts/am572x-idk.dts
@@@ -79,9 -79,9 +79,9 @@@
  &mmc1 {
  	status = "okay";
  	vmmc-supply = <&v3_3d>;
- 	vmmc_aux-supply = <&ldo1_reg>;
+ 	vqmmc-supply = <&ldo1_reg>;
  	bus-width = <4>;
 -	cd-gpios = <&gpio6 27 0>; /* gpio 219 */
 +	cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */
  };
  
  &sn65hvs882 {