1 files changed, 13 insertions, 1 deletions

diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index eef43e2e163e..126cb49c0de7 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3198,7 +3198,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
         &omap3xxx_timer9_hwmod,
         &omap3xxx_timer10_hwmod,
         &omap3xxx_timer11_hwmod,
-        &omap3xxx_timer12_hwmod,
 
         &omap3xxx_wd_timer2_hwmod,
         &omap3xxx_uart1_hwmod,
@@ -3245,6 +3244,12 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
         NULL,
 };
 
+/* GP-only hwmods */
+static __initdata struct omap_hwmod *omap3xxx_gp_hwmods[] = {
+        &omap3xxx_timer12_hwmod,
+        NULL
+};
+
 /* 3430ES1-only hwmods */
 static __initdata struct omap_hwmod *omap3430es1_hwmods[] = {
         &omap3430es1_dss_core_hwmod,
@@ -3296,6 +3301,13 @@ int __init omap3xxx_hwmod_init(void)
         if (r < 0)
                 return r;
 
+        /* Register GP-only hwmods. */
+        if (omap_type() == OMAP2_DEVICE_TYPE_GP) {
+                r = omap_hwmod_register(omap3xxx_gp_hwmods);
+                if (r < 0)
+                        return r;
+        }
+
         rev = omap_rev();
 
         /*