Correct regulator handling on Rockchip arm64 boards to make bind/unbind calls work correctly and remove a sdio-only property from non-sdio mmc hosts, that accidentially was added there. * tag 'v4.9-rockchip-dts64-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: arm64: dts: rockchip: remove the abuse of keep-power-in-suspend arm64: dts: rockchip: remove always-on and boot-on from vcc_sd
Unified · Split
| @@ -116,7 +116,6 @@ · 115 unmodified lines | |||
| 116 | cap-mmc-highspeed; | 116 | cap-mmc-highspeed; |
| 117 | clock-frequency = <150000000>; | 117 | clock-frequency = <150000000>; |
| 118 | disable-wp; | 118 | disable-wp; |
| 119 | keep-power-in-suspend; | ||
| 120 | non-removable; | 119 | non-removable; |
| 121 | num-slots = <1>; | 120 | num-slots = <1>; |
| 122 | vmmc-supply = <&vcc_io>; | 121 | vmmc-supply = <&vcc_io>; |
| @@ -258,8 +257,6 @@ · 135 unmodified lines | |||
| 258 | }; | 257 | }; |
| 259 | 258 | ||
| 260 | vcc_sd: SWITCH_REG1 { | 259 | vcc_sd: SWITCH_REG1 { |
| 261 | regulator-always-on; | ||
| 262 | regulator-boot-on; | ||
| 263 | regulator-name = "vcc_sd"; | 260 | regulator-name = "vcc_sd"; |
| 264 | }; | 261 | }; |
| 265 | 262 | ||
| @@ -152,8 +152,6 @@ · 151 unmodified lines | |||
| 152 | gpio = <&gpio3 11 GPIO_ACTIVE_LOW>; | 152 | gpio = <&gpio3 11 GPIO_ACTIVE_LOW>; |
| 153 | regulator-min-microvolt = <1800000>; | 153 | regulator-min-microvolt = <1800000>; |
| 154 | regulator-max-microvolt = <3300000>; | 154 | regulator-max-microvolt = <3300000>; |
| 155 | regulator-always-on; | ||
| 156 | regulator-boot-on; | ||
| 157 | vin-supply = <&vcc_io>; | 155 | vin-supply = <&vcc_io>; |
| 158 | }; | 156 | }; |
| 159 | 157 | ||
| @@ -201,7 +199,6 @@ · 41 unmodified lines | |||
| 201 | bus-width = <8>; | 199 | bus-width = <8>; |
| 202 | cap-mmc-highspeed; | 200 | cap-mmc-highspeed; |
| 203 | disable-wp; | 201 | disable-wp; |
| 204 | keep-power-in-suspend; | ||
| 205 | mmc-pwrseq = <&emmc_pwrseq>; | 202 | mmc-pwrseq = <&emmc_pwrseq>; |
| 206 | mmc-hs200-1_2v; | 203 | mmc-hs200-1_2v; |
| 207 | mmc-hs200-1_8v; | 204 | mmc-hs200-1_8v; |
| @@ -350,7 +347,6 @@ · 142 unmodified lines | |||
| 350 | clock-freq-min-max = <400000 50000000>; | 347 | clock-freq-min-max = <400000 50000000>; |
| 351 | cap-sd-highspeed; | 348 | cap-sd-highspeed; |
| 352 | card-detect-delay = <200>; | 349 | card-detect-delay = <200>; |
| 353 | keep-power-in-suspend; | ||
| 354 | num-slots = <1>; | 350 | num-slots = <1>; |
| 355 | pinctrl-names = "default"; | 351 | pinctrl-names = "default"; |
| 356 | pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; | 352 | pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; |