aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2016-05-04 08:43:58 -0400
committerKrzysztof Kozlowski <k.kozlowski@samsung.com>2016-05-30 03:45:57 -0400
commit0f0677f6eb1797a007dadbad54538fde7102965c (patch)
tree6fd63c1801e4221c62731835e53b35a796673e30
parent94aed538e032d82287023beb9c59ee80f03a1493 (diff)
ARM: dts: exynos: Define vqmmc for SD card and allow disabling regulators on Odroid X/X2/U3
The SD-card vmmc-supply contained incorrectly two regulators. The second one is ignored. Fix this by defining proper vmmc and vqmmc supplies. Additionally these regulators do not have to be always on, so allow disabling them to reduce energy consumption. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com>
-rw-r--r--arch/arm/boot/dts/exynos4412-odroid-common.dtsi5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
index ec7619a384a2..fe483ba4b7c7 100644
--- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
+++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
@@ -297,7 +297,6 @@
297 regulator-name = "VDDQ_MMC2_2.8V"; 297 regulator-name = "VDDQ_MMC2_2.8V";
298 regulator-min-microvolt = <2800000>; 298 regulator-min-microvolt = <2800000>;
299 regulator-max-microvolt = <2800000>; 299 regulator-max-microvolt = <2800000>;
300 regulator-always-on;
301 regulator-boot-on; 300 regulator-boot-on;
302 }; 301 };
303 302
@@ -393,7 +392,6 @@
393 regulator-name = "LDO21_3.3V"; 392 regulator-name = "LDO21_3.3V";
394 regulator-min-microvolt = <3300000>; 393 regulator-min-microvolt = <3300000>;
395 regulator-max-microvolt = <3300000>; 394 regulator-max-microvolt = <3300000>;
396 regulator-always-on;
397 regulator-boot-on; 395 regulator-boot-on;
398 }; 396 };
399 397
@@ -530,7 +528,8 @@
530 bus-width = <4>; 528 bus-width = <4>;
531 pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; 529 pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>;
532 pinctrl-names = "default"; 530 pinctrl-names = "default";
533 vmmc-supply = <&ldo4_reg &ldo21_reg>; 531 vmmc-supply = <&ldo21_reg>;
532 vqmmc-supply = <&ldo4_reg>;
534 cd-gpios = <&gpk2 2 GPIO_ACTIVE_HIGH>; 533 cd-gpios = <&gpk2 2 GPIO_ACTIVE_HIGH>;
535 cd-inverted; 534 cd-inverted;
536 status = "okay"; 535 status = "okay";