arm:omap:am33xx: Check device features

Read device feature register and record features
on SOC. Currently only SGX is checked.

Signed-off-by: Afzal Mohammed <afzal@ti.com>

diff --git a/arch/arm/mach-omap2/control.h b/arch/arm/mach-omap2/control.h
index 50da5673e26eba0c48470318de9a74b89c6875ad..8489135df2269bfa5e5c9c0e90badd3262c52b38 100644 (file)
--- a/arch/arm/mach-omap2/control.h
+++ b/arch/arm/mach-omap2/control.h
@@ -360,6 +360,9 @@
 #define AM33XX_CONTROL_STATUS_OFF      0x040
 #define AM33XX_CONTROL_STATUS          AM33XX_L4_WK_IO_ADDRESS(AM33XX_CTRL_BASE + \
                                                AM33XX_CONTROL_STATUS_OFF)
+#define AM33XX_DEV_FEATURE             0x604
+#define AM33XX_SGX_SHIFT               29
+#define AM33XX_SGX_MASK                        (1 << AM33XX_SGX_SHIFT)
 
 /*
  * CONTROL OMAP STATUS register to identify OMAP3 features

diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index c66f70056c4c2b84b867d13d5270bd39163dfd74..7b913d37b8d4d8175ed7c4302ddf4e91960eba21 100644 (file)
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -286,6 +286,19 @@ void __init ti81xx_check_features(void)
        omap3_cpuinfo();
 }
 
+void __init am33xx_check_features(void)
+{
+       u32 status;
+
+       omap_features = OMAP3_HAS_NEON;
+
+       status = omap_ctrl_readl(AM33XX_DEV_FEATURE);
+       if (status & AM33XX_SGX_MASK)
+               omap_features |= OMAP3_HAS_SGX;
+
+       omap3_cpuinfo();
+}
+
 void __init omap3xxx_check_revision(void)
 {
        u32 cpuid, idcode;

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index d891084d6496ad7587a2778876a8cd30d50ff520..0c47b1531cbc3dc763977c75ff193dfa6b1a7488 100644 (file)
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -472,7 +472,7 @@ void __init am33xx_init_early(void)
 {
        omap2_set_globals_am33xx();
        omap3xxx_check_revision();
-       ti81xx_check_features();
+       am33xx_check_features();
        omap_common_init_early();
        am33xx_voltagedomains_init();
        am33xx_powerdomains_init();

diff --git a/arch/arm/plat-omap/include/plat/cpu.h b/arch/arm/plat-omap/include/plat/cpu.h
index 428ccb12d16808fd80cb0e99359e0351fb842809..16aae2be60dcd68d4882a2e199ac4e218574d650 100644 (file)
--- a/arch/arm/plat-omap/include/plat/cpu.h
+++ b/arch/arm/plat-omap/include/plat/cpu.h
@@ -456,6 +456,7 @@ void omap3xxx_check_revision(void);
 void omap4xxx_check_revision(void);
 void omap3xxx_check_features(void);
 void ti81xx_check_features(void);
+void am33xx_check_features(void);
 void omap4xxx_check_features(void);
 
 /*