Skip to content

Commit 7e89098

Browse files
Abhilash K VPaul Walmsley
authored andcommitted
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 <[email protected]> [[email protected]: dropped 'mailbox class' comments; updated changelog] Signed-off-by: Paul Walmsley <[email protected]>
1 parent 46f8c3c commit 7e89098

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

arch/arm/mach-omap2/omap_hwmod_3xxx_data.c

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3132,7 +3132,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
31323132
&omap3xxx_mmc2_hwmod,
31333133
&omap3xxx_mmc3_hwmod,
31343134
&omap3xxx_mpu_hwmod,
3135-
&omap3xxx_iva_hwmod,
31363135

31373136
&omap3xxx_timer1_hwmod,
31383137
&omap3xxx_timer2_hwmod,
@@ -3161,8 +3160,6 @@ static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {
31613160
&omap3xxx_i2c1_hwmod,
31623161
&omap3xxx_i2c2_hwmod,
31633162
&omap3xxx_i2c3_hwmod,
3164-
&omap34xx_sr1_hwmod,
3165-
&omap34xx_sr2_hwmod,
31663163

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

3187-
/* mailbox class */
3188-
&omap3xxx_mailbox_hwmod,
31893184

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

31993194
/* 3430ES1-only hwmods */
32003195
static __initdata struct omap_hwmod *omap3430es1_hwmods[] = {
3196+
&omap3xxx_iva_hwmod,
32013197
&omap3430es1_dss_core_hwmod,
3198+
&omap3xxx_mailbox_hwmod,
32023199
NULL
32033200
};
32043201

32053202
/* 3430ES2+-only hwmods */
32063203
static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = {
3204+
&omap3xxx_iva_hwmod,
32073205
&omap3xxx_dss_core_hwmod,
32083206
&omap3xxx_usbhsotg_hwmod,
3207+
&omap3xxx_mailbox_hwmod,
32093208
NULL
32103209
};
32113210

32123211
/* 34xx-only hwmods (all ES revisions) */
32133212
static __initdata struct omap_hwmod *omap34xx_hwmods[] = {
3213+
&omap3xxx_iva_hwmod,
32143214
&omap34xx_sr1_hwmod,
32153215
&omap34xx_sr2_hwmod,
3216+
&omap3xxx_mailbox_hwmod,
32163217
NULL
32173218
};
32183219

32193220
/* 36xx-only hwmods (all ES revisions) */
32203221
static __initdata struct omap_hwmod *omap36xx_hwmods[] = {
3222+
&omap3xxx_iva_hwmod,
32213223
&omap3xxx_uart4_hwmod,
32223224
&omap3xxx_dss_core_hwmod,
32233225
&omap36xx_sr1_hwmod,
32243226
&omap36xx_sr2_hwmod,
32253227
&omap3xxx_usbhsotg_hwmod,
3228+
&omap3xxx_mailbox_hwmod,
32263229
NULL
32273230
};
32283231

0 commit comments

Comments
 (0)