Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 20d5d5514981f9a68832bffb27a698545ecba77a

Authored by Kevin Hilman
1 parent 3a7b7bdd24
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

OMAP2: PM debug: remove register dumping 

Tested-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>

Showing 3 changed files with 2 additions and 127 deletions Side-by-side Diff

arch/arm/mach-omap2/pm-debug.c
Diff comments   View file @ 20d5d55
... ... @@ -38,128 +38,9 @@
38 38 #include "prm2xxx_3xxx.h"
39 39 #include "pm.h"
40 40  
41   -int omap2_pm_debug;
42 41 u32 enable_off_mode;
43 42 u32 wakeup_timer_seconds;
44 43 u32 wakeup_timer_milliseconds;
45   -
46   -#define DUMP_PRM_MOD_REG(mod, reg) \
47   - regs[reg_count].name = #mod "." #reg; \
48   - regs[reg_count++].val = omap2_prm_read_mod_reg(mod, reg)
49   -#define DUMP_CM_MOD_REG(mod, reg) \
50   - regs[reg_count].name = #mod "." #reg; \
51   - regs[reg_count++].val = omap2_cm_read_mod_reg(mod, reg)
52   -#define DUMP_PRM_REG(reg) \
53   - regs[reg_count].name = #reg; \
54   - regs[reg_count++].val = __raw_readl(reg)
55   -#define DUMP_CM_REG(reg) \
56   - regs[reg_count].name = #reg; \
57   - regs[reg_count++].val = __raw_readl(reg)
58   -#define DUMP_INTC_REG(reg, off) \
59   - regs[reg_count].name = #reg; \
60   - regs[reg_count++].val = \
61   - __raw_readl(OMAP2_L4_IO_ADDRESS(0x480fe000 + (off)))
62   -
63   -void omap2_pm_dump(int mode, int resume, unsigned int us)
64   -{
65   - struct reg {
66   - const char *name;
67   - u32 val;
68   - } regs[32];
69   - int reg_count = 0, i;
70   - const char *s1 = NULL, *s2 = NULL;
71   -
72   - if (!resume) {
73   -#if 0
74   - /* MPU */
75   - DUMP_PRM_MOD_REG(OCP_MOD, OMAP2_PRM_IRQENABLE_MPU_OFFSET);
76   - DUMP_CM_MOD_REG(MPU_MOD, OMAP2_CM_CLKSTCTRL);
77   - DUMP_PRM_MOD_REG(MPU_MOD, OMAP2_PM_PWSTCTRL);
78   - DUMP_PRM_MOD_REG(MPU_MOD, OMAP2_PM_PWSTST);
79   - DUMP_PRM_MOD_REG(MPU_MOD, PM_WKDEP);
80   -#endif
81   -#if 0
82   - /* INTC */
83   - DUMP_INTC_REG(INTC_MIR0, 0x0084);
84   - DUMP_INTC_REG(INTC_MIR1, 0x00a4);
85   - DUMP_INTC_REG(INTC_MIR2, 0x00c4);
86   -#endif
87   -#if 0
88   - DUMP_CM_MOD_REG(CORE_MOD, CM_FCLKEN1);
89   - if (cpu_is_omap24xx()) {
90   - DUMP_CM_MOD_REG(CORE_MOD, OMAP24XX_CM_FCLKEN2);
91   - DUMP_PRM_MOD_REG(OMAP24XX_GR_MOD,
92   - OMAP2_PRCM_CLKEMUL_CTRL_OFFSET);
93   - DUMP_PRM_MOD_REG(OMAP24XX_GR_MOD,
94   - OMAP2_PRCM_CLKSRC_CTRL_OFFSET);
95   - }
96   - DUMP_CM_MOD_REG(WKUP_MOD, CM_FCLKEN);
97   - DUMP_CM_MOD_REG(CORE_MOD, CM_ICLKEN1);
98   - DUMP_CM_MOD_REG(CORE_MOD, CM_ICLKEN2);
99   - DUMP_CM_MOD_REG(WKUP_MOD, CM_ICLKEN);
100   - DUMP_CM_MOD_REG(PLL_MOD, CM_CLKEN);
101   - DUMP_CM_MOD_REG(PLL_MOD, CM_AUTOIDLE);
102   - DUMP_PRM_MOD_REG(CORE_MOD, OMAP2_PM_PWSTST);
103   -#endif
104   -#if 0
105   - /* DSP */
106   - if (cpu_is_omap24xx()) {
107   - DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_FCLKEN);
108   - DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_ICLKEN);
109   - DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_IDLEST);
110   - DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_AUTOIDLE);
111   - DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, CM_CLKSEL);
112   - DUMP_CM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_CM_CLKSTCTRL);
113   - DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_RM_RSTCTRL);
114   - DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_RM_RSTST);
115   - DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_PM_PWSTCTRL);
116   - DUMP_PRM_MOD_REG(OMAP24XX_DSP_MOD, OMAP2_PM_PWSTST);
117   - }
118   -#endif
119   - } else {
120   - DUMP_PRM_MOD_REG(CORE_MOD, PM_WKST1);
121   - if (cpu_is_omap24xx())
122   - DUMP_PRM_MOD_REG(CORE_MOD, OMAP24XX_PM_WKST2);
123   - DUMP_PRM_MOD_REG(WKUP_MOD, PM_WKST);
124   - DUMP_PRM_MOD_REG(OCP_MOD, OMAP2_PRCM_IRQSTATUS_MPU_OFFSET);
125   -#if 1
126   - DUMP_INTC_REG(INTC_PENDING_IRQ0, 0x0098);
127   - DUMP_INTC_REG(INTC_PENDING_IRQ1, 0x00b8);
128   - DUMP_INTC_REG(INTC_PENDING_IRQ2, 0x00d8);
129   -#endif
130   - }
131   -
132   - switch (mode) {
133   - case 0:
134   - s1 = "full";
135   - s2 = "retention";
136   - break;
137   - case 1:
138   - s1 = "MPU";
139   - s2 = "retention";
140   - break;
141   - case 2:
142   - s1 = "MPU";
143   - s2 = "idle";
144   - break;
145   - }
146   -
147   - if (!resume)
148   -#ifdef CONFIG_NO_HZ
149   - printk(KERN_INFO
150   - "--- Going to %s %s (next timer after %u ms)\n", s1, s2,
151   - jiffies_to_msecs(get_next_timer_interrupt(jiffies) -
152   - jiffies));
153   -#else
154   - printk(KERN_INFO "--- Going to %s %s\n", s1, s2);
155   -#endif
156   - else
157   - printk(KERN_INFO "--- Woke up (slept for %u.%03u ms)\n",
158   - us / 1000, us % 1000);
159   -
160   - for (i = 0; i < reg_count; i++)
161   - printk(KERN_INFO "%-20s: 0x%08x\n", regs[i].name, regs[i].val);
162   -}
163 44  
164 45 void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds)
165 46 {
arch/arm/mach-omap2/pm.h
Diff comments   View file @ 20d5d55
... ... @@ -65,14 +65,10 @@
65 65 extern struct omap_dm_timer *gptimer_wakeup;
66 66  
67 67 #ifdef CONFIG_PM_DEBUG
68   -extern void omap2_pm_dump(int mode, int resume, unsigned int us);
69 68 extern void omap2_pm_wakeup_on_timer(u32 seconds, u32 milliseconds);
70   -extern int omap2_pm_debug;
71 69 extern u32 enable_off_mode;
72 70 #else
73   -#define omap2_pm_dump(mode, resume, us) do {} while (0);
74 71 #define omap2_pm_wakeup_on_timer(seconds, milliseconds) do {} while (0);
75   -#define omap2_pm_debug 0
76 72 #define enable_off_mode 0
77 73 #endif
78 74  
arch/arm/mach-omap2/pm24xx.c
Diff comments   View file @ 20d5d55
... ... @@ -53,6 +53,8 @@
53 53 #include "powerdomain.h"
54 54 #include "clockdomain.h"
55 55  
  56 +static int omap2_pm_debug;
  57 +
56 58 #ifdef CONFIG_SUSPEND
57 59 static suspend_state_t suspend_state = PM_SUSPEND_ON;
58 60 static inline bool is_suspending(void)
... ... @@ -123,7 +125,6 @@
123 125 omap2_gpio_prepare_for_idle(0);
124 126  
125 127 if (omap2_pm_debug) {
126   - omap2_pm_dump(0, 0, 0);
127 128 getnstimeofday(&ts_preidle);
128 129 }
129 130  
... ... @@ -160,7 +161,6 @@
160 161 getnstimeofday(&ts_postidle);
161 162 ts_idle = timespec_sub(ts_postidle, ts_preidle);
162 163 tmp = timespec_to_ns(&ts_idle) * NSEC_PER_USEC;
163   - omap2_pm_dump(0, 1, tmp);
164 164 }
165 165 omap2_gpio_resume_after_idle();
166 166  
... ... @@ -247,7 +247,6 @@
247 247 }
248 248  
249 249 if (omap2_pm_debug) {
250   - omap2_pm_dump(only_idle ? 2 : 1, 0, 0);
251 250 getnstimeofday(&ts_preidle);
252 251 }
253 252  
... ... @@ -259,7 +258,6 @@
259 258 getnstimeofday(&ts_postidle);
260 259 ts_idle = timespec_sub(ts_postidle, ts_preidle);
261 260 tmp = timespec_to_ns(&ts_idle) * NSEC_PER_USEC;
262   - omap2_pm_dump(only_idle ? 2 : 1, 1, tmp);
263 261 }
264 262 }
265 263