summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Li <Frank.Li@nxp.com>2026-03-11 22:41:11 +0300
committerFrank Li <Frank.Li@nxp.com>2026-04-06 04:35:40 +0300
commitc59ebeb2ad085bee952d35c601cad46be3bc86c1 (patch)
treeb8ea583ddc0e029bf72612f75e81a99ef9b294fa
parent3432749efe6b76abf7cff90a05ff40ee919c060e (diff)
downloadlinux-c59ebeb2ad085bee952d35c601cad46be3bc86c1.tar.xz
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 45d59d704080 ("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>
-rw-r--r--arch/arm/boot/dts/nxp/imx/imx6sx.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi b/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi
index 1426f357d474..aefae5a3a6be 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6sx.dtsi
@@ -1304,7 +1304,7 @@
};
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 @@
};
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>,