diff options
| author | Robert Chiras <robert.chiras@nxp.com> | 2018-10-12 17:09:08 +0300 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2018-11-08 20:10:08 +0100 |
| commit | 25f3b60fe5dea110a61b948020a1fe41924efb9b (patch) | |
| tree | 27385cb8e892c8c8a86a6a4bcc157bd8a62da232 | |
| parent | fde2f4257af95aba7423215ea662d62809f39f18 (diff) | |
MLK-18789: arch: arm64: fsl-imx8qxp: Fix adma_pwm default status
The pwm_adma_lcdif node was created with status "okay" in the mek.dts
file, causing a pin conflict with the audio subsystem, even though the
lcdif pwm is not needed in this dts file.
Move this node into it's specific dts file: mek-lcdif, since it is only
needed by the lcdif.
Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-lcdif.dts | 2 | ||||
| -rwxr-xr-x | arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek.dts | 7 |
2 files changed, 2 insertions, 7 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 750d725ee990..4ac48e814bd8 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-lcdif.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek-lcdif.dts @@ -81,5 +81,7 @@ }; &pwm_adma_lcdif { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_lcdif_pwm>; status = "okay"; }; diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek.dts index 069532503231..e5beab655489 100755 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qxp-mek.dts @@ -1197,13 +1197,6 @@ status = "okay"; }; -&pwm_adma_lcdif { - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_lcdif_pwm>; - status = "okay"; -}; - - /* DSI/LVDS port 1 */ &i2c0_mipi_lvds1 { #address-cells = <1>; |