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>

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 8a05eaf85f8a673f4883d8cb4ee783e0354e4070..157412e4273a60fd379cb8426263b93c5eea141d 100644 (file)
--- 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 d408b15b4fbfd97ecd3d82aaa46cc86788e63a8c..d9714113a01aaca7b31be4a6e454547ea6720312 100644 (file)
--- 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();