8 files changed, 21 insertions, 15 deletions

diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 3a0b53d225e7..364ba38e40f3 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -28,6 +28,7 @@ CONFIG_ARCH_OMAP3=y
 CONFIG_ARCH_OMAP4=y
 CONFIG_SOC_OMAP5=y
 CONFIG_SOC_AM33XX=y
+CONFIG_SOC_AM43XX=y
 CONFIG_SOC_DRA7XX=y
 CONFIG_ARM_THUMBEE=y
 CONFIG_ARM_ERRATA_411920=y
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index e2ce4f8366a7..40fd5c31b594 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -165,12 +165,6 @@ config SOC_TI81XX
         depends on ARCH_OMAP3
         default y
 
-config OMAP_PACKAGE_ZAF
-       bool
-
-config OMAP_PACKAGE_ZAC
-       bool
-
 config OMAP_PACKAGE_CBC
        bool
 
@@ -284,7 +278,6 @@ config MACH_NOKIA_N8X0
         select MACH_NOKIA_N800
         select MACH_NOKIA_N810
         select MACH_NOKIA_N810_WIMAX
-        select OMAP_PACKAGE_ZAC
 
 config MACH_NOKIA_RX51
         bool "Nokia N900 (RX-51) phone"
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 8e3daa11602b..5679464a2f88 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -229,7 +229,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
         .init_late      = am43xx_init_late,
         .init_irq       = omap_gic_of_init,
         .init_machine   = omap_generic_init,
-        .init_time      = omap3_sync32k_timer_init,
+        .init_time      = omap3_gptimer_timer_init,
         .dt_compat      = am43_boards_compat,
 MACHINE_END
 #endif
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 9428c5f9d4f2..157412e4273a 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -465,8 +465,18 @@ void __init omap3xxx_check_revision(void)
                 }
                 break;
         case 0xb98c:
-                omap_revision = AM437X_REV_ES1_0;
-                cpu_rev = "1.0";
+                switch (rev) {
+                case 0:
+                        omap_revision = AM437X_REV_ES1_0;
+                        cpu_rev = "1.0";
+                        break;
+                case 1:
+                /* FALLTHROUGH */
+                default:
+                        omap_revision = AM437X_REV_ES1_1;
+                        cpu_rev = "1.1";
+                        break;
+                }
                 break;
         case 0xb8f2:
                 switch (rev) {
@@ -657,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 d408b15b4fbf..d9714113a01a 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();
diff --git a/arch/arm/mach-omap2/mux.h b/arch/arm/mach-omap2/mux.h
index a722330d4d53..d121fb6df4e6 100644
--- a/arch/arm/mach-omap2/mux.h
+++ b/arch/arm/mach-omap2/mux.h
@@ -63,9 +63,6 @@
 #define OMAP_PACKAGE_CUS                5               /* 423-pin 0.65 */
 #define OMAP_PACKAGE_CBB                4               /* 515-pin 0.40 0.50 */
 #define OMAP_PACKAGE_CBC                3               /* 515-pin 0.50 0.65 */
-#define OMAP_PACKAGE_ZAC                2               /* 24xx 447-pin POP */
-#define OMAP_PACKAGE_ZAF                1               /* 2420 447-pin SIP */
-
 
 #define OMAP_MUX_NR_MODES               8               /* Available modes */
 #define OMAP_MUX_NR_SIDES               2               /* Bottom & top */
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 076bd90a6ce0..30abcc8b20e0 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -438,7 +438,8 @@ IS_OMAP_TYPE(3430, 0x3430)
 #define AM335X_REV_ES2_1        (AM335X_CLASS | (0x2 << 8))
 
 #define AM437X_CLASS            0x43700000
-#define AM437X_REV_ES1_0        AM437X_CLASS
+#define AM437X_REV_ES1_0        (AM437X_CLASS | (0x10 << 8))
+#define AM437X_REV_ES1_1        (AM437X_CLASS | (0x11 << 8))
 
 #define OMAP443X_CLASS          0x44300044
 #define OMAP4430_REV_ES1_0      (OMAP443X_CLASS | (0x10 << 8))
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index 74044aaf438b..b62de9f9d05c 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -604,7 +604,8 @@ OMAP_SYS_32K_TIMER_INIT(3_secure, 12, "secure_32k_fck", "ti,timer-secure",
                         2, "timer_sys_ck", NULL);
 #endif /* CONFIG_ARCH_OMAP3 */
 
-#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX)
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_AM33XX) || \
+        defined(CONFIG_SOC_AM43XX)
 OMAP_SYS_GP_TIMER_INIT(3, 2, "timer_sys_ck", NULL,
                        1, "timer_sys_ck", "ti,timer-alwon");
 #endif