tmakin/tegra-linux-noble
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'v4.3-rockchip32-dts3' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/rk3288-veyron-jerry.dts
+1 -1
View File
@@ -99,7 +99,7 @@
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
regulator-state-mem {
regulator-on-in-suspend;
regulator-off-in-suspend;
};
};
};
arch/arm/boot/dts/rk3288-veyron-minnie.dts
+6 -2
View File
@@ -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;
};
};
};
};
arch/arm/boot/dts/rk3288-veyron-pinky.dts
+1 -1
View File
@@ -109,7 +109,7 @@
regulator-boot-on;
regulator-name = "vcc18_lcd";
regulator-state-mem {
regulator-on-in-suspend;
regulator-off-in-suspend;
};
};
};
arch/arm/boot/dts/rk3288-veyron-sdmmc.dtsi
+2 -2
View File
@@ -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;
};
};
};