From: Tony Lindgren <tony@atomide.com>
Date: Wed, 29 Jun 2011 11:45:16 +0000 (-0700)
Subject: Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilm... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=48cb1258e8b0f8c81cfb699b42326c5b2147b3f8;p=linux-edison.git

Merge branch 'for_3.1/pm-misc' of git://git./linux/kernel/git/khilman/linux-omap-pm into devel-cleanup

Conflicts:
	arch/arm/mach-omap2/pm-debug.c
	arch/arm/mach-omap2/pm.h
---

48cb1258e8b0f8c81cfb699b42326c5b2147b3f8
diff --cc arch/arm/mach-omap2/pm-debug.c
index c56d1d47fec,3feb475bd14..4411163e012
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@@ -37,127 -38,26 +38,7 @@@
  #include "prm2xxx_3xxx.h"
  #include "pm.h"
  
- int omap2_pm_debug;
  u32 enable_off_mode;
- u32 sleep_while_idle;
- 
- #define DUMP_PRM_MOD_REG(mod, reg)    \
- 	regs[reg_count].name = #mod "." #reg; \
- 	regs[reg_count++].val = omap2_prm_read_mod_reg(mod, reg)
- #define DUMP_CM_MOD_REG(mod, reg)     \
- 	regs[reg_count].name = #mod "." #reg; \
- 	regs[reg_count++].val = omap2_cm_read_mod_reg(mod, reg)
- #define DUMP_PRM_REG(reg) \
- 	regs[reg_count].name = #reg; \
- 	regs[reg_count++].val = __raw_readl(reg)
- #define DUMP_CM_REG(reg) \
- 	regs[reg_count].name = #reg; \
- 	regs[reg_count++].val = __raw_readl(reg)
- #define DUMP_INTC_REG(reg, off) \
- 	regs[reg_count].name = #reg; \
- 	regs[reg_count++].val = \
- 			 __raw_readl(OMAP2_L4_IO_ADDRESS(0x480fe000 + (off)))
 -u32 wakeup_timer_seconds;
 -u32 wakeup_timer_milliseconds;
--
- void omap2_pm_dump(int mode, int resume, unsigned int us)
 -void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds)
--{
- 	struct reg {
- 		const char *name;
- 		u32 val;
- 	} regs[32];
- 	int reg_count = 0, i;
- 	const char *s1 = NULL, *s2 = NULL;
- 
- 	if (!resume) {
- #if 0
- 		/* MPU */
- 		DUMP_PRM_MOD_REG(OCP_MOD, OMAP2_PRM_IRQENABLE_MPU_OFFSET);
- 		DUMP_CM_MOD_REG(MPU_MOD, OMAP2_CM_CLKSTCTRL);
- 		DUMP_PRM_MOD_REG(MPU_MOD, OMAP2_PM_PWSTCTRL);
- 		DUMP_PRM_MOD_REG(MPU_MOD, OMAP2_PM_PWSTST);
- 		DUMP_PRM_MOD_REG(MPU_MOD, PM_WKDEP);
- #endif
- #if 0
- 		/* INTC */
- 		DUMP_INTC_REG(INTC_MIR0, 0x0084);
- 		DUMP_INTC_REG(INTC_MIR1, 0x00a4);
- 		DUMP_INTC_REG(INTC_MIR2, 0x00c4);
- #endif
- #if 0
- 		DUMP_CM_MOD_REG(CORE_MOD, CM_FCLKEN1);
- 		if (cpu_is_omap24xx()) {
- 			DUMP_CM_MOD_REG(CORE_MOD, OMAP24XX_CM_FCLKEN2);
- 			DUMP_PRM_MOD_REG(OMAP24XX_GR_MOD,
- 					OMAP2_PRCM_CLKEMUL_CTRL_OFFSET);
- 			DUMP_PRM_MOD_REG(OMAP24XX_GR_MOD,
- 					OMAP2_PRCM_CLKSRC_CTRL_OFFSET);
- 		}
- 		DUMP_CM_MOD_REG(WKUP_MOD, CM_FCLKEN);
- 		DUMP_CM_MOD_REG(CORE_MOD, CM_ICLKEN1);
- 		DUMP_CM_MOD_REG(CORE_MOD, CM_ICLKEN2);
- 		DUMP_CM_MOD_REG(WKUP_MOD, CM_ICLKEN);
- 		DUMP_CM_MOD_REG(PLL_MOD, CM_CLKEN);
- 		DUMP_CM_MOD_REG(PLL_MOD, CM_AUTOIDLE);
- 		DUMP_PRM_MOD_REG(CORE_MOD, OMAP2_PM_PWSTST);
- #endif
- #if 0
- 		/* DSP */
- 		if (cpu_is_omap24xx()) {
- 			DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_FCLKEN);
- 			DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_ICLKEN);
- 			DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_IDLEST);
- 			DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_AUTOIDLE);
- 			DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_CLKSEL);
- 			DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_CM_CLKSTCTRL);
- 			DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_RM_RSTCTRL);
- 			DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_RM_RSTST);
- 			DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_PM_PWSTCTRL);
- 			DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_PM_PWSTST);
- 		}
- #endif
- 	} else {
- 		DUMP_PRM_MOD_REG(CORE_MOD, PM_WKST1);
- 		if (cpu_is_omap24xx())
- 			DUMP_PRM_MOD_REG(CORE_MOD, OMAP24XX_PM_WKST2);
- 		DUMP_PRM_MOD_REG(WKUP_MOD, PM_WKST);
- 		DUMP_PRM_MOD_REG(OCP_MOD, OMAP2_PRCM_IRQSTATUS_MPU_OFFSET);
- #if 1
- 		DUMP_INTC_REG(INTC_PENDING_IRQ0, 0x0098);
- 		DUMP_INTC_REG(INTC_PENDING_IRQ1, 0x00b8);
- 		DUMP_INTC_REG(INTC_PENDING_IRQ2, 0x00d8);
- #endif
- 	}
 -	u32 tick_rate, cycles;
