Commit c59ebeb2 authored by Frank Li's avatar Frank Li
Browse files

ARM: dts: imx6sx: remove fallback compatible string fsl,imx28-lcdif 



The i.MX6SX LCDIF is not fully compatible with the i.MX28 LCDIF. The
i.MX6SX controller provides additional overlay registers (AS_CTRL) which
are not present on i.MX28.

Linux has supported the dedicated compatible string since commit
45d59d70 ("drm: Add new driver for MXSFB controller").

Other known DT users such as U-Boot and Barebox already support
"fsl,imx6sx-lcdif", so removing the fallback compatible string is low risk
since this device is used for display output only.

Fix the following CHECK_DTB warning:
/arch/arm/boot/dts/nxp/imx/imx6sx-nitrogen6sx.dtb: lcdif@2220000 (fsl,imx6sx-lcdif): compatible: 'oneOf' conditional failed, one must be fixed:
        ['fsl,imx6sx-lcdif', 'fsl,imx28-lcdif'] is too long

Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
parent 3432749e

arch/arm/boot/dts/nxp/imx/imx6sx.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1304,7 +1304,7 @@ csi2: csi@221c000 { 
				};



				lcdif1: lcdif@2220000 {

					compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";

					compatible = "fsl,imx6sx-lcdif";

					reg = <0x02220000 0x4000>;

					interrupts = <GIC_SPI 5 IRQ_TYPE_EDGE_RISING>;

					clocks = <&clks IMX6SX_CLK_LCDIF1_PIX>,
@@ -1325,7 +1325,7 @@ lcdif1_to_ldb: endpoint { 
				};



				lcdif2: lcdif@2224000 {

					compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";

					compatible = "fsl,imx6sx-lcdif";

					reg = <0x02224000 0x4000>;

					interrupts = <GIC_SPI 6 IRQ_TYPE_EDGE_RISING>;

					clocks = <&clks IMX6SX_CLK_LCDIF2_PIX>,