From: Tony Lindgren <tony@atomide.com>
Date: Wed, 10 Mar 2021 12:19:20 +0000 (+0200)
Subject: Merge branches 'omap-for-v5.13/genpd-dra7', 'omap-for-v5.13/genpd-omap4' and 'omap... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=569519de002fafde35f889a8ea0348eae6ccc20f;p=linux.git

Merge branches 'omap-for-v5.13/genpd-dra7', 'omap-for-v5.13/genpd-omap4' and 'omap-for-v5.13/genpd-omap5' into omap-for-v5.13/genpd-drop-legacy

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

569519de002fafde35f889a8ea0348eae6ccc20f
diff --cc arch/arm/mach-omap2/Makefile
index 9bcfb34a22064,1d7b9d77703d9,556fac5994f42,49c3d2d070725..d03646e2f81f9
--- a/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