Skip to content

Commit 4a4de1d

Browse files
committed
Merge branch 'hwmod_data_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-hwmod
2 parents e5fe29c + 91a36bd commit 4a4de1d

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3198,7 +3198,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
31983198
&omap3xxx_timer9_hwmod,
31993199
&omap3xxx_timer10_hwmod,
32003200
&omap3xxx_timer11_hwmod,
3201-
&omap3xxx_timer12_hwmod,
32023201

32033202
&omap3xxx_wd_timer2_hwmod,
32043203
&omap3xxx_uart1_hwmod,
@@ -3245,20 +3244,22 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
32453244
NULL,
32463245
};
32473246

3247+
/* GP-only hwmods */
3248+
static __initdata struct omap_hwmod *omap3xxx_gp_hwmods[] = {
3249+
&omap3xxx_timer12_hwmod,
3250+
NULL
3251+
};
3252+
32483253
/* 3430ES1-only hwmods */
32493254
static __initdata struct omap_hwmod *omap3430es1_hwmods[] = {
3250-
&omap3xxx_iva_hwmod,
32513255
&omap3430es1_dss_core_hwmod,
3252-
&omap3xxx_mailbox_hwmod,
32533256
NULL
32543257
};
32553258

32563259
/* 3430ES2+-only hwmods */
32573260
static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = {
3258-
&omap3xxx_iva_hwmod,
32593261
&omap3xxx_dss_core_hwmod,
32603262
&omap3xxx_usbhsotg_hwmod,
3261-
&omap3xxx_mailbox_hwmod,
32623263
NULL
32633264
};
32643265

@@ -3300,6 +3301,13 @@ int __init omap3xxx_hwmod_init(void)
33003301
if (r < 0)
33013302
return r;
33023303

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+
33033311
rev = omap_rev();
33043312

33053313
/*

0 commit comments

Comments
 (0)