Merge branch 'hwmod_data_fixes_3.2rc' of git://git.pwsan.com/linux-2.6 into fixes-hwmod (4a4de1d9) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+13 −5

Original line number	Diff line number	Diff line
		@@ -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,20 +3244,22 @@ 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[] = {
		&omap3xxx_iva_hwmod,
		&omap3430es1_dss_core_hwmod,
		&omap3xxx_mailbox_hwmod,
		NULL
		};

		/* 3430ES2+-only hwmods */
		static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = {
		&omap3xxx_iva_hwmod,
		&omap3xxx_dss_core_hwmod,
		&omap3xxx_usbhsotg_hwmod,
		&omap3xxx_mailbox_hwmod,
		NULL
		};

		@@ -3300,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();

		/*