Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c80a003 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'v4.3-rockchip32-dts3' of... 

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: default avatarOlof Johansson <olof@lixom.net>
parents f4be3c67 467fb18a

arch/arm/boot/dts/rk3288-veyron-jerry.dts

+1 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;

			};

		};

	};