linux-imx: Upgrade to lf-6.18.2-1.0.0

Signed-off-by: Zelan Zou <zelan.zou@nxp.com>

8 files changed, 13 insertions, 6 deletions

diff --git a/conf/machine/imx8mm-ddr4-evk.conf b/conf/machine/imx8mm-ddr4-evk.conf
index 467ca8630..afb3ca29d 100644
--- a/conf/machine/imx8mm-ddr4-evk.conf
+++ b/conf/machine/imx8mm-ddr4-evk.conf
@@ -8,6 +8,7 @@ require include/imx8mm-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb-rm67191-cmd-ram.dtb \
diff --git a/conf/machine/imx8mm-lpddr4-evk.conf b/conf/machine/imx8mm-lpddr4-evk.conf
index e21d8bf89..ae81a92d4 100644
--- a/conf/machine/imx8mm-lpddr4-evk.conf
+++ b/conf/machine/imx8mm-lpddr4-evk.conf
@@ -20,6 +20,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-inmate.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-qca-wifi.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-revb-qca-wifi.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-root.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-rpmsg-wm8524.dtb \
diff --git a/conf/machine/imx8mn-ddr4-evk.conf b/conf/machine/imx8mn-ddr4-evk.conf
index 7a796d38d..7b3682217 100644
--- a/conf/machine/imx8mn-ddr4-evk.conf
+++ b/conf/machine/imx8mn-ddr4-evk.conf
@@ -8,6 +8,7 @@ require include/imx8mn-evk.inc
 
 KERNEL_DEVICETREE_BASENAME = "${MACHINE}"
 KERNEL_DEVICETREE:append:use-nxp-bsp = " \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-rm692c9.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-usd-wifi.dtb \
 "
 UBOOT_CONFIG_BASENAME = "imx8mn_ddr4_evk"
diff --git a/conf/machine/imx8mp-lpddr4-evk.conf b/conf/machine/imx8mp-lpddr4-evk.conf
index 17adba763..8a80cfd61 100644
--- a/conf/machine/imx8mp-lpddr4-evk.conf
+++ b/conf/machine/imx8mp-lpddr4-evk.conf
@@ -34,8 +34,9 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/imx8mp-evk-os08a20-ov5640.dtb \
     freescale/imx8mp-evk-ov2775.dtb \
     freescale/imx8mp-evk-ov2775-ov5640.dtb \
-    freescale/imx8mp-evk-pcie-ep.dtb \
     freescale/imx8mp-evk-revA3-8mic-revE.dtb \
+    freescale/imx8mp-evk-revb4-rm692c9.dtb \
+    freescale/imx8mp-evk-rm692c9.dtb \
     freescale/imx8mp-evk-rm67191.dtb \
     freescale/imx8mp-evk-rm67199.dtb \
     freescale/imx8mp-evk-root.dtb \
@@ -43,7 +44,6 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/imx8mp-evk-sof-pdm.dtb \
     freescale/imx8mp-evk-sof-wm8960.dtb \
     freescale/imx8mp-evk-spdif-lb.dtb \
-    freescale/imx8mp-evk-usdhc1-m2.dtb \
     freescale/imx8mp-evk-8mic-swpdm.dtb \
 "
 
diff --git a/conf/machine/imx8mq-evk.conf b/conf/machine/imx8mq-evk.conf
index 7b347bf10..9e5c27b43 100644
--- a/conf/machine/imx8mq-evk.conf
+++ b/conf/machine/imx8mq-evk.conf
@@ -28,13 +28,15 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
         freescale/imx8mq-evk-dcss-adv7535.dtb \
         freescale/imx8mq-evk-dcss-rm67191.dtb \
         freescale/imx8mq-evk-dcss-rm67199.dtb \
+        freescale/imx8mq-evk-dcss-rm692c9.dtb \
         freescale/imx8mq-evk-dp.dtb \
         freescale/imx8mq-evk-dual-display.dtb \
         freescale/imx8mq-evk-inmate.dtb \
         freescale/imx8mq-evk-lcdif-adv7535.dtb \
         freescale/imx8mq-evk-lcdif-rm67191.dtb \
         freescale/imx8mq-evk-lcdif-rm67199.dtb \
-        freescale/imx8mq-evk-pcie-ep.dtb \
+        freescale/imx8mq-evk-lcdif-rm692c9.dtb \
+        freescale/imx8mq-evk-pcie1-ep.dtb \
         freescale/imx8mq-evk-pcie1-m2.dtb \
         freescale/imx8mq-evk-pdm.dtb \
         freescale/imx8mq-evk-root.dtb \
diff --git a/conf/machine/imx8qm-mek.conf b/conf/machine/imx8qm-mek.conf
index a7e52d54d..bb65ae13e 100644
--- a/conf/machine/imx8qm-mek.conf
+++ b/conf/machine/imx8qm-mek.conf
@@ -42,7 +42,6 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-hdmi-rx.dtbo \
     freescale/imx8qm-mek-jdi-wuxga-lvds1-panel.dtb \
     freescale/imx8qm-mek-jdi-wuxga-lvds1-panel-rpmsg.dtb \
-    freescale/imx8qm-mek-pcie-ep.dtb \
     freescale/imx8qm-mek-rpmsg.dtb \
     freescale/imx8qm-mek-sof.dtb \
     freescale/imx8qm-mek-sof-cs42888.dtb \
@@ -52,6 +51,8 @@ KERNEL_DEVICETREE = " \
     freescale/imx8qm-mek-max9286-csi0.dtb \
     freescale/imx8qm-mek-max9286-csi1.dtb \
     freescale/imx8qm-mek-max9286-dual.dtb \
+    freescale/imx8qm-mek-pcie0-ep.dtb \
+    freescale/imx8qm-mek-pcie0-ep-rpmsg.dtb \
     freescale/imx8qm-mek-revd-ca53.dtb \
     freescale/imx8qm-mek-revd-ca72.dtb \
     freescale/imx8qm-mek-revd-dsi-rm67191.dtb \
diff --git a/conf/machine/imx8qxp-mek.conf b/conf/machine/imx8qxp-mek.conf
index 8da1177bb..e6eb2109f 100644
--- a/conf/machine/imx8qxp-mek.conf
+++ b/conf/machine/imx8qxp-mek.conf
@@ -29,10 +29,10 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-max9286-rpmsg.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-csi-rpmsg.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-cpi.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-ov5640-cpi-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 \
 "
 
 UBOOT_CONFIG_BASENAME = "imx8qxp_mek"
diff --git a/conf/machine/include/imx8dxl-lpddr4-evk.inc b/conf/machine/include/imx8dxl-lpddr4-evk.inc
index b3b906ec7..c19f09eb2 100644
--- a/conf/machine/include/imx8dxl-lpddr4-evk.inc
+++ b/conf/machine/include/imx8dxl-lpddr4-evk.inc
@@ -8,6 +8,7 @@ KERNEL_DEVICETREE:append:use-nxp-bsp = " \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lcdif.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-lpspi-slave.dtb \
     freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep.dtb \
+    freescale/${KERNEL_DEVICETREE_BASENAME}-pcie-ep-rpmsg.dtb \
 "
 
 UBOOT_CONFIG_BASENAME = "imx8dxl_evk"