diff options
| author | Jagan Teki <jagannadh.teki@gmail.com> | 2017-10-16 17:46:21 +0530 |
|---|---|---|
| committer | Heiko Stuebner <heiko@sntech.de> | 2017-10-17 21:09:51 +0200 |
| commit | 32739f1536a1b9ff0773d1357df1698c2ab52f1e (patch) | |
| tree | 67d388d6abb27363aff6c10d446bbbf9b3000332 /arch/arm/boot/dts/rk3288-vyasa.dts | |
| parent | 598ed15fd7ef12f38364a026b30e3b1d067a445e (diff) | |
| download | lwn-32739f1536a1b9ff0773d1357df1698c2ab52f1e.tar.gz lwn-32739f1536a1b9ff0773d1357df1698c2ab52f1e.zip | |
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: Jagan Teki <jagan@amarulasolutions.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch/arm/boot/dts/rk3288-vyasa.dts')
| -rw-r--r-- | arch/arm/boot/dts/rk3288-vyasa.dts | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/arch/arm/boot/dts/rk3288-vyasa.dts b/arch/arm/boot/dts/rk3288-vyasa.dts index 7a0f94569ba9..2231dd078a13 100644 --- a/arch/arm/boot/dts/rk3288-vyasa.dts +++ b/arch/arm/boot/dts/rk3288-vyasa.dts @@ -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>; - }; - }; }; |