Merge pull request #2095 from Freescale/backport-2094-to-scarthgap

[Backport scarthgap] Fix dtb changes for 6.6.52_2.0.0

4 files changed, 5 insertions, 35 deletions

diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index 2d876b683..47cfde198 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -38,17 +38,11 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-dsi-serdes-rpmsg.dtb \
     freescale/imx8qm-mek-enet2-tja1100.dtb \
     freescale/imx8qm-mek-hdmi.dtb \
+    freescale/imx8qm-mek-hdmi-rx.dtb \
+    freescale/imx8qm-mek-hdmi-rx-ov5640.dtb \
     freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \
     freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \
-    freescale/imx8qm-mek-max9286-csi0.dtb \
-    freescale/imx8qm-mek-max9286-csi1.dtb \
-    freescale/imx8qm-mek-max9286-dual.dtb \
-    freescale/imx8qm-mek-ov5640-csi0.dtb \
-    freescale/imx8qm-mek-ov5640-csi0-rpmsg.dtb \
-    freescale/imx8qm-mek-ov5640-csi1.dtb \
-    freescale/imx8qm-mek-ov5640-csi1-rpmsg.dtb \
-    freescale/imx8qm-mek-ov5640-dual.dtb \
-    freescale/imx8qm-mek-ov5640-dual-rpmsg.dtb \
+    freescale/imx8qm-mek-ov5640.dtb \
     freescale/imx8qm-mek-pcie-ep.dtb \
     freescale/imx8qm-mek-rpmsg.dtb \
     freescale/imx8qm-mek-sof.dtb \
@@ -56,24 +50,6 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-sof-wm8960.dtb \
     freescale/imx8qm-mek-usd-wifi.dtb \
     freescale/imx8qm-mek-usdhc3-m2.dtb \
-    freescale/imx8qm-mek-revd-ca53.dtb \
-    freescale/imx8qm-mek-revd-ca72.dtb \
-    freescale/imx8qm-mek-revd-dsi-rm67191.dtb \
-    freescale/imx8qm-mek-revd-dsi-rm67199.dtb \
-    freescale/imx8qm-mek-revd.dtb \
-    freescale/imx8qm-mek-revd-enet2-tja1100.dtb \
-    freescale/imx8qm-mek-revd-hdmi.dtb \
-    freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel.dtb \
-    freescale/imx8qm-mek-revd-jdi-wuxga-lvds1-panel-rpmsg.dtb \
-    freescale/imx8qm-mek-revd-ov5640-csi0.dtb \
-    freescale/imx8qm-mek-revd-ov5640-csi1.dtb \
-    freescale/imx8qm-mek-revd-ov5640-dual.dtb \
-    freescale/imx8qm-mek-revd-pcie-ep.dtb \
-    freescale/imx8qm-mek-revd-root.dtb \
-    freescale/imx8qm-mek-revd-rpmsg.dtb \
-    freescale/imx8qm-mek-revd-sof-wm8962.dtb \
-    freescale/imx8qm-mek-revd-usdhc3-m2.dtb \
-    freescale/imx8qm-mek-revd-usd-wifi.dtb \
 "
 
 UBOOT_MAKE_TARGET = \
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf
index c78e07804..87df30f42 100644
--- a/conf/machine/imx8qxp-mek.conf
+++ b/conf/machine/imx8qxp-mek.conf
@@ -20,13 +20,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-enet2-tja1100.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif-rpmsg.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-max9286.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi-rpmsg.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-dual-rpmsg.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-parallel-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sof.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sof-cs42888.dtb \
diff --git a/conf/machine/imx8ulp-lpddr4-evk.conf b/conf/machine/imx8ulp-lpddr4-evk.conf
index 912402528..273e1569d 100644
--- a/conf/machine/imx8ulp-lpddr4-evk.conf
+++ b/conf/machine/imx8ulp-lpddr4-evk.conf
@@ -18,7 +18,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4m.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rk055hdmipi4mv2.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-sof-btsco.dtb \
-    freescale/${KERNEL_DEVICETREE_BASENAME}-tpm.dtb \
 "
 
 UBOOT_CONFIG_BASENAME = "imx8ulp_evk"
diff --git a/conf/machine/include/imx8x-mek.inc b/conf/machine/include/imx8x-mek.inc
index fc315fbcb..9eaa77c53 100644
--- a/conf/machine/include/imx8x-mek.inc
+++ b/conf/machine/include/imx8x-mek.inc
@@ -33,6 +33,8 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds0-panel-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-jdi-wuxga-lvds1-panel-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
 "