openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'hwmod_data_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-hwmod

This commit is contained in:
Tony Lindgren 2011-12-16 16:05:02 -08:00
parent e5fe29c719 91a36bdb3a
commit 4a4de1d9b4
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
View File

@ -3198,7 +3198,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
&omap3xxx_timer9_hwmod, &omap3xxx_timer9_hwmod,
&omap3xxx_timer10_hwmod, &omap3xxx_timer10_hwmod,
&omap3xxx_timer11_hwmod, &omap3xxx_timer11_hwmod,
&omap3xxx_timer12_hwmod,
&omap3xxx_wd_timer2_hwmod, &omap3xxx_wd_timer2_hwmod,
&omap3xxx_uart1_hwmod, &omap3xxx_uart1_hwmod,
@ -3245,20 +3244,22 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
NULL, NULL,
}; };
/* GP-only hwmods */
static __initdata struct omap_hwmod *omap3xxx_gp_hwmods[] = {
&omap3xxx_timer12_hwmod,
NULL
};
/* 3430ES1-only hwmods */ /* 3430ES1-only hwmods */
static __initdata struct omap_hwmod *omap3430es1_hwmods[] = { static __initdata struct omap_hwmod *omap3430es1_hwmods[] = {
&omap3xxx_iva_hwmod,
&omap3430es1_dss_core_hwmod, &omap3430es1_dss_core_hwmod,
&omap3xxx_mailbox_hwmod,
NULL NULL
}; };
/* 3430ES2+-only hwmods */ /* 3430ES2+-only hwmods */
static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = { static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = {
&omap3xxx_iva_hwmod,
&omap3xxx_dss_core_hwmod, &omap3xxx_dss_core_hwmod,
&omap3xxx_usbhsotg_hwmod, &omap3xxx_usbhsotg_hwmod,
&omap3xxx_mailbox_hwmod,
NULL NULL
}; };
@ -3300,6 +3301,13 @@ int __init omap3xxx_hwmod_init(void)
if (r < 0) if (r < 0)
return r; 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(); rev = omap_rev();
/* /*