--
- 	switch (mode) {
- 	case 0:
- 		s1 = "full";
- 		s2 = "retention";
- 		break;
- 	case 1:
- 		s1 = "MPU";
- 		s2 = "retention";
- 		break;
- 	case 2:
- 		s1 = "MPU";
- 		s2 = "idle";
- 		break;
- 	}
 -	if (!seconds && !milliseconds)
 -		return;
--
- 	if (!resume)
- #ifdef CONFIG_NO_HZ
- 		printk(KERN_INFO
- 		       "--- Going to %s %s (next timer after %u ms)\n", s1, s2,
- 		       jiffies_to_msecs(get_next_timer_interrupt(jiffies) -
- 					jiffies));
- #else
- 		printk(KERN_INFO "--- Going to %s %s\n", s1, s2);
- #endif
- 	else
- 		printk(KERN_INFO "--- Woke up (slept for %u.%03u ms)\n",
- 			us / 1000, us % 1000);
 -	tick_rate = clk_get_rate(omap_dm_timer_get_fclk(gptimer_wakeup));
 -	cycles = tick_rate * seconds + tick_rate * milliseconds / 1000;
 -	omap_dm_timer_stop(gptimer_wakeup);
 -	omap_dm_timer_set_load_start(gptimer_wakeup, 0, 0xffffffff - cycles);
--
- 	for (i = 0; i < reg_count; i++)
- 		printk(KERN_INFO "%-20s: 0x%08x\n", regs[i].name, regs[i].val);
 -	pr_info("PM: Resume timer in %u.%03u secs"
 -		" (%d ticks at %d ticks/sec.)\n",
 -		seconds, milliseconds, cycles, tick_rate);
--}
  
  #ifdef CONFIG_DEBUG_FS
  #include <linux/debugfs.h>
@@@ -599,25 -296,13 +274,8 @@@ static int __init pm_dbg_init(void
  
  	pwrdm_for_each(pwrdms_setup, (void *)d);
  
- 	pm_dbg_dir = debugfs_create_dir("registers", d);
- 	if (IS_ERR(pm_dbg_dir))
- 		return PTR_ERR(pm_dbg_dir);
- 
- 	(void) debugfs_create_file("current", S_IRUGO,
- 		pm_dbg_dir, (void *)0, &debug_reg_fops);
- 
- 	for (i = 0; i < PM_DBG_MAX_REG_SETS; i++)
- 		if (pm_dbg_reg_set[i] != NULL) {
- 			sprintf(name, "%d", i+1);
- 			(void) debugfs_create_file(name, S_IRUGO,
- 				pm_dbg_dir, (void *)(i+1), &debug_reg_fops);
- 
- 		}
- 
  	(void) debugfs_create_file("enable_off_mode", S_IRUGO | S_IWUSR, d,
  				   &enable_off_mode, &pm_dbg_option_fops);
- 	(void) debugfs_create_file("sleep_while_idle", S_IRUGO | S_IWUSR, d,
- 				   &sleep_while_idle, &pm_dbg_option_fops);
 -	(void) debugfs_create_file("wakeup_timer_seconds", S_IRUGO | S_IWUSR, d,
 -				   &wakeup_timer_seconds, &pm_dbg_option_fops);
 -	(void) debugfs_create_file("wakeup_timer_milliseconds",
 -			S_IRUGO | S_IWUSR, d, &wakeup_timer_milliseconds,
 -			&pm_dbg_option_fops);
  	pm_dbg_init_done = 1;
  
  	return 0;
diff --cc arch/arm/mach-omap2/pm.h
index c3a367e3d01,ea58f5dd240..babac19e3ec
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
@@@ -60,16 -60,16 +60,10 @@@ inline void omap3_pm_init_cpuidle(struc
  extern int omap3_pm_get_suspend_state(struct powerdomain *pwrdm);
  extern int omap3_pm_set_suspend_state(struct powerdomain *pwrdm, int state);
  
 -extern u32 wakeup_timer_seconds;
 -extern u32 wakeup_timer_milliseconds;
 -extern struct omap_dm_timer *gptimer_wakeup;
 -
  #ifdef CONFIG_PM_DEBUG
- extern void omap2_pm_dump(int mode, int resume, unsigned int us);
- extern int omap2_pm_debug;
 -extern void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds);
  extern u32 enable_off_mode;
- extern u32 sleep_while_idle;
  #else
- #define omap2_pm_dump(mode, resume, us)		do {} while (0);
- #define omap2_pm_debug				0
 -#define omap2_pm_wakeup_on_timer(seconds, milliseconds)	do {} while (0);
  #define enable_off_mode 0
- #define sleep_while_idle 0
  #endif
  
  #if defined(CONFIG_PM_DEBUG) && defined(CONFIG_DEBUG_FS)