diff options
| author | Olof Johansson <olof@lixom.net> | 2017-01-30 06:05:53 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-01-30 06:05:53 +0100 |
| commit | 0ff3758bc349e8675b859f314e8a65457e22d3ab (patch) | |
| tree | a1472d77b1a8273747a3623f4084ade676405402 /arch/arm/boot/dts/imx7d-sdb.dts | |
| parent | Merge tag 'mvebu-dt-4.11-2' of git://git.infradead.org/linux-mvebu into next/dt (diff) | |
| parent | ARM: dts: imx53-qsb-common: fix FEC pinmux config (diff) | |
| download | linux-0ff3758bc349e8675b859f314e8a65457e22d3ab.tar.xz linux-0ff3758bc349e8675b859f314e8a65457e22d3ab.zip | |
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/imx7d-sdb.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx7d-sdb.dts | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 2f33c463cbce..94edf8e01c00 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts @@ -502,12 +502,6 @@ >; }; - pinctrl_pwm1: pwm1grp { - fsl,pins = < - MX7D_PAD_GPIO1_IO01__PWM1_OUT 0x110b0 - >; - }; - pinctrl_tsc2046_pendown: tsc2046_pendown { fsl,pins = < MX7D_PAD_EPDC_BDR1__GPIO2_IO29 0x59 @@ -635,11 +629,19 @@ MX7D_PAD_SD3_STROBE__SD3_STROBE 0x1b >; }; + }; +}; - pinctrl_wdog: wdoggrp { - fsl,pins = < - MX7D_PAD_GPIO1_IO00__WDOD1_WDOG_B 0x74 - >; - }; +&iomuxc_lpsr { + pinctrl_wdog: wdoggrp { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B 0x74 + >; + }; + + pinctrl_pwm1: pwm1grp { + fsl,pins = < + MX7D_PAD_LPSR_GPIO1_IO01__PWM1_OUT 0x110b0 + >; }; }; |