diff options
| author | R Sricharan <r.sricharan@ti.com> | 2013-02-06 09:55:40 -0500 |
|---|---|---|
| committer | Rajendra Nayak <rnayak@ti.com> | 2013-08-13 07:28:08 -0400 |
| commit | 6852215a32d0f63a0f3497df3b4638f5eac428d3 (patch) | |
| tree | 2545e0529b6eae0a79919ff1d3b16c495cbb301e /arch/arm/mach-omap2/soc.h | |
| parent | 6d0fc190c8fa2fded564a159eea4140a13f429a9 (diff) | |
ARM: DRA7: id: Add cpu detection support for DRA7xx based SoCs'
The DRA7xx is a high-performance, infotainment application device,
based on enhanced OMAP architecture integrated on a 28-nm technology.
Since DRA7 is a platform supported only using DT, the cpu detection
is based on the compatibles passed from DT blobs as suggested here
http://lists.infradead.org/pipermail/linux-arm-kernel/2013-July/187712.html
Suggested-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: R Sricharan <r.sricharan@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Diffstat (limited to 'arch/arm/mach-omap2/soc.h')
| -rw-r--r-- | arch/arm/mach-omap2/soc.h | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h index 8c616e436bc7..4588df1447ed 100644 --- a/arch/arm/mach-omap2/soc.h +++ b/arch/arm/mach-omap2/soc.h | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | * Written by Tony Lindgren <tony.lindgren@nokia.com> | 8 | * Written by Tony Lindgren <tony.lindgren@nokia.com> |
| 9 | * | 9 | * |
| 10 | * Added OMAP4/5 specific defines - Santosh Shilimkar<santosh.shilimkar@ti.com> | 10 | * Added OMAP4/5 specific defines - Santosh Shilimkar<santosh.shilimkar@ti.com> |
| 11 | * Added DRA7xxx specific defines - Sricharan R<r.sricharan@ti.com> | ||
| 11 | * | 12 | * |
| 12 | * This program is free software; you can redistribute it and/or modify | 13 | * This program is free software; you can redistribute it and/or modify |
| 13 | * it under the terms of the GNU General Public License as published by | 14 | * it under the terms of the GNU General Public License as published by |
| @@ -35,6 +36,7 @@ | |||
| 35 | #ifndef __ASSEMBLY__ | 36 | #ifndef __ASSEMBLY__ |
| 36 | 37 | ||
| 37 | #include <linux/bitops.h> | 38 | #include <linux/bitops.h> |
| 39 | #include <linux/of.h> | ||
| 38 | 40 | ||
| 39 | /* | 41 | /* |
| 40 | * Test if multicore OMAP support is needed | 42 | * Test if multicore OMAP support is needed |
| @@ -105,6 +107,15 @@ | |||
| 105 | # endif | 107 | # endif |
| 106 | #endif | 108 | #endif |
| 107 | 109 | ||
| 110 | #ifdef CONFIG_SOC_DRA7XX | ||
| 111 | # ifdef OMAP_NAME | ||
| 112 | # undef MULTI_OMAP2 | ||
| 113 | # define MULTI_OMAP2 | ||
| 114 | # else | ||
| 115 | # define OMAP_NAME DRA7XX | ||
| 116 | # endif | ||
| 117 | #endif | ||
| 118 | |||
| 108 | /* | 119 | /* |
| 109 | * Omap device type i.e. EMU/HS/TST/GP/BAD | 120 | * Omap device type i.e. EMU/HS/TST/GP/BAD |
| 110 | */ | 121 | */ |
| @@ -233,6 +244,7 @@ IS_AM_SUBCLASS(437x, 0x437) | |||
| 233 | #define cpu_is_omap447x() 0 | 244 | #define cpu_is_omap447x() 0 |
| 234 | #define soc_is_omap54xx() 0 | 245 | #define soc_is_omap54xx() 0 |
| 235 | #define soc_is_omap543x() 0 | 246 | #define soc_is_omap543x() 0 |
| 247 | #define soc_is_dra7xx() 0 | ||
| 236 | 248 | ||
| 237 | #if defined(MULTI_OMAP2) | 249 | #if defined(MULTI_OMAP2) |
| 238 | # if defined(CONFIG_ARCH_OMAP2) | 250 | # if defined(CONFIG_ARCH_OMAP2) |
| @@ -379,6 +391,11 @@ IS_OMAP_TYPE(3430, 0x3430) | |||
| 379 | # define soc_is_omap543x() is_omap543x() | 391 | # define soc_is_omap543x() is_omap543x() |
| 380 | #endif | 392 | #endif |
| 381 | 393 | ||
| 394 | #if defined(CONFIG_SOC_DRA7XX) | ||
| 395 | #undef soc_is_dra7xx | ||
| 396 | #define soc_is_dra7xx() (of_machine_is_compatible("ti,dra7")) | ||
| 397 | #endif | ||
| 398 | |||
| 382 | /* Various silicon revisions for omap2 */ | 399 | /* Various silicon revisions for omap2 */ |
| 383 | #define OMAP242X_CLASS 0x24200024 | 400 | #define OMAP242X_CLASS 0x24200024 |
| 384 | #define OMAP2420_REV_ES1_0 OMAP242X_CLASS | 401 | #define OMAP2420_REV_ES1_0 OMAP242X_CLASS |