diff options
| author | Robert Chiras <robert.chiras@nxp.com> | 2018-10-12 17:52:45 +0300 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-11-08 20:10:09 +0100 |
| commit | ee3e12170c924d5406a257b9e2cbe22d6e644586 (patch) | |
| tree | 4d50a156cd3c947d44e46a8f78191a33cffafe9a | |
| parent | 25f3b60fe5dea110a61b948020a1fe41924efb9b (diff) | |
MLK-18789: arch: arm64: fsl-imx8qxp: Move conflicting pin
The SC_P_MCLK_OUT0_ADMA_ACM_MCLK_OUT0 pin was conflicting with the pins
needed by the eLCDIF, so it was commented out with a TODO.
In order to fix this conflict, re-write this pinctrl group in the lcdif
specific dts file so that the conflict is handled properly.
Fixes: 471c6dc358fe ("ARM64: dts: imx8dx: Add dts file for lcdif")
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-lcdif.dts | 10 | ||||
| -rwxr-xr-x | arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek.dts | 2 |
2 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-lcdif.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-lcdif.dts index 4ac48e814bd8..e884a771b76e 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-lcdif.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-lcdif.dts @@ -52,6 +52,16 @@ }; +&iomuxc { + imx8qxp-mek { + pinctrl_hog: hoggrp { + fsl,pins = < + SC_P_COMP_CTL_GPIO_1V8_3V3_GPIORHB_PAD 0x000514a0 + >; + }; + }; +}; + &esai0 { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek.dts index e5beab655489..73feaf33db8e 100755 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek.dts @@ -270,9 +270,7 @@ imx8qxp-mek { pinctrl_hog: hoggrp { fsl,pins = < - /* TODO: conflicts with LCDIF!!! SC_P_MCLK_OUT0_ADMA_ACM_MCLK_OUT0 0x0600004c - */ SC_P_COMP_CTL_GPIO_1V8_3V3_GPIORHB_PAD 0x000514a0 >; }; |