File tree 1 file changed +13
-5
lines changed
1 file changed +13
-5
lines changed Original file line number Diff line number Diff line change @@ -3198,7 +3198,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
3198
3198
& omap3xxx_timer9_hwmod ,
3199
3199
& omap3xxx_timer10_hwmod ,
3200
3200
& omap3xxx_timer11_hwmod ,
3201
- & omap3xxx_timer12_hwmod ,
3202
3201
3203
3202
& omap3xxx_wd_timer2_hwmod ,
3204
3203
& omap3xxx_uart1_hwmod ,
@@ -3245,20 +3244,22 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
3245
3244
NULL ,
3246
3245
};
3247
3246
3247
+ /* GP-only hwmods */
3248
+ static __initdata struct omap_hwmod * omap3xxx_gp_hwmods [] = {
3249
+ & omap3xxx_timer12_hwmod ,
3250
+ NULL
3251
+ };
3252
+
3248
3253
/* 3430ES1-only hwmods */
3249
3254
static __initdata struct omap_hwmod * omap3430es1_hwmods [] = {
3250
- & omap3xxx_iva_hwmod ,
3251
3255
& omap3430es1_dss_core_hwmod ,
3252
- & omap3xxx_mailbox_hwmod ,
3253
3256
NULL
3254
3257
};
3255
3258
3256
3259
/* 3430ES2+-only hwmods */
3257
3260
static __initdata struct omap_hwmod * omap3430es2plus_hwmods [] = {
3258
- & omap3xxx_iva_hwmod ,
3259
3261
& omap3xxx_dss_core_hwmod ,
3260
3262
& omap3xxx_usbhsotg_hwmod ,
3261
- & omap3xxx_mailbox_hwmod ,
3262
3263
NULL
3263
3264
};
3264
3265
@@ -3300,6 +3301,13 @@ int __init omap3xxx_hwmod_init(void)
3300
3301
if (r < 0 )
3301
3302
return r ;
3302
3303
3304
+ /* Register GP-only hwmods. */
3305
+ if (omap_type () == OMAP2_DEVICE_TYPE_GP ) {
3306
+ r = omap_hwmod_register (omap3xxx_gp_hwmods );
3307
+ if (r < 0 )
3308
+ return r ;
3309
+ }
3310
+
3303
3311
rev = omap_rev ();
3304
3312
3305
3313
/*
You can’t perform that action at this time.
0 commit comments