diff options
| author | Olof Johansson | 2015-08-25 10:15:27 -0700 |
|---|---|---|
| committer | Olof Johansson | 2015-08-25 10:15:27 -0700 |
| commit | 4c80a00388dd7b9d9e7ebf31e62b96c7b74178b8 (patch) | |
| tree | 9e903cf9dbfff07fe46bb474392cdb0838e2ff4a /arch/arm/boot/dts | |
| parent | f4be3c67ed5829462f53e225edd95029bb0793c4 (diff) | |
| parent | 467fb18a8d538be6548ef4093003b63aebbb07b9 (diff) | |
Merge tag 'v4.3-rockchip32-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Fixes for non-standard and inverted regulator-suspend-properties
on veyron boards.
* tag 'v4.3-rockchip32-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: correct regulator power states for suspend
ARM: dts: rockchip: correct regulator PM properties
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/rk3288-veyron-jerry.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3288-veyron-minnie.dts | 8 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3288-veyron-pinky.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi | 4 |
4 files changed, 10 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/rk3288-veyron-jerry.dts b/arch/arm/boot/dts/rk3288-veyron-jerry.dts index 42d724559915..60bd6e91e308 100644 --- a/arch/arm/boot/dts/rk3288-veyron-jerry.dts +++ b/arch/arm/boot/dts/rk3288-veyron-jerry.dts @@ -99,7 +99,7 @@ regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; regulator-state-mem { - regulator-on-in-suspend; + regulator-off-in-suspend; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-veyron-minnie.dts b/arch/arm/boot/dts/rk3288-veyron-minnie.dts index 0e30bd6bf92b..8fd8ef2c72da 100644 --- a/arch/arm/boot/dts/rk3288-veyron-minnie.dts +++ b/arch/arm/boot/dts/rk3288-veyron-minnie.dts @@ -128,12 +128,16 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-name = "vcc33_touch"; - regulator-suspend-mem-disabled; + regulator-state-mem { + regulator-off-in-suspend; + }; }; vcc5v_touch: SWITCH_REG2 { regulator-name = "vcc5v_touch"; - regulator-suspend-mem-disabled; + regulator-state-mem { + regulator-off-in-suspend; + }; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-veyron-pinky.dts b/arch/arm/boot/dts/rk3288-veyron-pinky.dts index 25eb4b0c1330..94b56e33d947 100644 --- a/arch/arm/boot/dts/rk3288-veyron-pinky.dts +++ b/arch/arm/boot/dts/rk3288-veyron-pinky.dts @@ -109,7 +109,7 @@ regulator-boot-on; regulator-name = "vcc18_lcd"; regulator-state-mem { - regulator-on-in-suspend; + regulator-off-in-suspend; }; }; }; diff --git a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi index 788468a48163..b5334ecff13c 100644 --- a/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi +++ b/arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi @@ -93,7 +93,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-state-mem { - regulator-on-in-suspend; + regulator-off-in-suspend; }; }; @@ -102,7 +102,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; regulator-state-mem { - regulator-on-in-suspend; + regulator-off-in-suspend; }; }; }; |