Skip to content

Commit c59ebeb

Browse files
committed
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 45d59d7 ("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: Frank Li <Frank.Li@nxp.com>
1 parent 3432749 commit c59ebeb

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1304,7 +1304,7 @@
13041304
};
13051305

13061306
lcdif1: lcdif@2220000 {
1307-
compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";
1307+
compatible = "fsl,imx6sx-lcdif";
13081308
reg = <0x02220000 0x4000>;
13091309
interrupts = <GIC_SPI 5 IRQ_TYPE_EDGE_RISING>;
13101310
clocks = <&clks IMX6SX_CLK_LCDIF1_PIX>,
@@ -1325,7 +1325,7 @@
13251325
};
13261326

13271327
lcdif2: lcdif@2224000 {
1328-
compatible = "fsl,imx6sx-lcdif", "fsl,imx28-lcdif";
1328+
compatible = "fsl,imx6sx-lcdif";
13291329
reg = <0x02224000 0x4000>;
13301330
interrupts = <GIC_SPI 6 IRQ_TYPE_EDGE_RISING>;
13311331
clocks = <&clks IMX6SX_CLK_LCDIF2_PIX>,

0 commit comments

Comments
 (0)