Merge branch 'omap/pm-voltdomain-cleanup' into next/soc

Conflicts:
	arch/arm/mach-omap2/Makefile
	arch/arm/mach-omap2/io.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc arch/arm/mach-omap2/Makefile
index f8bc62fd48fb53dac91ed656207f280ceaafc8db,a4f1d2a78d986196ac3fa97fc0dd7bf37c8b96ba..ec2e128074d8a9e9a5b8afb4156d30162cf09fcc
--- 1/arch/arm/mach-omap2/Makefile
--- 2/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -130,10 -125,7 +130,9 @@@ obj-$(CONFIG_ARCH_OMAP3)          += voltagedom
  obj-$(CONFIG_ARCH_OMAP4)              += $(voltagedomain-common)
  obj-$(CONFIG_ARCH_OMAP4)              += voltagedomains44xx_data.o
  obj-$(CONFIG_SOC_AM33XX)              += $(voltagedomain-common)
- obj-$(CONFIG_SOC_AM33XX)                += voltagedomains33xx_data.o
 +obj-$(CONFIG_SOC_AM43XX)              += $(voltagedomain-common)
  obj-$(CONFIG_SOC_OMAP5)                       += $(voltagedomain-common)
 +obj-$(CONFIG_SOC_OMAP5)                += voltagedomains54xx_data.o
  
  # OMAP powerdomain framework
  powerdomain-common                    += powerdomain.o powerdomain-common.o

diff --cc arch/arm/mach-omap2/io.c
index dd0f23d0085b717852db2f3e7c179a19280c46b8,50b93df458469847ae0b195e4f1388b8ba0af4f0..fe3253a100e740c92688f374557d2470ed6494cb
--- 1/arch/arm/mach-omap2/io.c
--- 2/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@@ -576,8 -576,7 +576,7 @@@ void __init am33xx_init_early(void
        omap2_set_globals_prm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE));
        omap2_set_globals_cm(AM33XX_L4_WK_IO_ADDRESS(AM33XX_PRCM_BASE), NULL);
        omap3xxx_check_revision();
 -      ti81xx_check_features();
 +      am33xx_check_features();
-       am33xx_voltagedomains_init();
        am33xx_powerdomains_init();
        am33xx_clockdomains_init();
        am33xx_hwmod_init();

diff --cc arch/arm/mach-omap2/powerdomain.h
Simple merge

diff --cc arch/arm/mach-omap2/voltage.h
index 5998eed3a2d2d13943cda2059f5e54abc1ab4a76,9bf796df1b9e149b47f2dee6609c7240d5a263dd..f7f2879b31b0218b7c9d20a08cc4d2d73e09bb20
--- 1/arch/arm/mach-omap2/voltage.h
--- 2/arch/arm/mach-omap2/voltage.h
+++ b/arch/arm/mach-omap2/voltage.h
@@@ -169,9 -169,7 +169,8 @@@ int omap_voltage_late_init(void)
  
  extern void omap2xxx_voltagedomains_init(void);
  extern void omap3xxx_voltagedomains_init(void);
- extern void am33xx_voltagedomains_init(void);
  extern void omap44xx_voltagedomains_init(void);
 +extern void omap54xx_voltagedomains_init(void);
  
  struct voltagedomain *voltdm_lookup(const char *name);
  void voltdm_init(struct voltagedomain **voltdm_list);