projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[cascardo/linux.git]
/
arch
/
arm
/
mach-imx
/
pm-imx3.c
diff --git
a/arch/arm/mach-imx/pm-imx3.c
b/arch/arm/mach-imx/pm-imx3.c
index
6a07006
..
94c0898
100644
(file)
--- a/
arch/arm/mach-imx/pm-imx3.c
+++ b/
arch/arm/mach-imx/pm-imx3.c
@@
-22,14
+22,14
@@
*/
void mx3_cpu_lp_set(enum mx3_cpu_pwr_mode mode)
{
*/
void mx3_cpu_lp_set(enum mx3_cpu_pwr_mode mode)
{
- int reg =
__raw
_readl(mx3_ccm_base + MXC_CCM_CCMR);
+ int reg =
imx
_readl(mx3_ccm_base + MXC_CCM_CCMR);
reg &= ~MXC_CCM_CCMR_LPM_MASK;
switch (mode) {
case MX3_WAIT:
if (cpu_is_mx35())
reg |= MXC_CCM_CCMR_LPM_WAIT_MX35;
reg &= ~MXC_CCM_CCMR_LPM_MASK;
switch (mode) {
case MX3_WAIT:
if (cpu_is_mx35())
reg |= MXC_CCM_CCMR_LPM_WAIT_MX35;
-
__raw
_writel(reg, mx3_ccm_base + MXC_CCM_CCMR);
+
imx
_writel(reg, mx3_ccm_base + MXC_CCM_CCMR);
break;
default:
pr_err("Unknown cpu power mode: %d\n", mode);
break;
default:
pr_err("Unknown cpu power mode: %d\n", mode);