MLK-16918: arm64: dts: fsl-imx8mq-evk: Fix dsi conflicts

The MIPI-DSI nodes related to ADV7535 are in conflict with OV5640
MIPI-CSI camera, since they share the same address on the same i2c bus:
0x3c. In order to make DSI work with ADV7535 adapter, the OV5640 camera
needs to be disabled.
Also, for LCDIF (MXSFB), the irqsteer_dcss module needs to be disabled,
otherwise it will interfere in the suspend/resume routines.

Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Reviewed-by: Laurentiu Palcu <laurentiu.palcu@nxp.com>

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-lcdif-adv7535.dts b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-lcdif-adv7535.dts
index fe34217..81ee650 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-lcdif-adv7535.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-lcdif-adv7535.dts
@@ -20,6 +20,14 @@
        };
 };
 
+&irqsteer_dcss {
+       status = "disabled";
+};
+
+&ov5640_mipi {
+       status = "disabled";
+};
+
 &dcss_drm {
        status = "disabled";
 };

diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-lcdif-rm67191.dts b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-lcdif-rm67191.dts
index 90c33bd..1ae7d2b 100644 (file)
--- a/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-lcdif-rm67191.dts
+++ b/arch/arm64/boot/dts/freescale/fsl-imx8mq-evk-lcdif-rm67191.dts
@@ -20,6 +20,10 @@
        };
 };
 
+&irqsteer_dcss {
+       status = "disabled";
+};
+
 &dcss_drm {
        status = "disabled";
 };