← Back to branch summary

~ubuntu-branches/ubuntu/trusty/linux-linaro-omap/trusty

« back to all changes in this revision

Viewing changes to arch/arm/mach-pxa/pxa3xx.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-57i0gl3v99b3lkfg
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/arm/mach-pxa/pxa3xx.c
24
24
#include <linux/i2c/pxa-i2c.h>
25
25
 
26
26
#include <asm/mach/map.h>
 
27
#include <asm/suspend.h>
27
28
#include <mach/hardware.h>
28
29
#include <mach/gpio.h>
29
30
#include <mach/pxa3xx-regs.h>
141
142
{
142
143
        volatile unsigned long *p = (volatile void *)0xc0000000;
143
144
        unsigned long saved_data = *p;
144
 
 
145
 
        extern void pxa3xx_cpu_suspend(long);
 
145
#ifndef CONFIG_IWMMXT
 
146
        u64 acc0;
 
147
 
 
148
        asm volatile("mra %Q0, %R0, acc0" : "=r" (acc0));
 
149
#endif
 
150
 
 
151
        extern int pxa3xx_finish_suspend(unsigned long);
146
152
 
147
153
        /* resuming from D2 requires the HSIO2/BOOT/TPM clocks enabled */
148
154
        CKENA |= (1 << CKEN_BOOT) | (1 << CKEN_TPM);
162
168
        /* overwrite with the resume address */
163
169
        *p = virt_to_phys(cpu_resume);
164
170
 
165
 
        pxa3xx_cpu_suspend(PLAT_PHYS_OFFSET - PAGE_OFFSET);
 
171
        cpu_suspend(0, pxa3xx_finish_suspend);
166
172
 
167
173
        *p = saved_data;
168
174
 
169
175
        AD3ER = 0;
 
176
 
 
177
#ifndef CONFIG_IWMMXT
 
178
        asm volatile("mar acc0, %Q0, %R0" : "=r" (acc0));
 
179
#endif
170
180
}
171
181
 
172
182
static void pxa3xx_cpu_pm_enter(suspend_state_t state)