diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-29 21:05:53 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-29 21:05:53 -0800 |
| commit | 0ff3758bc349e8675b859f314e8a65457e22d3ab (patch) | |
| tree | a1472d77b1a8273747a3623f4084ade676405402 /arch/arm/boot/dts/imx6qdl.dtsi | |
| parent | 3c63c24d8150ed566f81f83af2826dba83fadae0 (diff) | |
| parent | 8b649e426336d7d4800ff9c82858328f4215ba01 (diff) | |
Merge tag 'imx-fixes-nc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
i.MX non-critical device tree fixes for 4.11:
- A couple of fixes on anatop regulator voltage and constraints
according to hardware datasheet.
- Correct FEC interrupt routing for i.MX6QP which has got the hardware
bug found on i.MX6Q fixed.
- Remove unit address from i.MX6 LDB device node to fix DTC warning.
- A fix on imx53-qsb board FEC pinmux config to remove the dependency
on firmware for setting up pins.
- A series from Sascha to fix LPSR pins for i.MX7 boards.
* tag 'imx-fixes-nc-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx53-qsb-common: fix FEC pinmux config
ARM: imx6: remove unit address from LDB node
ARM: imx6qp: adapt DT to changed FEC interrupts
ARM: imx6: fix regulator constraints on anatop 1p1 and 2p5
ARM: imx6: fix min/max voltage of anatop 2p5 regulator
ARM: dts: imx7: Add "LPSR" to LPSR iomux pin names
ARM: dts: imx7d-cl-som: Fix OTG power pinctrl
ARM: dts: imx7d-sdb: Fix watchdog and pwm pinmux
ARM: dts: imx7s-warp: Fix watchdog pinmux
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl.dtsi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi index 89b834f3fa17..04eba6894c49 100644 --- a/arch/arm/boot/dts/imx6qdl.dtsi +++ b/arch/arm/boot/dts/imx6qdl.dtsi @@ -626,8 +626,8 @@ regulator-1p1 { compatible = "fsl,anatop-regulator"; regulator-name = "vdd1p1"; - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1375000>; + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1200000>; regulator-always-on; anatop-reg-offset = <0x110>; anatop-vol-bit-shift = <8>; @@ -654,15 +654,15 @@ regulator-2p5 { compatible = "fsl,anatop-regulator"; regulator-name = "vdd2p5"; - regulator-min-microvolt = <2000000>; + regulator-min-microvolt = <2250000>; regulator-max-microvolt = <2750000>; regulator-always-on; anatop-reg-offset = <0x130>; anatop-vol-bit-shift = <8>; anatop-vol-bit-width = <5>; anatop-min-bit-val = <0>; - anatop-min-voltage = <2000000>; - anatop-max-voltage = <2750000>; + anatop-min-voltage = <2100000>; + anatop-max-voltage = <2875000>; }; reg_arm: regulator-vddcore { @@ -808,7 +808,7 @@ reg = <0x020e0000 0x4000>; }; - ldb: ldb@020e0008 { + ldb: ldb { #address-cells = <1>; #size-cells = <0>; compatible = "fsl,imx6q-ldb", "fsl,imx53-ldb"; |