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

Commit 32739f15 authored by Jagan Teki's avatar Jagan Teki Committed by Heiko Stuebner
Browse files

ARM: dts: rockchip: Use vmmc-supply from PMIC on rk3288-vyasa



rk808, SWITCH_REG1 has configured for sdmmc regulator as vcc_sd,
so use the same by renaming vcc33_sd to vcc_sd(as per schematic)
and drop explicit regulator definition from root.

Signed-off-by: default avatarJagan Teki <jagan@amarulasolutions.com>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 598ed15f
Loading
Loading
Loading
Loading
+2 −20
Original line number Diff line number Diff line
@@ -56,18 +56,6 @@
		device_type = "memory";
	};

	vcc_sd: sdmmc-regulator {
		compatible = "regulator-fixed";
		gpio = <&gpio7 RK_PB3 GPIO_ACTIVE_LOW>;
		pinctrl-names = "default";
		pinctrl-0 = <&sdmmc_pwr>;
		regulator-name = "vcc_sd";
		regulator-min-microvolt = <3300000>;
		regulator-max-microvolt = <3300000>;
		startup-delay-us = <100000>;
		vin-supply = <&vcc_io>;
	};

	vcc_sys: vsys-regulator {
		compatible = "regulator-fixed";
		regulator-name = "vcc_sys";
@@ -260,8 +248,8 @@
				};
			};

			vcc33_sd: SWITCH_REG1 {
				regulator-name = "vcc33_sd";
			vcc_sd: SWITCH_REG1 {
				regulator-name = "vcc_sd";
				regulator-min-microvolt = <3300000>;
				regulator-max-microvolt = <3300000>;
				regulator-always-on;
@@ -338,10 +326,4 @@
			rockchip,pins = <RK_GPIO0 4 RK_FUNC_GPIO &pcfg_pull_up>;
		};
	};

	sdmmc {
		sdmmc_pwr: sdmmc-pwr {
			rockchip,pins = <7 11 RK_FUNC_GPIO &pcfg_pull_none>;
		};
	};
};