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

Commit d2e3cb98 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes-4.9-2' of... 

Merge tag 'imx-fixes-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

i.MX fixes for 4.9, 2nd round:

It fixes a boot failure on imx53-qsb board with a DA9053 PMIC, which is
caused by the regulator core change, commit fa93fd4e ("regulator:
core: Ensure we are at least in bounds for our constraints").

* tag 'imx-fixes-4.9-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: dts: imx53-qsb: Fix regulator constraints

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 52cad4b5 e3c9d9d6

arch/arm/boot/dts/imx53-qsb.dts

+7 −7
Original line number Diff line number Diff line
@@ -64,8 +64,8 @@ 
			};



			ldo3_reg: ldo3 {

				regulator-min-microvolt = <600000>;

				regulator-max-microvolt = <1800000>;

				regulator-min-microvolt = <1725000>;

				regulator-max-microvolt = <3300000>;

				regulator-always-on;

			};
@@ -76,8 +76,8 @@ 
			};



			ldo5_reg: ldo5 {

				regulator-min-microvolt = <1725000>;

				regulator-max-microvolt = <3300000>;

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3600000>;

				regulator-always-on;

			};
@@ -100,14 +100,14 @@ 
			};



			ldo9_reg: ldo9 {

				regulator-min-microvolt = <1200000>;

				regulator-min-microvolt = <1250000>;

				regulator-max-microvolt = <3600000>;

				regulator-always-on;

			};



			ldo10_reg: ldo10 {

				regulator-min-microvolt = <1250000>;

				regulator-max-microvolt = <3650000>;

				regulator-min-microvolt = <1200000>;

				regulator-max-microvolt = <3600000>;

				regulator-always-on;

			};

		};