From 6a0dbbc7e12c97c6442e589f920fad2c17a5eefe Mon Sep 17 00:00:00 2001 From: Shawn Lin Date: Tue, 20 Mar 2018 14:41:11 +0800 Subject: [PATCH] arm64: dts: rockchip: remove always-on and boot-on from vcc{io}_sd of PX30/RK3326 boards vccio_sd and vcc_sd are well better controlled by MMC core and please don't bother taking care of them instead, otherwise reboot w/ a working SD3.0 card will fail to respond the correct OCR in the first place as missing a proper power removal. Change-Id: I9efa11e25198b66e21538bd6603a3bab6638dc5f Signed-off-by: Shawn Lin --- arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts | 4 ---- arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts | 4 ---- arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts | 4 ---- arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts | 4 ---- arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts | 4 ---- 5 files changed, 20 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts index 670bd115168f..cb6f85fb1d99 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-lvds-v10.dts @@ -353,8 +353,6 @@ }; vccio_sd: LDO_REG5 { - regulator-always-on; - regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; @@ -366,8 +364,6 @@ }; vcc_sd: LDO_REG6 { - regulator-always-on; - regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts index c56ed38627fb..220214e2dec9 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dts @@ -445,8 +445,6 @@ }; vccio_sd: LDO_REG5 { - regulator-always-on; - regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; @@ -458,8 +456,6 @@ }; vcc_sd: LDO_REG6 { - regulator-always-on; - regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; diff --git a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts index 9521690400bc..623ab10a61f6 100644 --- a/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts +++ b/arch/arm64/boot/dts/rockchip/px30-evb-ddr4-v10.dts @@ -446,8 +446,6 @@ }; vccio_sd: LDO_REG5 { - regulator-always-on; - regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; @@ -459,8 +457,6 @@ }; vcc_sd: LDO_REG6 { - regulator-always-on; - regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts index 69381343db68..a95d9b74d1f0 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-863-lp3-v10.dts @@ -399,8 +399,6 @@ }; vccio_sd: LDO_REG5 { - regulator-always-on; - regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; @@ -412,8 +410,6 @@ }; vcc_sd: LDO_REG6 { - regulator-always-on; - regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; diff --git a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts index 39e6513fbe83..2ed5eedbc0e1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts +++ b/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dts @@ -471,8 +471,6 @@ }; vccio_sd: LDO_REG5 { - regulator-always-on; - regulator-boot-on; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <3300000>; @@ -484,8 +482,6 @@ }; vcc_sd: LDO_REG6 { - regulator-always-on; - regulator-boot-on; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>;