The LCDIF IP on i.MX6SL and i.MX6SLL is compatible with i.MX6SX.
Provide a more specific "fsl,imx6sx-lcdif" compatible and still keep
"fsl,imx28-lcdif" for DT compatibility.
Signed-off-by: Fabio Estevam <feste...@gmail.com>
Reviewed-by: Ahmad Fatoum <a.fat...@pengutronix.de>
---
arch/arm/boot/dts/nxp/imx/imx6sl.dtsi | 3 ++-
arch/arm/boot/dts/nxp/imx/imx6sll.dtsi | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/nxp/imx/imx6sl.dtsi
b/arch/arm/boot/dts/nxp/imx/imx6sl.dtsi
index 7381fb7f8912..074c48b04519 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6sl.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6sl.dtsi
@@ -776,7 +776,8 @@ epdc: epdc@20f4000 {
};
lcdif: lcdif@20f8000 {
- compatible = "fsl,imx6sl-lcdif",
"fsl,imx28-lcdif";
+ compatible = "fsl,imx6sl-lcdif",
"fsl,imx6sx-lcdif",
+ "fsl,imx28-lcdif";
reg = <0x020f8000 0x4000>;
interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SL_CLK_LCDIF_PIX>,
diff --git a/arch/arm/boot/dts/nxp/imx/imx6sll.dtsi
b/arch/arm/boot/dts/nxp/imx/imx6sll.dtsi
index 8c5ca4f9b87f..745f3640e114 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6sll.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6sll.dtsi
@@ -657,7 +657,8 @@ pxp: pxp@20f0000 {
};
lcdif: lcd-controller@20f8000 {
- compatible = "fsl,imx6sll-lcdif",
"fsl,imx28-lcdif";
+ compatible = "fsl,imx6sll-lcdif",
"fsl,imx6sx-lcdif",
+ "fsl,imx28-lcdif";
reg = <0x020f8000 0x4000>;
interrupts = <GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clks IMX6SLL_CLK_LCDIF_PIX>,
--
2.34.1
