Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

* 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: split omap2/3/4_check_revision function
  ARM: OMAP2+: Make cpu_rev static global variable

1 files changed, 8 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index eb50c29fb644..5f8c4e1a3fb9 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -351,7 +351,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data)
 
 static void __init omap_common_init_early(void)
 {
-        omap2_check_revision();
         omap_init_consistent_dma_size();
 }
 
@@ -392,6 +391,7 @@ static void __init omap_hwmod_init_postsetup(void)
 void __init omap2420_init_early(void)
 {
         omap2_set_globals_242x();
+        omap2xxx_check_revision();
         omap_common_init_early();
         omap2xxx_voltagedomains_init();
         omap242x_powerdomains_init();
@@ -406,6 +406,7 @@ void __init omap2420_init_early(void)
 void __init omap2430_init_early(void)
 {
         omap2_set_globals_243x();
+        omap2xxx_check_revision();
         omap_common_init_early();
         omap2xxx_voltagedomains_init();
         omap243x_powerdomains_init();
@@ -424,6 +425,8 @@ void __init omap2430_init_early(void)
 void __init omap3_init_early(void)
 {
         omap2_set_globals_3xxx();
+        omap3xxx_check_revision();
+        omap3xxx_check_features();
         omap_common_init_early();
         omap3xxx_voltagedomains_init();
         omap3xxx_powerdomains_init();
@@ -456,6 +459,8 @@ void __init am35xx_init_early(void)
 void __init ti81xx_init_early(void)
 {
         omap2_set_globals_ti81xx();
+        omap3xxx_check_revision();
+        ti81xx_check_features();
         omap_common_init_early();
         omap3xxx_voltagedomains_init();
         omap3xxx_powerdomains_init();
@@ -470,6 +475,8 @@ void __init ti81xx_init_early(void)
 void __init omap4430_init_early(void)
 {
         omap2_set_globals_443x();
+        omap4xxx_check_revision();
+        omap4xxx_check_features();
         omap_common_init_early();
         omap44xx_voltagedomains_init();
         omap44xx_powerdomains_init();