diff options
author | Tony Lindgren <tony@atomide.com> | 2017-08-10 09:11:13 -0700 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2017-08-10 09:11:13 -0700 |
commit | 4a568f7f4facd5a9e4b2e5f3c07465c17cdfec23 (patch) | |
tree | 2d973d9764aa7f69fe48324fb3b5dd4289c38b81 /arch/arm/boot/dts/am572x-idk.dts | |
parent | ARM: dts: am572x-idk: Fix GPIO polarity for MMC1 card detect (diff) | |
parent | ARM: dts: omap*: Replace deprecated "vmmc_aux" with "vqmmc" (diff) | |
download | linux-dev-4a568f7f4facd5a9e4b2e5f3c07465c17cdfec23.tar.xz linux-dev-4a568f7f4facd5a9e4b2e5f3c07465c17cdfec23.zip |
Merge branch 'omap-for-v4.14/mmc-regulator' into omap-for-v4.14/dt
Diffstat (limited to 'arch/arm/boot/dts/am572x-idk.dts')
-rw-r--r-- | arch/arm/boot/dts/am572x-idk.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am572x-idk.dts b/arch/arm/boot/dts/am572x-idk.dts index 940fcbe5380b..cb2632225220 100644 --- a/arch/arm/boot/dts/am572x-idk.dts +++ b/arch/arm/boot/dts/am572x-idk.dts @@ -79,7 +79,7 @@ &mmc1 { status = "okay"; vmmc-supply = <&v3_3d>; - vmmc_aux-supply = <&ldo1_reg>; + vqmmc-supply = <&ldo1_reg>; bus-width = <4>; cd-gpios = <&gpio6 27 GPIO_ACTIVE_LOW>; /* gpio 219 */ }; |