diff options
author | Paul Walmsley <paul@pwsan.com> | 2008-08-19 04:08:42 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2008-08-19 04:08:42 -0400 |
commit | fe6a58f8f50500a4c9a82da4a9bdae41c1500fa0 (patch) | |
tree | d088e9400557dc877c134897b287b61fd69522c7 /arch/arm/mach-omap2 | |
parent | 9717100f77538bbee54d2b5c293fd829b252d2a6 (diff) |
ARM: OMAP2: Powerdomain: Add OMAP2 powerdomains
Add OMAP2-specific powerdomains.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r-- | arch/arm/mach-omap2/powerdomains.h | 14 | ||||
-rw-r--r-- | arch/arm/mach-omap2/powerdomains24xx.h | 200 | ||||
-rw-r--r-- | arch/arm/mach-omap2/prm-regbits-24xx.h | 12 |
3 files changed, 222 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/powerdomains.h b/arch/arm/mach-omap2/powerdomains.h index 1936df23559a..325e2ba04067 100644 --- a/arch/arm/mach-omap2/powerdomains.h +++ b/arch/arm/mach-omap2/powerdomains.h | |||
@@ -98,6 +98,10 @@ static struct pwrdm_dep gfx_sgx_wkdeps[] = { | |||
98 | { NULL }, | 98 | { NULL }, |
99 | }; | 99 | }; |
100 | 100 | ||
101 | |||
102 | #include "powerdomains24xx.h" | ||
103 | |||
104 | |||
101 | /* | 105 | /* |
102 | * OMAP2/3 common powerdomains | 106 | * OMAP2/3 common powerdomains |
103 | */ | 107 | */ |
@@ -140,6 +144,16 @@ static struct powerdomain *powerdomains_omap[] __initdata = { | |||
140 | &gfx_pwrdm, | 144 | &gfx_pwrdm, |
141 | &wkup_pwrdm, | 145 | &wkup_pwrdm, |
142 | 146 | ||
147 | #ifdef CONFIG_ARCH_OMAP24XX | ||
148 | &dsp_pwrdm, | ||
149 | &mpu_24xx_pwrdm, | ||
150 | &core_24xx_pwrdm, | ||
151 | #endif | ||
152 | |||
153 | #ifdef CONFIG_ARCH_OMAP2430 | ||
154 | &mdm_pwrdm, | ||
155 | #endif | ||
156 | |||
143 | NULL | 157 | NULL |
144 | }; | 158 | }; |
145 | 159 | ||
diff --git a/arch/arm/mach-omap2/powerdomains24xx.h b/arch/arm/mach-omap2/powerdomains24xx.h new file mode 100644 index 000000000000..9f08dc3f7fd2 --- /dev/null +++ b/arch/arm/mach-omap2/powerdomains24xx.h | |||
@@ -0,0 +1,200 @@ | |||
1 | /* | ||
2 | * OMAP24XX powerdomain definitions | ||
3 | * | ||
4 | * Copyright (C) 2007-2008 Texas Instruments, Inc. | ||
5 | * Copyright (C) 2007-2008 Nokia Corporation | ||
6 | * | ||
7 | * Written by Paul Walmsley | ||
8 | * Debugging and integration fixes by Jouni Högander | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | */ | ||
14 | |||
15 | #ifndef ARCH_ARM_MACH_OMAP2_POWERDOMAINS24XX | ||
16 | #define ARCH_ARM_MACH_OMAP2_POWERDOMAINS24XX | ||
17 | |||
18 | /* | ||
19 | * N.B. If powerdomains are added or removed from this file, update | ||
20 | * the array in mach-omap2/powerdomains.h. | ||
21 | */ | ||
22 | |||
23 | #include <mach/powerdomain.h> | ||
24 | |||
25 | #include "prcm-common.h" | ||
26 | #include "prm.h" | ||
27 | #include "prm-regbits-24xx.h" | ||
28 | #include "cm.h" | ||
29 | #include "cm-regbits-24xx.h" | ||
30 | |||
31 | /* 24XX powerdomains and dependencies */ | ||
32 | |||
33 | #ifdef CONFIG_ARCH_OMAP24XX | ||
34 | |||
35 | |||
36 | /* Wakeup dependency source arrays */ | ||
37 | |||
38 | /* | ||
39 | * 2420/2430 PM_WKDEP_DSP: CORE, MPU, WKUP | ||
40 | * 2430 PM_WKDEP_MDM: same as above | ||
41 | */ | ||
42 | static struct pwrdm_dep dsp_mdm_24xx_wkdeps[] = { | ||
43 | { | ||
44 | .pwrdm_name = "core_pwrdm", | ||
45 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX) | ||
46 | }, | ||
47 | { | ||
48 | .pwrdm_name = "mpu_pwrdm", | ||
49 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX) | ||
50 | }, | ||
51 | { | ||
52 | .pwrdm_name = "wkup_pwrdm", | ||
53 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX) | ||
54 | }, | ||
55 | { NULL }, | ||
56 | }; | ||
57 | |||
58 | /* | ||
59 | * 2420 PM_WKDEP_MPU: CORE, DSP, WKUP | ||
60 | * 2430 adds MDM | ||
61 | */ | ||
62 | static struct pwrdm_dep mpu_24xx_wkdeps[] = { | ||
63 | { | ||
64 | .pwrdm_name = "core_pwrdm", | ||
65 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX) | ||
66 | }, | ||
67 | { | ||
68 | .pwrdm_name = "dsp_pwrdm", | ||
69 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX) | ||
70 | }, | ||
71 | { | ||
72 | .pwrdm_name = "wkup_pwrdm", | ||
73 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX) | ||
74 | }, | ||
75 | { | ||
76 | .pwrdm_name = "mdm_pwrdm", | ||
77 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430) | ||
78 | }, | ||
79 | { NULL }, | ||
80 | }; | ||
81 | |||
82 | /* | ||
83 | * 2420 PM_WKDEP_CORE: DSP, GFX, MPU, WKUP | ||
84 | * 2430 adds MDM | ||
85 | */ | ||
86 | static struct pwrdm_dep core_24xx_wkdeps[] = { | ||
87 | { | ||
88 | .pwrdm_name = "dsp_pwrdm", | ||
89 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX) | ||
90 | }, | ||
91 | { | ||
92 | .pwrdm_name = "gfx_pwrdm", | ||
93 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX) | ||
94 | }, | ||
95 | { | ||
96 | .pwrdm_name = "mpu_pwrdm", | ||
97 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX) | ||
98 | }, | ||
99 | { | ||
100 | .pwrdm_name = "wkup_pwrdm", | ||
101 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX) | ||
102 | }, | ||
103 | { | ||
104 | .pwrdm_name = "mdm_pwrdm", | ||
105 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430) | ||
106 | }, | ||
107 | { NULL }, | ||
108 | }; | ||
109 | |||
110 | |||
111 | /* Powerdomains */ | ||
112 | |||
113 | static struct powerdomain dsp_pwrdm = { | ||
114 | .name = "dsp_pwrdm", | ||
115 | .prcm_offs = OMAP24XX_DSP_MOD, | ||
116 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX), | ||
117 | .dep_bit = OMAP24XX_PM_WKDEP_MPU_EN_DSP_SHIFT, | ||
118 | .wkdep_srcs = dsp_mdm_24xx_wkdeps, | ||
119 | .pwrsts = PWRSTS_OFF_RET_ON, | ||
120 | .pwrsts_logic_ret = PWRDM_POWER_RET, | ||
121 | .banks = 1, | ||
122 | .pwrsts_mem_ret = { | ||
123 | [0] = PWRDM_POWER_RET, | ||
124 | }, | ||
125 | .pwrsts_mem_on = { | ||
126 | [0] = PWRDM_POWER_ON, | ||
127 | }, | ||
128 | }; | ||
129 | |||
130 | static struct powerdomain mpu_24xx_pwrdm = { | ||
131 | .name = "mpu_pwrdm", | ||
132 | .prcm_offs = MPU_MOD, | ||
133 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX), | ||
134 | .dep_bit = OMAP24XX_EN_MPU_SHIFT, | ||
135 | .wkdep_srcs = mpu_24xx_wkdeps, | ||
136 | .pwrsts = PWRSTS_OFF_RET_ON, | ||
137 | .pwrsts_logic_ret = PWRSTS_OFF_RET, | ||
138 | .banks = 1, | ||
139 | .pwrsts_mem_ret = { | ||
140 | [0] = PWRDM_POWER_RET, | ||
141 | }, | ||
142 | .pwrsts_mem_on = { | ||
143 | [0] = PWRDM_POWER_ON, | ||
144 | }, | ||
145 | }; | ||
146 | |||
147 | static struct powerdomain core_24xx_pwrdm = { | ||
148 | .name = "core_pwrdm", | ||
149 | .prcm_offs = CORE_MOD, | ||
150 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP24XX), | ||
151 | .wkdep_srcs = core_24xx_wkdeps, | ||
152 | .pwrsts = PWRSTS_OFF_RET_ON, | ||
153 | .dep_bit = OMAP24XX_EN_CORE_SHIFT, | ||
154 | .banks = 3, | ||
155 | .pwrsts_mem_ret = { | ||
156 | [0] = PWRSTS_OFF_RET, /* MEM1RETSTATE */ | ||
157 | [1] = PWRSTS_OFF_RET, /* MEM2RETSTATE */ | ||
158 | [2] = PWRSTS_OFF_RET, /* MEM3RETSTATE */ | ||
159 | }, | ||
160 | .pwrsts_mem_on = { | ||
161 | [0] = PWRSTS_OFF_RET_ON, /* MEM1ONSTATE */ | ||
162 | [1] = PWRSTS_OFF_RET_ON, /* MEM2ONSTATE */ | ||
163 | [2] = PWRSTS_OFF_RET_ON, /* MEM3ONSTATE */ | ||
164 | }, | ||
165 | }; | ||
166 | |||
167 | #endif /* CONFIG_ARCH_OMAP24XX */ | ||
168 | |||
169 | |||
170 | |||
171 | /* | ||
172 | * 2430-specific powerdomains | ||
173 | */ | ||
174 | |||
175 | #ifdef CONFIG_ARCH_OMAP2430 | ||
176 | |||
177 | /* XXX 2430 KILLDOMAINWKUP bit? No current users apparently */ | ||
178 | |||
179 | /* Another case of bit name collisions between several registers: EN_MDM */ | ||
180 | static struct powerdomain mdm_pwrdm = { | ||
181 | .name = "mdm_pwrdm", | ||
182 | .prcm_offs = OMAP2430_MDM_MOD, | ||
183 | .omap_chip = OMAP_CHIP_INIT(CHIP_IS_OMAP2430), | ||
184 | .dep_bit = OMAP2430_PM_WKDEP_MPU_EN_MDM_SHIFT, | ||
185 | .wkdep_srcs = dsp_mdm_24xx_wkdeps, | ||
186 | .pwrsts = PWRSTS_OFF_RET_ON, | ||
187 | .pwrsts_logic_ret = PWRDM_POWER_RET, | ||
188 | .banks = 1, | ||
189 | .pwrsts_mem_ret = { | ||
190 | [0] = PWRDM_POWER_RET, /* MEMRETSTATE */ | ||
191 | }, | ||
192 | .pwrsts_mem_on = { | ||
193 | [0] = PWRDM_POWER_ON, /* MEMONSTATE */ | ||
194 | }, | ||
195 | }; | ||
196 | |||
197 | #endif /* CONFIG_ARCH_OMAP2430 */ | ||
198 | |||
199 | |||
200 | #endif | ||
diff --git a/arch/arm/mach-omap2/prm-regbits-24xx.h b/arch/arm/mach-omap2/prm-regbits-24xx.h index c6d17a3378ec..4002051c20b9 100644 --- a/arch/arm/mach-omap2/prm-regbits-24xx.h +++ b/arch/arm/mach-omap2/prm-regbits-24xx.h | |||
@@ -29,8 +29,10 @@ | |||
29 | #define OMAP24XX_WKUP1_EN (1 << 0) | 29 | #define OMAP24XX_WKUP1_EN (1 << 0) |
30 | 30 | ||
31 | /* PM_WKDEP_GFX, PM_WKDEP_MPU, PM_WKDEP_DSP, PM_WKDEP_MDM shared bits */ | 31 | /* PM_WKDEP_GFX, PM_WKDEP_MPU, PM_WKDEP_DSP, PM_WKDEP_MDM shared bits */ |
32 | #define OMAP24XX_EN_MPU (1 << 1) | 32 | #define OMAP24XX_EN_MPU_SHIFT 1 |
33 | #define OMAP24XX_EN_CORE (1 << 0) | 33 | #define OMAP24XX_EN_MPU_MASK (1 << 1) |
34 | #define OMAP24XX_EN_CORE_SHIFT 0 | ||
35 | #define OMAP24XX_EN_CORE_MASK (1 << 0) | ||
34 | 36 | ||
35 | /* | 37 | /* |
36 | * PM_PWSTCTRL_MPU, PM_PWSTCTRL_GFX, PM_PWSTCTRL_DSP, PM_PWSTCTRL_MDM | 38 | * PM_PWSTCTRL_MPU, PM_PWSTCTRL_GFX, PM_PWSTCTRL_DSP, PM_PWSTCTRL_MDM |
@@ -140,8 +142,10 @@ | |||
140 | /* 2430 calls GLOBALWMPU_RST "GLOBALWARM_RST" instead */ | 142 | /* 2430 calls GLOBALWMPU_RST "GLOBALWARM_RST" instead */ |
141 | 143 | ||
142 | /* PM_WKDEP_MPU specific bits */ | 144 | /* PM_WKDEP_MPU specific bits */ |
143 | #define OMAP2430_PM_WKDEP_MPU_EN_MDM (1 << 5) | 145 | #define OMAP2430_PM_WKDEP_MPU_EN_MDM_SHIFT 5 |
144 | #define OMAP24XX_PM_WKDEP_MPU_EN_DSP (1 << 2) | 146 | #define OMAP2430_PM_WKDEP_MPU_EN_MDM_MASK (1 << 5) |
147 | #define OMAP24XX_PM_WKDEP_MPU_EN_DSP_SHIFT 2 | ||
148 | #define OMAP24XX_PM_WKDEP_MPU_EN_DSP_MASK (1 << 2) | ||
145 | 149 | ||
146 | /* PM_EVGENCTRL_MPU specific bits */ | 150 | /* PM_EVGENCTRL_MPU specific bits */ |
147 | 151 | ||