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/id.c | |
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/id.c')
-rw-r--r-- | arch/arm/mach-omap2/id.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c index 2dc62a25f2c3..0289adcb6efb 100644 --- a/arch/arm/mach-omap2/id.c +++ b/arch/arm/mach-omap2/id.c | |||
@@ -61,7 +61,7 @@ int omap_type(void) | |||
61 | val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS); | 61 | val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS); |
62 | } else if (cpu_is_omap44xx()) { | 62 | } else if (cpu_is_omap44xx()) { |
63 | val = omap_ctrl_readl(OMAP4_CTRL_MODULE_CORE_STATUS); | 63 | val = omap_ctrl_readl(OMAP4_CTRL_MODULE_CORE_STATUS); |
64 | } else if (soc_is_omap54xx()) { | 64 | } else if (soc_is_omap54xx() || soc_is_dra7xx()) { |
65 | val = omap_ctrl_readl(OMAP5XXX_CONTROL_STATUS); | 65 | val = omap_ctrl_readl(OMAP5XXX_CONTROL_STATUS); |
66 | val &= OMAP5_DEVICETYPE_MASK; | 66 | val &= OMAP5_DEVICETYPE_MASK; |
67 | val >>= 6; | 67 | val >>= 6; |
@@ -116,7 +116,7 @@ static u16 tap_prod_id; | |||
116 | 116 | ||
117 | void omap_get_die_id(struct omap_die_id *odi) | 117 | void omap_get_die_id(struct omap_die_id *odi) |
118 | { | 118 | { |
119 | if (cpu_is_omap44xx() || soc_is_omap54xx()) { | 119 | if (cpu_is_omap44xx() || soc_is_omap54xx() || soc_is_dra7xx()) { |
120 | odi->id_0 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_0); | 120 | odi->id_0 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_0); |
121 | odi->id_1 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_1); | 121 | odi->id_1 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_1); |
122 | odi->id_2 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_2); | 122 | odi->id_2 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_2); |