openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes for non-standard and inverted regulator-suspend-properties 

on veyron boards.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABCAAGBQJV3Bg7AAoJEPOmecmc0R2BJ5kH/ReLNj9v5iCw1inJpBMuB2rk
 R1wECYOWSP3rDcORDZjjBChnYt02ft/3CnUstqE5vDJo1bNo/c9PvU5BPUGoXdOv
 Zx6ZXY5Q8nqGL0I39iP3gkboRzODeO+IpHzWlyLtnDIFRSzB8DBcHxm2wDvTPmqI
 qz4N+ObioycXqlOeimwE0o30qZeNTX/dIZ/pLlDojN2y0Kw71vnJPpgAcK6N+xEi
 w8VEMUW9oe0w31lDUfXJIL5ArjeCeOjoHjfGEwclsaOp0ic+OTVUmNOpo6MZ0Oni
 khuU/xvaWepE34+cvMA0BTzjY/t8L8dHhsw/ivEwrhRe+Uv8F/hgkVine/iS+/U=
 =AOly
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2015-08-25 10:15:27 -07:00
parent f4be3c67ed 467fb18a8d
commit 4c80a00388
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/rk3288-veyron-jerry.dts
View File

@ -99,7 +99,7 @@ mic_vcc: LDO_REG2 {
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-state-mem {
regulator-on-in-suspend;
regulator-off-in-suspend;
};
};
};

8
arch/arm/boot/dts/rk3288-veyron-minnie.dts
View File

@ -128,12 +128,16 @@ vcc33_touch: LDO_REG2 {
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;
};
};
};
};

2
arch/arm/boot/dts/rk3288-veyron-pinky.dts
View File

@ -109,7 +109,7 @@ vcc18_lcd: SWITCH_REG2 {
regulator-boot-on;
regulator-name = "vcc18_lcd";
regulator-state-mem {
regulator-on-in-suspend;
regulator-off-in-suspend;
};
};
};

4
arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
View File

@ -93,7 +93,7 @@ vccio_sd: LDO_REG4 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-state-mem {
regulator-on-in-suspend;
regulator-off-in-suspend;
};
};
@ -102,7 +102,7 @@ vcc33_sd: LDO_REG5 {
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
regulator-state-mem {
regulator-on-in-suspend;
regulator-off-in-suspend;
};
};
};