projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branches 'remotes/origin/pwrdm_clkdm_b_2.6.39', 'remotes/origin/pwrdm_ad...
[deliverable/linux.git]
/
arch
/
arm
/
mach-omap2
/
powerdomains2xxx_data.c
diff --git
a/arch/arm/mach-omap2/powerdomains2xxx_data.c
b/arch/arm/mach-omap2/powerdomains2xxx_data.c
index 9b1a33500577a6023d082f19a40fddd5462bab27..cc389fb2005d9c15ca54ca9430a5c23944d548c9 100644
(file)
--- a/
arch/arm/mach-omap2/powerdomains2xxx_data.c
+++ b/
arch/arm/mach-omap2/powerdomains2xxx_data.c
@@
-2,7
+2,7
@@
* OMAP2XXX powerdomain definitions
*
* Copyright (C) 2007-2008 Texas Instruments, Inc.
* OMAP2XXX powerdomain definitions
*
* Copyright (C) 2007-2008 Texas Instruments, Inc.
- * Copyright (C) 2007-201
0
Nokia Corporation
+ * Copyright (C) 2007-201
1
Nokia Corporation
*
* Paul Walmsley, Jouni Högander
*
*
* Paul Walmsley, Jouni Högander
*
@@
-30,13
+30,13
@@
static struct powerdomain dsp_pwrdm = {
.prcm_offs = OMAP24XX_DSP_MOD,
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX),
.pwrsts = PWRSTS_OFF_RET_ON,
.prcm_offs = OMAP24XX_DSP_MOD,
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX),
.pwrsts = PWRSTS_OFF_RET_ON,
- .pwrsts_logic_ret = PWR
DM_POWER
_RET,
+ .pwrsts_logic_ret = PWR
STS
_RET,
.banks = 1,
.pwrsts_mem_ret = {
.banks = 1,
.pwrsts_mem_ret = {
- [0] = PWR
DM_POWER
_RET,
+ [0] = PWR
STS
_RET,
},
.pwrsts_mem_on = {
},
.pwrsts_mem_on = {
- [0] = PWR
DM_POWER
_ON,
+ [0] = PWR
STS
_ON,
},
};
},
};
@@
-48,10
+48,10
@@
static struct powerdomain mpu_24xx_pwrdm = {
.pwrsts_logic_ret = PWRSTS_OFF_RET,
.banks = 1,
.pwrsts_mem_ret = {
.pwrsts_logic_ret = PWRSTS_OFF_RET,
.banks = 1,
.pwrsts_mem_ret = {
- [0] = PWR
DM_POWER
_RET,
+ [0] = PWR
STS
_RET,
},
.pwrsts_mem_on = {
},
.pwrsts_mem_on = {
- [0] = PWR
DM_POWER
_ON,
+ [0] = PWR
STS
_ON,
},
};
},
};
@@
-78,7
+78,7
@@
static struct powerdomain core_24xx_pwrdm = {
* 2430-specific powerdomains
*/
* 2430-specific powerdomains
*/
-#ifdef CONFIG_
ARCH
_OMAP2430
+#ifdef CONFIG_
SOC
_OMAP2430
/* XXX 2430 KILLDOMAINWKUP bit? No current users apparently */
/* XXX 2430 KILLDOMAINWKUP bit? No current users apparently */
@@
-87,17
+87,17
@@
static struct powerdomain mdm_pwrdm = {
.prcm_offs = OMAP2430_MDM_MOD,
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
.pwrsts = PWRSTS_OFF_RET_ON,
.prcm_offs = OMAP2430_MDM_MOD,
.omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430),
.pwrsts = PWRSTS_OFF_RET_ON,
- .pwrsts_logic_ret = PWR
DM_POWER
_RET,
+ .pwrsts_logic_ret = PWR
STS
_RET,
.banks = 1,
.pwrsts_mem_ret = {
.banks = 1,
.pwrsts_mem_ret = {
- [0] = PWR
DM_POWER
_RET, /* MEMRETSTATE */
+ [0] = PWR
STS
_RET, /* MEMRETSTATE */
},
.pwrsts_mem_on = {
},
.pwrsts_mem_on = {
- [0] = PWR
DM_POWER
_ON, /* MEMONSTATE */
+ [0] = PWR
STS
_ON, /* MEMONSTATE */
},
};
},
};
-#endif /* CONFIG_
ARCH
_OMAP2430 */
+#endif /* CONFIG_
SOC
_OMAP2430 */
/* As powerdomains are added or removed above, this list must also be changed */
static struct powerdomain *powerdomains_omap2xxx[] __initdata = {
/* As powerdomains are added or removed above, this list must also be changed */
static struct powerdomain *powerdomains_omap2xxx[] __initdata = {
@@
-111,7
+111,7
@@
static struct powerdomain *powerdomains_omap2xxx[] __initdata = {
&core_24xx_pwrdm,
#endif
&core_24xx_pwrdm,
#endif
-#ifdef CONFIG_
ARCH
_OMAP2430
+#ifdef CONFIG_
SOC
_OMAP2430
&mdm_pwrdm,
#endif
NULL
&mdm_pwrdm,
#endif
NULL
This page took
0.025797 seconds
and
5
git commands to generate.