diff options
| author | Robert Chiras <robert.chiras@nxp.com> | 2018-10-12 17:52:45 +0300 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:34:37 +0800 |
| commit | cca7a20e2f9562775c87dc38d10a0d5e6afe3aff (patch) | |
| tree | 16bf7dc1256d3e27f2e45d452663306543af85e9 /arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-lcdif.dts | |
| parent | eed170167722b6a36a9636d814277a62f199b688 (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>
Diffstat (limited to 'arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-lcdif.dts')
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-lcdif.dts | 10 |
1 files changed, 10 insertions, 0 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"; }; |