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

Commit 0798af54 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Tony Lindgren
Browse files

ARM: dts: dra72-evm-common: Correct vmmc-supply for mmc2 



On dra72/dra71 evms, mmc2 vdd/ios are connected to a common 1.8V supply
not 3.3V. Also the regulator that supplies 1.8V is different on dra71-evm
so move the supply property from common dtsi to evm specific dts files.

Fixes: a4240d3a ("ARM: dts: Add support for dra72-evm rev C (SR2.0)")
Signed-off-by: default avatarRavikumar Kattekola <rk@ti.com>
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 45f1d5e3

arch/arm/boot/dts/dra71-evm.dts

+14 −0
Original line number Diff line number Diff line
@@ -32,6 +32,16 @@ 
			  3000000 0x1>;

	};



	evm_1v8_sw: fixedregulator-evm_1v8 {

		compatible = "regulator-fixed";

		regulator-name = "evm_1v8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&lp8732_buck0_reg>;

		regulator-always-on;

		regulator-boot-on;

	};



	poweroff: gpio-poweroff {

		compatible = "gpio-poweroff";

		gpios = <&gpio7 30 GPIO_ACTIVE_HIGH>;
@@ -165,6 +175,10 @@ 
	vmmc_aux-supply = <&vpo_sd_1v8_3v3>;

};



&mmc2 {

	vmmc-supply = <&evm_1v8_sw>;

};



&mac {

	mode-gpios = <&pcf_gpio_21 4 GPIO_ACTIVE_LOW>,

		     <&pcf_hdmi 9 GPIO_ACTIVE_LOW>,	/* P11 */

arch/arm/boot/dts/dra72-evm-common.dtsi

+0 −2
Original line number Diff line number Diff line
@@ -419,8 +419,6 @@ 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&mmc2_pins_default>;



	vmmc-supply = <&evm_3v3_sw>;

	bus-width = <8>;

	ti,non-removable;

	max-frequency = <192000000>;

arch/arm/boot/dts/dra72-evm-revc.dts

+14 −0
Original line number Diff line number Diff line
@@ -15,6 +15,16 @@ 
		device_type = "memory";

		reg = <0x0 0x80000000 0x0 0x80000000>; /* 2GB */

	};



	evm_1v8_sw: fixedregulator-evm_1v8 {

		compatible = "regulator-fixed";

		regulator-name = "evm_1v8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&smps4_reg>;

		regulator-always-on;

		regulator-boot-on;

	};

};



&i2c1 {
@@ -82,3 +92,7 @@ 
		interrupts = <16 IRQ_TYPE_EDGE_FALLING>;

	};

};



&mmc2 {

	vmmc-supply = <&evm_1v8_sw>;

};

arch/arm/boot/dts/dra72-evm.dts

+14 −0
Original line number Diff line number Diff line
@@ -13,6 +13,16 @@ 
		device_type = "memory";

		reg = <0x0 0x80000000 0x0 0x40000000>; /* 1024 MB */

	};



	evm_1v8_sw: fixedregulator-evm_1v8 {

		compatible = "regulator-fixed";

		regulator-name = "evm_1v8";

		regulator-min-microvolt = <1800000>;

		regulator-max-microvolt = <1800000>;

		vin-supply = <&smps4_reg>;

		regulator-always-on;

		regulator-boot-on;

	};

};



&i2c1 {
@@ -43,3 +53,7 @@ 
	phy_id = <&davinci_mdio>, <3>;

	phy-mode = "rgmii";

};



&mmc2 {

	vmmc-supply = <&evm_1v8_sw>;

};