From: Tony Lindgren <tony@atomide.com>
Date: Fri, 16 May 2014 22:26:22 +0000 (-0700)
Subject: Merge tag 'for-v3.16/prcm-cleanup-a' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=ea351c1603df0607b68eb4663b82ba7a70519d2e;p=linux-beck.git

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

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.
---

ea351c1603df0607b68eb4663b82ba7a70519d2e
diff --cc arch/arm/mach-omap2/cm44xx.c
index 30b6d9743b73,c440ba753882..fe5cc7bae489
--- a/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/prm3xxx.c
index 7721990d2006,4a792fd1363c..4bd7a2dca8af
--- a/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 94a43b3cf0f0,edf49ef867e1..a7f6ea27180a
--- a/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();