diff options
| author | Olof Johansson <olof@lixom.net> | 2016-11-17 19:38:01 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-17 19:38:01 -0500 |
| commit | d2e3cb98402421d29c296c9ec4257804c9705fad (patch) | |
| tree | 6202ce900141eb77fe4834867fabccaa25a45af9 | |
| parent | 52cad4b54da3448c819d240c5a7ce08ec9398680 (diff) | |
| parent | e3c9d9d6ebfeeeee29c6240e1b5978d40d31d21f (diff) | |
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 fa93fd4ecc9c ("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: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/imx53-qsb.dts | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts index dec4b073ceb1..379939699164 100644 --- a/arch/arm/boot/dts/imx53-qsb.dts +++ b/arch/arm/boot/dts/imx53-qsb.dts | |||
| @@ -64,8 +64,8 @@ | |||
| 64 | }; | 64 | }; |
| 65 | 65 | ||
| 66 | ldo3_reg: ldo3 { | 66 | ldo3_reg: ldo3 { |
| 67 | regulator-min-microvolt = <600000>; | 67 | regulator-min-microvolt = <1725000>; |
| 68 | regulator-max-microvolt = <1800000>; | 68 | regulator-max-microvolt = <3300000>; |
| 69 | regulator-always-on; | 69 | regulator-always-on; |
| 70 | }; | 70 | }; |
| 71 | 71 | ||
| @@ -76,8 +76,8 @@ | |||
| 76 | }; | 76 | }; |
| 77 | 77 | ||
| 78 | ldo5_reg: ldo5 { | 78 | ldo5_reg: ldo5 { |
| 79 | regulator-min-microvolt = <1725000>; | 79 | regulator-min-microvolt = <1200000>; |
| 80 | regulator-max-microvolt = <3300000>; | 80 | regulator-max-microvolt = <3600000>; |
| 81 | regulator-always-on; | 81 | regulator-always-on; |
| 82 | }; | 82 | }; |
| 83 | 83 | ||
| @@ -100,14 +100,14 @@ | |||
| 100 | }; | 100 | }; |
| 101 | 101 | ||
| 102 | ldo9_reg: ldo9 { | 102 | ldo9_reg: ldo9 { |
| 103 | regulator-min-microvolt = <1200000>; | 103 | regulator-min-microvolt = <1250000>; |
| 104 | regulator-max-microvolt = <3600000>; | 104 | regulator-max-microvolt = <3600000>; |
| 105 | regulator-always-on; | 105 | regulator-always-on; |
| 106 | }; | 106 | }; |
| 107 | 107 | ||
| 108 | ldo10_reg: ldo10 { | 108 | ldo10_reg: ldo10 { |
| 109 | regulator-min-microvolt = <1250000>; | 109 | regulator-min-microvolt = <1200000>; |
| 110 | regulator-max-microvolt = <3650000>; | 110 | regulator-max-microvolt = <3600000>; |
| 111 | regulator-always-on; | 111 | regulator-always-on; |
| 112 | }; | 112 | }; |
| 113 | }; | 113 | }; |