Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 303ce716 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

ARM: dts: exynos: Define vqmmc for eMMC card on Odroid X/X2/U3 



The eMMC card vmmc-supply contained incorrectly two regulators: LDO20
and buck8. The second one is ignored. Additionally the buck8 is a vqmmc
supply only on X and X2. On U3 the buck8 is providing power to the LAN
(SMSC95xx) so instead the LDO22 should be used.

Fix this by defining proper vmmc and vqmmc supplies for respective
boards.

Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Reviewed-by: default avatarJavier Martinez Canillas <javier@osg.samsung.com>
parent 0f0677f6

arch/arm/boot/dts/exynos4412-odroid-common.dtsi

+14 −3
Original line number Diff line number Diff line
@@ -395,6 +395,15 @@ 
				regulator-boot-on;

			};



			ldo22_reg: LDO22 {

				/*

				 * Only U3 uses it, so let it define the

				 * constraints

				 */

				regulator-name = "LDO22";

				regulator-boot-on;

			};



			ldo25_reg: LDO25 {

				regulator-name = "VDDQ_LCD_1.8V";

				regulator-min-microvolt = <1800000>;
@@ -458,9 +467,11 @@ 
			};



			buck8_reg: BUCK8 {

				/*

				 * Constraints set by specific board: X,

				 * X2 and U3.

				 */

				regulator-name = "BUCK8_2.8V";

				regulator-min-microvolt = <2800000>;

				regulator-max-microvolt = <2800000>;

			};

		};

	};
@@ -504,7 +515,7 @@ 
&mshc_0 {

	pinctrl-0 = <&sd4_clk &sd4_cmd &sd4_bus4 &sd4_bus8>;

	pinctrl-names = "default";

	vmmc-supply = <&ldo20_reg &buck8_reg>;

	vmmc-supply = <&ldo20_reg>;

	mmc-pwrseq = <&emmc_pwrseq>;

	status = "okay";

arch/arm/boot/dts/exynos4412-odroidu3.dts

+18 −0
Original line number Diff line number Diff line
@@ -69,6 +69,24 @@ 
	};

};



/* Supply for LAN9730/SMSC95xx */

&buck8_reg {

	regulator-name = "BUCK8_P3V3";

	regulator-min-microvolt = <3300000>;

	regulator-max-microvolt = <3300000>;

};



/* VDDQ for MSHC (eMMC card) */

&ldo22_reg {

	regulator-name = "LDO22_VDDQ_MMC4_2.8V";

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

};



&mshc_0 {

	vqmmc-supply = <&ldo22_reg>;

};



&pwm {

	pinctrl-0 = <&pwm0_out>;

	pinctrl-names = "default";

arch/arm/boot/dts/exynos4412-odroidx.dts

+11 −0
Original line number Diff line number Diff line
@@ -63,12 +63,23 @@ 
	};

};



/* VDDQ for MSHC (eMMC card) */

&buck8_reg {

	regulator-name = "BUCK8_VDDQ_MMC4_2.8V";

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

};



&ehci {

	port@1 {

		status = "okay";

	};

};



&mshc_0 {

	vqmmc-supply = <&buck8_reg>;

};



&pinctrl_1 {

	gpio_home_key: home_key {

		samsung,pins = "gpx2-2";

arch/arm/boot/dts/exynos4412-odroidx2.dts

+11 −0
Original line number Diff line number Diff line
@@ -22,6 +22,17 @@ 
	};

};



/* VDDQ for MSHC (eMMC card) */

&buck8_reg {

	regulator-name = "BUCK8_VDDQ_MMC4_2.8V";

	regulator-min-microvolt = <2800000>;

	regulator-max-microvolt = <2800000>;

};



&mshc_0 {

	vqmmc-supply = <&buck8_reg>;

};



&sound {

	simple-audio-card,name = "Odroid-X2";

	simple-audio-card,widgets =