diff options
author | Nishanth Menon <nm@ti.com> | 2009-11-22 13:10:56 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:24:32 -0500 |
commit | 2456a10fb3a9b8c9e970b05e6c1370201675da0a (patch) | |
tree | 5e213b07b95f0e4a627a29346a6dd0aecce8b78e | |
parent | 048f4bd7607eb714d4831f90dea6fd27eac9e494 (diff) |
omap3: Introduce OMAP3630
OMAP3630 is the latest in the family of OMAP3 devices
and among the changes it introduces are:
New OPP levels for new voltage and frequency levels. a bunch of
Bug fixes to various modules feature additions, notably with ISP,
sDMA etc.
Details about the chip is available here:
http://focus.ti.com/general/docs/wtbu/wtbuproductcontent.tsp?templateId=6123&navigationId=12836&contentId=52606
Strategy used:
Strategy to introduce this device into Linux was discussed here:
Ref: http://marc.info/?t=125343303400003&r=1&w=2
Two approaches were available:
a) Consider 3630 generation of devices as a new family of silicon
b) Consider 3630 as an offshoot of 3430 family of devices
As a common consensus, (b) seems to be more valid for 3630 as:
* There are changes which are easily handled by using "FEATURES"
infrastructure.
For details how to do this, see thread:
http://marc.info/?t=125050998500001&r=1&w=2
* Most of existing 34xx infrastructure can be reused(almost 90%+)
- so no ugly if (cpu_is_omap34xx() || cpu_is_omap36xx())
all over the place
- lesser chance of bugs due to reuse of proven code flow
- 36xx specific handling can still be done where required
within the existing infrastructure
NOTE:
* If additional 34xx series are added, OMAP3430_REV_ESXXXX can be
added on top of the existing 3630 ones are renumbered
This patch was tested on SDP3430, boot tested on 3630 platform using
3430sdp defconfig
Signed-off-by: Madhusudhan Chikkature Rajashekar <madhu.cr@ti.com>
Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>
Cc: Allen Pais <allen.pais@ti.com>
Cc: Anand Gadiyar <gadiyar@ti.com>
Cc: Benoit Cousson <b-cousson@ti.com>
Cc: Felipe Balbi <felipe.balbi@nokia.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Sanjeev Premi <premi@ti.com>
Cc: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Sergio Alberto Aguirre Rodriguez <saaguirre@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r-- | arch/arm/mach-omap2/id.c | 24 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/cpu.h | 6 |
2 files changed, 27 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 88999eaf91b6..1c1511220890 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
@@ -209,7 +209,9 @@ void __init omap3_check_revision(void) | |||
209 | hawkeye = (idcode >> 12) & 0xffff; | 209 | hawkeye = (idcode >> 12) & 0xffff; |
210 | rev = (idcode >> 28) & 0xff; | 210 | rev = (idcode >> 28) & 0xff; |
211 | 211 | ||
212 | if (hawkeye == 0xb7ae) { | 212 | switch (hawkeye) { |
213 | case 0xb7ae: | ||
214 | /* Handle 34xx/35xx devices */ | ||
213 | switch (rev) { | 215 | switch (rev) { |
214 | case 0: /* Take care of early samples */ | 216 | case 0: /* Take care of early samples */ |
215 | case 1: | 217 | case 1: |
@@ -228,6 +230,21 @@ void __init omap3_check_revision(void) | |||
228 | /* Use the latest known revision as default */ | 230 | /* Use the latest known revision as default */ |
229 | omap_revision = OMAP3430_REV_ES3_1; | 231 | omap_revision = OMAP3430_REV_ES3_1; |
230 | } | 232 | } |
233 | break; | ||
234 | case 0xb891: | ||
235 | /* Handle 36xx devices */ | ||
236 | switch (rev) { | ||
237 | case 0: | ||
238 | omap_revision = OMAP3630_REV_ES1_0; | ||
239 | break; | ||
240 | default: | ||
241 | /* Use the latest known revision as default */ | ||
242 | omap_revision = OMAP3630_REV_ES1_0; | ||
243 | } | ||
244 | break; | ||
245 | default: | ||
246 | /* Unknown default to latest silicon rev as default*/ | ||
247 | omap_revision = OMAP3630_REV_ES1_0; | ||
231 | } | 248 | } |
232 | } | 249 | } |
233 | 250 | ||
@@ -249,9 +266,10 @@ void __init omap3_cpuinfo(void) | |||
249 | * on available features. Upon detection, update the CPU id | 266 | * on available features. Upon detection, update the CPU id |
250 | * and CPU class bits. | 267 | * and CPU class bits. |
251 | */ | 268 | */ |
252 | if (omap3_has_iva() && omap3_has_sgx()) { | 269 | if (cpu_is_omap3630()) |
270 | strcpy(cpu_name, "3630"); | ||
271 | else if (omap3_has_iva() && omap3_has_sgx()) | ||
253 | strcpy(cpu_name, "3430/3530"); | 272 | strcpy(cpu_name, "3430/3530"); |
254 | } | ||
255 | else if (omap3_has_sgx()) { | 273 | else if (omap3_has_sgx()) { |
256 | omap_revision = OMAP3525_REV(rev); | 274 | omap_revision = OMAP3525_REV(rev); |
257 | strcpy(cpu_name, "3525"); | 275 | strcpy(cpu_name, "3525"); |
diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h index a67439327de3..f4f7a2f0c036 100644 --- a/arch/arm/plat-omap/include/plat/cpu.h +++ b/arch/arm/plat-omap/include/plat/cpu.h | |||
@@ -180,6 +180,7 @@ IS_OMAP_CLASS(34xx, 0x34) | |||
180 | IS_OMAP_SUBCLASS(242x, 0x242) | 180 | IS_OMAP_SUBCLASS(242x, 0x242) |
181 | IS_OMAP_SUBCLASS(243x, 0x243) | 181 | IS_OMAP_SUBCLASS(243x, 0x243) |
182 | IS_OMAP_SUBCLASS(343x, 0x343) | 182 | IS_OMAP_SUBCLASS(343x, 0x343) |
183 | IS_OMAP_SUBCLASS(363x, 0x363) | ||
183 | 184 | ||
184 | #define cpu_is_omap7xx() 0 | 185 | #define cpu_is_omap7xx() 0 |
185 | #define cpu_is_omap15xx() 0 | 186 | #define cpu_is_omap15xx() 0 |
@@ -325,6 +326,7 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
325 | #define cpu_is_omap3525() 0 | 326 | #define cpu_is_omap3525() 0 |
326 | #define cpu_is_omap3530() 0 | 327 | #define cpu_is_omap3530() 0 |
327 | #define cpu_is_omap3430() 0 | 328 | #define cpu_is_omap3430() 0 |
329 | #define cpu_is_omap3630() 0 | ||
328 | 330 | ||
329 | /* | 331 | /* |
330 | * Whether we have MULTI_OMAP1 or not, we still need to distinguish | 332 | * Whether we have MULTI_OMAP1 or not, we still need to distinguish |
@@ -389,6 +391,8 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
389 | (omap3_has_sgx()) && \ | 391 | (omap3_has_sgx()) && \ |
390 | (!omap3_has_iva())) | 392 | (!omap3_has_iva())) |
391 | # define cpu_is_omap3530() (cpu_is_omap3430()) | 393 | # define cpu_is_omap3530() (cpu_is_omap3430()) |
394 | # undef cpu_is_omap3630 | ||
395 | # define cpu_is_omap3630() is_omap363x() | ||
392 | #endif | 396 | #endif |
393 | 397 | ||
394 | # if defined(CONFIG_ARCH_OMAP4) | 398 | # if defined(CONFIG_ARCH_OMAP4) |
@@ -419,6 +423,8 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
419 | #define OMAP3430_REV_ES3_0 0x34303034 | 423 | #define OMAP3430_REV_ES3_0 0x34303034 |
420 | #define OMAP3430_REV_ES3_1 0x34304034 | 424 | #define OMAP3430_REV_ES3_1 0x34304034 |
421 | 425 | ||
426 | #define OMAP3630_REV_ES1_0 0x36300034 | ||
427 | |||
422 | #define OMAP35XX_CLASS 0x35000034 | 428 | #define OMAP35XX_CLASS 0x35000034 |
423 | #define OMAP3503_REV(v) (OMAP35XX_CLASS | (0x3503 << 16) | (v << 12)) | 429 | #define OMAP3503_REV(v) (OMAP35XX_CLASS | (0x3503 << 16) | (v << 12)) |
424 | #define OMAP3515_REV(v) (OMAP35XX_CLASS | (0x3515 << 16) | (v << 12)) | 430 | #define OMAP3515_REV(v) (OMAP35XX_CLASS | (0x3515 << 16) | (v << 12)) |