projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c510702
)
ARM: OMAP2+: AM43x: GP or HS ?
author
Afzal Mohammed
<afzal@ti.com>
Mon, 27 May 2013 14:36:33 +0000
(20:06 +0530)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 12 Jun 2013 15:07:23 +0000
(08:07 -0700)
Detect whether GP or HS, similar to the AM335x way.
Signed-off-by: Afzal Mohammed <afzal@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap2/id.c
patch
|
blob
|
history
diff --git
a/arch/arm/mach-omap2/id.c
b/arch/arm/mach-omap2/id.c
index
1fbb3c5
..
74f71ab
100644
(file)
--- a/
arch/arm/mach-omap2/id.c
+++ b/
arch/arm/mach-omap2/id.c
@@
-55,7
+55,7
@@
int omap_type(void)
if (cpu_is_omap24xx()) {
val = omap_ctrl_readl(OMAP24XX_CONTROL_STATUS);
- } else if (soc_is_am33xx()) {
+ } else if (soc_is_am33xx()
|| soc_is_am43xx()
) {
val = omap_ctrl_readl(AM33XX_CONTROL_STATUS);
} else if (cpu_is_omap34xx()) {
val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);