summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAfzal Mohammed <afzal@ti.com>2014-02-07 10:21:25 (GMT)
committerTony Lindgren <tony@atomide.com>2014-02-28 23:33:27 (GMT)
commit7a2e05132424ea6bd5d957941ee9805774bad32f (patch)
treea551c92e63a28911d2197dbced4fd5e2c6e854e5
parent4a2ed4c0a3269a3a8cf269f5177f18c836ce869b (diff)
downloadlinux-7a2e05132424ea6bd5d957941ee9805774bad32f.tar.xz
ARM: OMAP2+: AM43x: determine features
Determine AM43x device features by reusing AM335x helper as feature register layout is similar. And also exporting AM43xx family name. Signed-off-by: Afzal Mohammed <afzal@ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/id.c2
-rw-r--r--arch/arm/mach-omap2/io.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 8a05eaf..157412e 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -667,6 +667,8 @@ static const char * __init omap_get_family(void)
return kasprintf(GFP_KERNEL, "OMAP4");
else if (soc_is_omap54xx())
return kasprintf(GFP_KERNEL, "OMAP5");
+ else if (soc_is_am43xx())
+ return kasprintf(GFP_KERNEL, "AM43xx");
else
return kasprintf(GFP_KERNEL, "Unknown");
}
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index d408b15..d971411 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -613,6 +613,7 @@ void __init am43xx_init_early(void)
omap_prm_base_init();
omap_cm_base_init();
omap3xxx_check_revision();
+ am33xx_check_features();
am43xx_powerdomains_init();
am43xx_clockdomains_init();
am43xx_hwmod_init();