Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e89098c authored Oct 07, 2011 by Abhilash K V Committed by Paul Walmsley Oct 07, 2011

ARM: OMAP: AM35x: remove hwmods that aren't generic



Removing modules iva, sr1_hwmod, sr2_hwmod, mailbox from
the base omap3xxx_hwmods list, so that they can be excluded
for am35x.  This removes quite a few warnings on boot for AM35x.

Signed-off-by: Abhilash K V <abhilash.kv@ti.com>
[paul@pwsan.com: dropped 'mailbox class' comments; updated changelog]
Signed-off-by: Paul Walmsley <paul@pwsan.com>

parent 46f8c3c7

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -3132,7 +3132,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
		&omap3xxx_mmc2_hwmod,
		&omap3xxx_mmc3_hwmod,
		&omap3xxx_mpu_hwmod,
		&omap3xxx_iva_hwmod,

		&omap3xxx_timer1_hwmod,
		&omap3xxx_timer2_hwmod,
		@@ -3161,8 +3160,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
		&omap3xxx_i2c1_hwmod,
		&omap3xxx_i2c2_hwmod,
		&omap3xxx_i2c3_hwmod,
		&omap34xx_sr1_hwmod,
		&omap34xx_sr2_hwmod,

		/* gpio class */
		&omap3xxx_gpio1_hwmod,
		@@ -3184,8 +3181,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
		&omap3xxx_mcbsp2_sidetone_hwmod,
		&omap3xxx_mcbsp3_sidetone_hwmod,

		/* mailbox class */
		&omap3xxx_mailbox_hwmod,

		/* mcspi class */
		&omap34xx_mcspi1,
		@@ -3198,31 +3193,39 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {

		/* 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
		};

		/* 34xx-only hwmods (all ES revisions) */
		static __initdata struct omap_hwmod *omap34xx_hwmods[] = {
		&omap3xxx_iva_hwmod,
		&omap34xx_sr1_hwmod,
		&omap34xx_sr2_hwmod,
		&omap3xxx_mailbox_hwmod,
		NULL
		};

		/* 36xx-only hwmods (all ES revisions) */
		static __initdata struct omap_hwmod *omap36xx_hwmods[] = {
		&omap3xxx_iva_hwmod,
		&omap3xxx_uart4_hwmod,
		&omap3xxx_dss_core_hwmod,
		&omap36xx_sr1_hwmod,
		&omap36xx_sr2_hwmod,
		&omap3xxx_usbhsotg_hwmod,
		&omap3xxx_mailbox_hwmod,
		NULL
		};