diff options
author | Tony Lindgren <tony@atomide.com> | 2017-08-10 19:11:13 +0300 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2017-08-10 19:11:13 +0300 |
commit | 4a568f7f4facd5a9e4b2e5f3c07465c17cdfec23 (patch) | |
tree | 2d973d9764aa7f69fe48324fb3b5dd4289c38b81 /arch/arm/boot/dts/omap3-cm-t3517.dts | |
parent | b7ced444c2f4ab992eb90a0d33536b18c3830e81 (diff) | |
parent | 45ea75eb92a4ee90a116e51e4360900eec6be450 (diff) | |
download | linux-4a568f7f4facd5a9e4b2e5f3c07465c17cdfec23.tar.xz |
Merge branch 'omap-for-v4.14/mmc-regulator' into omap-for-v4.14/dt
Diffstat (limited to 'arch/arm/boot/dts/omap3-cm-t3517.dts')
-rw-r--r-- | arch/arm/boot/dts/omap3-cm-t3517.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-cm-t3517.dts b/arch/arm/boot/dts/omap3-cm-t3517.dts index 53ae04f9104d..3d293b345e99 100644 --- a/arch/arm/boot/dts/omap3-cm-t3517.dts +++ b/arch/arm/boot/dts/omap3-cm-t3517.dts @@ -129,7 +129,7 @@ pinctrl-names = "default"; pinctrl-0 = <&mmc2_pins>; vmmc-supply = <&wl12xx_vmmc2>; - vmmc_aux-supply = <&wl12xx_vaux2>; + vqmmc-supply = <&wl12xx_vaux2>; non-removable; bus-width = <4>; cap-power-off-card; |