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

diff --cc arch/arm/boot/dts/am572x-idk.dts
index 940fcbe5380ba2aa06ec68c0e03a0142dc0cb787,21383924a94779c3830039120dfe0863d9f28f5e..cb263222522088ee4bed681a462750cfd5483042
--- 1/arch/arm/boot/dts/am572x-idk.dts
--- 2/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 {