Addressed the conflicts and included imx8mm-phg and imx8mp-msc-sm2s in this patchset.
Convert the remaining boards as described at [1] [1] https://lore.kernel.org/all/CAOMZO5A4fxHXk++4Ha6hpw+=sae30b2oxmftkhzpzsi704y...@mail.gmail.com/#t Checked the board dts, but I not have the board to test, best effort on this patchset. I would appreciate board maintainers to help test. Patchset is based on Tom's origin/next with u-boot-imx-next-20260515 applied at my local. Signed-off-by: Peng Fan <[email protected]> --- Peng Fan (4): imx8mm: icore-mx8mm: Switch to OF_UPSTREAM imx8mp: icore-mx8mp-edimm2.2: Switch to OF_UPSTREAM imx8mm: pgh: Switch to OF_UPSTREAM imx8mp: msc-sm2s: Switch to OF_UPSTREAM arch/arm/dts/Makefile | 7 +- arch/arm/dts/imx8mm-icore-mx8mm-ctouch2.dts | 96 --- arch/arm/dts/imx8mm-icore-mx8mm-edimm2.2.dts | 96 --- arch/arm/dts/imx8mm-icore-mx8mm.dtsi | 232 ------ arch/arm/dts/imx8mm-phg.dts | 266 ------- arch/arm/dts/imx8mm-tqma8mqml.dtsi | 341 --------- arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts | 175 ----- arch/arm/dts/imx8mp-icore-mx8mp.dtsi | 186 ----- ...u-boot.dtsi => imx8mp-msc-sm2s-ep1-u-boot.dtsi} | 0 arch/arm/dts/imx8mp-msc-sm2s.dts | 820 --------------------- arch/arm/mach-imx/imx8m/Kconfig | 4 + configs/imx8mm-icore-mx8mm-ctouch2_defconfig | 2 +- configs/imx8mm-icore-mx8mm-edimm2.2_defconfig | 2 +- configs/imx8mm_phg_defconfig | 5 +- configs/imx8mp-icore-mx8mp-edimm2.2_defconfig | 2 +- configs/msc_sm2s_imx8mp_defconfig | 2 +- 16 files changed, 13 insertions(+), 2223 deletions(-) --- base-commit: 3321f4cc0cfe4fe2be987a7c771a5e19be380706 change-id: 20260517-imx8m-of-upstream-2-74cbe56efb8b Best regards, -- Peng Fan <[email protected]>
