Merge branches 'omap-for-v5.13/genpd-dra7', 'omap-for-v5.13/genpd-omap4' and 'omap...

Merge together branches dropping legacy data to avoid a minor merge conflict.

diff --cc arch/arm/mach-omap2/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/Makefile
index 9bcfb34a22064752372ad241b09f734733152fde,1d7b9d77703d99d766df09d6bbbf2c3bb00c9c1e,556fac5994f42ac71cf4f38c23c66eb73c2a19d7,49c3d2d070725268ac05acd4653160463801e6b1..d03646e2f81f99602091f65341ec2e91b28c11be
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
--- 3/arch/arm/mach-omap2/Makefile
--- 4/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@@@ -207,9 -207,8 -207,8 -207,8 +207,6 @@@@@ obj-$(CONFIG_SOC_OMAP2430)               += omap_hwm
    obj-$(CONFIG_ARCH_OMAP3)            += omap_hwmod_2xxx_3xxx_ipblock_data.o
    obj-$(CONFIG_ARCH_OMAP3)            += omap_hwmod_3xxx_data.o
    obj-$(CONFIG_SOC_TI81XX)            += omap_hwmod_81xx_data.o
-- -obj-$(CONFIG_ARCH_OMAP4)            += omap_hwmod_44xx_data.o
--- obj-$(CONFIG_SOC_OMAP5)                     += omap_hwmod_54xx_data.o
- --obj-$(CONFIG_SOC_DRA7XX)            += omap_hwmod_7xx_data.o
    
    # OMAP2420 MSDI controller integration support ("MMC")
    obj-$(CONFIG_SOC_OMAP2420)          += msdi.o

diff --cc arch/arm/mach-omap2/io.c
Simple merge