Merge tag 'for-v3.16/prcm-cleanup-a' of git://git.kernel.org/pub/scm/linux/kernel...

Some OMAP PRCM cleanup patches.  These help prepare to convert the PRCM
code into drivers.

Basic build, boot, and PM test results are available here:

http://www.pwsan.com/omap/testlogs/prcm-cleanup-v3.16/20140515213244/

Conflicts:
	arch/arm/mach-omap2/cm3xxx.c
	arch/arm/mach-omap2/cm44xx.c

Also fixed up new section mismatch warnings.

diff --cc arch/arm/mach-omap2/cm44xx.c
index 30b6d9743b734e9d9a1ece8ed0277d445a47a4aa,c440ba753882cdda781da0ec43ca56772ce5f350..fe5cc7bae4893ae431379e6bbfdfbf0c7b90e042
--- 1/arch/arm/mach-omap2/cm44xx.c
--- 2/arch/arm/mach-omap2/cm44xx.c
+++ b/arch/arm/mach-omap2/cm44xx.c
@@@ -30,23 -27,23 +27,23 @@@
  /* Read a register in CM1 */
  u32 omap4_cm1_read_inst_reg(s16 inst, u16 reg)
  {
-       return readl_relaxed(OMAP44XX_CM1_REGADDR(inst, reg));
 -      return __raw_readl(cm_base + inst + reg);
++      return readl_relaxed(cm_base + inst + reg);
  }
  
  /* Write into a register in CM1 */
  void omap4_cm1_write_inst_reg(u32 val, s16 inst, u16 reg)
  {
-       writel_relaxed(val, OMAP44XX_CM1_REGADDR(inst, reg));
 -      __raw_writel(val, cm_base + inst + reg);
++      writel_relaxed(val, cm_base + inst + reg);
  }
  
  /* Read a register in CM2 */
  u32 omap4_cm2_read_inst_reg(s16 inst, u16 reg)
  {
-       return readl_relaxed(OMAP44XX_CM2_REGADDR(inst, reg));
 -      return __raw_readl(cm2_base + inst + reg);
++      return readl_relaxed(cm2_base + inst + reg);
  }
  
  /* Write into a register in CM2 */
  void omap4_cm2_write_inst_reg(u32 val, s16 inst, u16 reg)
  {
-       writel_relaxed(val, OMAP44XX_CM2_REGADDR(inst, reg));
 -      __raw_writel(val, cm2_base + inst + reg);
++      writel_relaxed(val, cm2_base + inst + reg);
  }

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

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

diff --cc arch/arm/mach-omap2/prm3xxx.c
index 7721990d200680170698eb025b35ea5577ff75de,4a792fd1363c7b4ec1858b33d4cd798e1097d3f2..4bd7a2dca8af813fcf7f893c11ce36a346fd4d32
--- 1/arch/arm/mach-omap2/prm3xxx.c
--- 2/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@@ -412,7 -416,7 +416,7 @@@ int __init omap3xxx_prm_init(void
        return prm_register(&omap3xxx_prm_ll_data);
  }
  
--static int __init omap3xxx_prm_late_init(void)
++static int omap3xxx_prm_late_init(void)
  {
        int ret;
  

diff --cc arch/arm/mach-omap2/prm44xx.c
index 94a43b3cf0f0c756bb238ac77cc5ea501bede609,edf49ef867e16b4a637f91094138bcfb6ece11a7..a7f6ea27180ae9fc96c5f40d442c4f89a42c410e
--- 1/arch/arm/mach-omap2/prm44xx.c
--- 2/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@@ -666,9 -670,9 +670,9 @@@ int __init omap44xx_prm_init(void
        return prm_register(&omap44xx_prm_ll_data);
  }
  
--static int __init omap44xx_prm_late_init(void)
++static int omap44xx_prm_late_init(void)
  {
-       if (!cpu_is_omap44xx())
+       if (!(prm_features & PRM_HAS_IO_WAKEUP))
                return 0;
  
        omap44xx_prm_enable_io_wakeup();