[PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd

[PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd

[Felipe Balbi]

commit d6504acd (OMAP2+: hwmod: remove OMAP_CHIP*) has
mistakenly added MUSB as a hwmod available only on ES2.0
of OMAP3430.

MUSB hwmod has always be available on all OMAP revisions
since OMAP2430.

Signed-off-by: Felipe Balbi <balbi@ti.com>
---
 arch/arm/mach-omap2/omap_hwmod_3xxx_data.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 3008e16..74f1454 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3232,7 +3232,6 @@ static __initdata struct omap_hwmod *omap3430es1_hwmods[] = {
 /* 3430ES2+-only hwmods */
 static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = {
 	&omap3xxx_dss_core_hwmod,
-	&omap3xxx_usbhsotg_hwmod,
 	NULL
 };
 
@@ -3240,6 +3239,7 @@ static __initdata struct omap_hwmod *omap3430es2plus_hwmods[] = {
 static __initdata struct omap_hwmod *omap34xx_hwmods[] = {
 	&omap34xx_sr1_hwmod,
 	&omap34xx_sr2_hwmod,
+	&omap3xxx_usbhsotg_hwmod,
 	NULL
 };
 
-- 
1.7.8.rc0

[PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd

[Russell King - ARM Linux]

On Mon, Nov 07, 2011 at 07:56:57PM +0200, Felipe Balbi wrote:
> commit d6504acd (OMAP2+: hwmod: remove OMAP_CHIP*) has
> mistakenly added MUSB as a hwmod available only on ES2.0
> of OMAP3430.
> 
> MUSB hwmod has always be available on all OMAP revisions
> since OMAP2430.

This doesn't seem to solve it:

dpll3_m2_clk rate change failed: -22
------------[ cut here ]------------
WARNING: at arch/arm/mach-omap2/usb-musb.c:141 usb_musb_init+0xc0/0x174()
usb_musb_init: could not find omap_hwmod for usb_otg_hs
Modules linked in:
Backtrace:
[<c0017920>] (dump_backtrace+0x0/0x10c) from [<c02d9898>] (dump_stack+0x18/0x1c) r7:c181ff20 r6:c03ceb54 r5:c037547b r4:0000008d
[<c02d9880>] (dump_stack+0x0/0x1c) from [<c003ae08>] (warn_slowpath_common+0x58/0x70)
[<c003adb0>] (warn_slowpath_common+0x0/0x70) from [<c003aec4>] (warn_slowpath_fmt+0x38/0x40)
 r8:00000000 r7:00000013 r6:c0374b09 r5:c03f06e4 r4:c03741b0
[<c003ae8c>] (warn_slowpath_fmt+0x0/0x40) from [<c03ceb54>] (usb_musb_init+0xc0/0x174)
 r3:c02df894 r2:c03707f9
[<c03cea94>] (usb_musb_init+0x0/0x174) from [<c03ce02c>] (omap_ldp_init+0xb0/0x100)
 r6:c003e7e4 r5:c03f06e4 r4:c04053e4
[<c03cdf7c>] (omap_ldp_init+0x0/0x100) from [<c03c6788>] (customize_machine+0x24/0x30)
 r4:c03f03a8
[<c03c6764>] (customize_machine+0x0/0x30) from [<c0008710>] (do_one_initcall+0x9c/0x164)
[<c0008674>] (do_one_initcall+0x0/0x164) from [<c03c3284>] (kernel_init+0x7c/0x120)
[<c03c3208>] (kernel_init+0x0/0x120) from [<c003e7e4>] (do_exit+0x0/0x62c)
 r5:c03c3208 r4:00000000
---[ end trace 1b75b31a2719ed1c ]---

[PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd

[Felipe Balbi]

Hi,

On Mon, Nov 07, 2011 at 06:32:08PM +0000, Russell King - ARM Linux wrote:
> On Mon, Nov 07, 2011 at 07:56:57PM +0200, Felipe Balbi wrote:
> > commit d6504acd (OMAP2+: hwmod: remove OMAP_CHIP*) has
> > mistakenly added MUSB as a hwmod available only on ES2.0
> > of OMAP3430.
> > 
> > MUSB hwmod has always be available on all OMAP revisions
> > since OMAP2430.
> 
> This doesn't seem to solve it:

then i can't help. From all I know the LDP is based on OMAP3430 so that
should work. If it doesn't, it's something deeper on hwmod, maybe ?

Paul, it's your call.

-- 
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20111107/4eff924f/attachment.sig>

[PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd

[Russell King - ARM Linux]

On Mon, Nov 07, 2011 at 09:39:09PM +0200, Felipe Balbi wrote:
> Hi,
> 
> On Mon, Nov 07, 2011 at 06:32:08PM +0000, Russell King - ARM Linux wrote:
> > On Mon, Nov 07, 2011 at 07:56:57PM +0200, Felipe Balbi wrote:
> > > commit d6504acd (OMAP2+: hwmod: remove OMAP_CHIP*) has
> > > mistakenly added MUSB as a hwmod available only on ES2.0
> > > of OMAP3430.
> > > 
> > > MUSB hwmod has always be available on all OMAP revisions
> > > since OMAP2430.
> > 
> > This doesn't seem to solve it:
> 
> then i can't help. From all I know the LDP is based on OMAP3430 so that
> should work. If it doesn't, it's something deeper on hwmod, maybe ?

Nothing here is specific to the LDP.

> Paul, it's your call.

I think I've found it.

Okay, so.  Clearly, *no* one has even tested this stuff on *any* OMAP3
platform:

        /* Register hwmods common to all OMAP3 */
        r = omap_hwmod_register(omap3xxx_hwmods);
        if (!r)
                return r;

Hint: it returns ZERO on success.  What follows is:

        rev = omap_rev();

        /*
         * Register hwmods common to individual OMAP3 families, all
         * silicon revisions (e.g., 34xx, or AM3505/3517, or 36xx)
         * All possible revisions should be included in this conditional.
         */
        if (rev == OMAP3430_REV_ES1_0 || rev == OMAP3430_REV_ES2_0 ||
            rev == OMAP3430_REV_ES2_1 || rev == OMAP3430_REV_ES3_0 ||
            rev == OMAP3430_REV_ES3_1 || rev == OMAP3430_REV_ES3_1_2) {
...
which can only ever be reached _iff_ registering omap3xxx_hwmods _fails_.
Not succeeds, but _fails_.

Not surprisingly, the same error is repeated below this group of if
statements:

        r = omap_hwmod_register(h);
        if (!r)
                return r;

So, multiple instances of the same brokenness.

With those both fixed, we come to the next pile of BROKENNESS:

WARNING: at /home/rmk/git/linux-rmk/arch/arm/mach-omap2/omap_hwmod.c:1963 omap_hwmod_register+0x130/0x168()
omap_hwmod: sr1_hwmod: _register returned -22
Modules linked in:
Backtrace:
[<c0017920>] (dump_backtrace+0x0/0x10c) from [<c02d9918>] (dump_stack+0x18/0x1c) r7:c03f3ef0 r6:c03cc318 r5:c0370c9f r4:000007ab
[<c02d9900>] (dump_stack+0x0/0x1c) from [<c003ae88>] (warn_slowpath_common+0x58/0x70)
[<c003ae30>] (warn_slowpath_common+0x0/0x70) from [<c003af44>] (warn_slowpath_fmt+0x38/0x40)
 r8:c0433e84 r7:00000001 r6:c03f9550 r5:c03eb41c r4:c0402f4c
[<c003af0c>] (warn_slowpath_fmt+0x0/0x40) from [<c03cc318>] (omap_hwmod_register+0x130/0x168)
 r3:c0374aba r2:c037127b
[<c03cc1e8>] (omap_hwmod_register+0x0/0x168) from [<c03cdc70>] (omap3xxx_hwmod_init+0xd8/0x170)
 r8:c0818fb4 r7:c03f7968 r6:00000000 r5:00000000 r4:34300234
[<c03cdb98>] (omap3xxx_hwmod_init+0x0/0x170) from [<c03c9c70>] (omap3_init_early+0x24/0x30)
 r6:c03e6484 r5:c0818fe4 r4:c0932980
[<c03c9c4c>] (omap3_init_early+0x0/0x30) from [<c03c9cc8>] (omap3430_init_early+0x10/0x14)
[<c03c6a24>] (setup_arch+0x0/0x818) from [<c03c3638>] (start_kernel+0x80/0x308)
[<c03c35b8>] (start_kernel+0x0/0x308) from [<80008040>] (0x80008040)
 r8:80004059 r7:c03f789c r6:c03e79c8 r5:c03f4098 r4:10c53c7d
---[ end trace 1b75b31a2719ed1c ]---
------------[ cut here ]------------
WARNING: at /home/rmk/git/linux-rmk/arch/arm/mach-omap2/omap_hwmod.c:1963 omap_hwmod_register+0x130/0x168()
omap_hwmod: sr2_hwmod: _register returned -22
Modules linked in:
Backtrace:
[<c0017920>] (dump_backtrace+0x0/0x10c) from [<c02d9918>] (dump_stack+0x18/0x1c) r7:c03f3ef0 r6:c03cc318 r5:c0370c9f r4:000007ab
[<c02d9900>] (dump_stack+0x0/0x1c) from [<c003ae88>] (warn_slowpath_common+0x58/0x70)
[<c003ae30>] (warn_slowpath_common+0x0/0x70) from [<c003af44>] (warn_slowpath_fmt+0x38/0x40)
 r8:c0433e84 r7:00000001 r6:c03f9550 r5:c03eb420 r4:c0402fd0
[<c003af0c>] (warn_slowpath_fmt+0x0/0x40) from [<c03cc318>] (omap_hwmod_register+0x130/0x168)
 r3:c0374ac4 r2:c037127b
[<c03cc1e8>] (omap_hwmod_register+0x0/0x168) from [<c03cdc70>] (omap3xxx_hwmod_init+0xd8/0x170)
 r8:c0818fb4 r7:c03f7968 r6:00000000 r5:00000000 r4:34300234
[<c03cdb98>] (omap3xxx_hwmod_init+0x0/0x170) from [<c03c9c70>] (omap3_init_early+0x24/0x30)
 r6:c03e6484 r5:c0818fe4 r4:c0932980
[<c03c9c4c>] (omap3_init_early+0x0/0x30) from [<c03c9cc8>] (omap3430_init_early+0x10/0x14)
[<c03c9cb8>] (omap3430_init_early+0x0/0x14) from [<c03c7120>] (setup_arch+0x6fc/0x818)
[<c03c6a24>] (setup_arch+0x0/0x818) from [<c03c3638>] (start_kernel+0x80/0x308)
[<c03c35b8>] (start_kernel+0x0/0x308) from [<80008040>] (0x80008040)
 r8:80004059 r7:c03f789c r6:c03e79c8 r5:c03f4098 r4:10c53c7d
---[ end trace 1b75b31a2719ed1d ]---

Again, this is not specific to the LDP.  It's whinging about:

static __initdata struct omap_hwmod *omap3xxx_hwmods[] = {

btw, this should be:

static struct omap_hwmod *omap3xxx_hwmods[] __initdata = {

...
        &omap34xx_sr1_hwmod,		<<== XXX
        &omap34xx_sr2_hwmod,		<<== XXX
...
};

static __initdata struct omap_hwmod *omap34xx_hwmods[] = {
        &omap34xx_sr1_hwmod,		<<== XXX
        &omap34xx_sr2_hwmod,		<<== XXX
        &omap3xxx_usbhsotg_hwmod,
        NULL
};

Again, can never have been tested on OMAP3.

Does anyone apart from me bother doing any testing what so ever on OMAP3
platforms?  Am I the only one?

[PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd

[Paul Walmsley]

On Mon, 7 Nov 2011, Russell King - ARM Linux wrote:

> Again, can never have been tested on OMAP3.
> 
> Does anyone apart from me bother doing any testing what so ever on OMAP3
> platforms?  Am I the only one?

This was fixed by 

http://www.spinics.net/lists/arm-kernel/msg143549.html

which didn't go upstream as part of the v3.2 merge window.


- Paul

[PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd

[Russell King - ARM Linux]

On Mon, Nov 07, 2011 at 02:29:35PM -0700, Paul Walmsley wrote:
> On Mon, 7 Nov 2011, Russell King - ARM Linux wrote:
> 
> > Again, can never have been tested on OMAP3.
> > 
> > Does anyone apart from me bother doing any testing what so ever on OMAP3
> > platforms?  Am I the only one?
> 
> This was fixed by 
> 
> http://www.spinics.net/lists/arm-kernel/msg143549.html
> 
> which didn't go upstream as part of the v3.2 merge window.

Ah, that patch.

Which version of the patch does Tony have?  The one you point at which
uses IS_ERR_VALUE() and I complained about, or the version that has that
fixed?

[PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd

[Tony Lindgren]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [111107 14:06]:
> On Mon, Nov 07, 2011 at 02:29:35PM -0700, Paul Walmsley wrote:
> > On Mon, 7 Nov 2011, Russell King - ARM Linux wrote:
> > 
> > > Again, can never have been tested on OMAP3.
> > > 
> > > Does anyone apart from me bother doing any testing what so ever on OMAP3
> > > platforms?  Am I the only one?
> > 
> > This was fixed by 
> > 
> > http://www.spinics.net/lists/arm-kernel/msg143549.html
> > 
> > which didn't go upstream as part of the v3.2 merge window.
> 
> Ah, that patch.
> 
> Which version of the patch does Tony have?  The one you point at which
> uses IS_ERR_VALUE() and I complained about, or the version that has that
> fixed?

Here's what I got. Looks like the removal of the sr[12]_hwmod
part is no longer needed, so only the r value check part is needed.

From: Paul Walmsley <paul@pwsan.com>
Date: Thu, 6 Oct 2011 14:39:28 -0600
Subject: [PATCH] ARM: OMAP3: hwmod: fix variant registration and remove SmartReflex from common list

Commit d6504acd2125984c61dce24727dd3842d0144015 ("OMAP2+: hwmod:
remove OMAP_CHIP*") tests the inverse condition of what it should be
testing for the return value from omap_hwmod_register().  This causes
several IP blocks to not be registered on several OMAP3 family devices.

Fixing that bug also unmasked another bug, originally reported by
Chase Maupin <chase.maupin@ti.com> and then subsequently by Abhilash K
V <abhilash.kv@ti.com>, which caused SmartReflex IP blocks to be
registered on SoCs that don't support them.

Thanks to Russell King - ARM Linux <linux@arm.linux.org.uk> for comments
on a previous version of the patch.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Chase Maupin <chase.maupin@ti.com>
Cc: Abhilash K V <abhilash.kv@ti.com>
Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>
Signed-off-by: Tony Lindgren <tony@atomide.com>

--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3270,7 +3270,7 @@ int __init omap3xxx_hwmod_init(void)
 
 	/* Register hwmods common to all OMAP3 */
 	r = omap_hwmod_register(omap3xxx_hwmods);
-	if (!r)
+	if (r < 0)
 		return r;
 
 	rev = omap_rev();
@@ -3295,7 +3295,7 @@ int __init omap3xxx_hwmod_init(void)
 	};
 
 	r = omap_hwmod_register(h);
-	if (!r)
+	if (r < 0)
 		return r;
 
 	/*

[PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd

[Russell King - ARM Linux]

On Mon, Nov 07, 2011 at 02:51:57PM -0800, Tony Lindgren wrote:
> Here's what I got. Looks like the removal of the sr[12]_hwmod
> part is no longer needed, so only the r value check part is needed.

Err.  So do you have anything in your git tree which you're pushing out
this evening which removes the sr[12]_hwmod from the omap_3xxx_hwmod
list?

If not, how does that bug get fixed in mainline?

[PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd

[Tony Lindgren]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [111107 14:20]:
> On Mon, Nov 07, 2011 at 02:51:57PM -0800, Tony Lindgren wrote:
> > Here's what I got. Looks like the removal of the sr[12]_hwmod
> > part is no longer needed, so only the r value check part is needed.
> 
> Err.  So do you have anything in your git tree which you're pushing out
> this evening which removes the sr[12]_hwmod from the omap_3xxx_hwmod
> list?
> 
> If not, how does that bug get fixed in mainline?

Ah sorry, there's also the following commit there that deals
with other related issues:

From: Abhilash K V <abhilash.kv@ti.com>
Date: Fri, 7 Oct 2011 03:08:56 -0600
Subject: [PATCH] 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 at pwsan.com: dropped 'mailbox class' comments; updated changelog]
Signed-off-by: Paul Walmsley <paul@pwsan.com>

--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -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
 };
 

[PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd

[Russell King - ARM Linux]

On Mon, Nov 07, 2011 at 03:07:28PM -0800, Tony Lindgren wrote:
> * Russell King - ARM Linux <linux@arm.linux.org.uk> [111107 14:20]:
> > On Mon, Nov 07, 2011 at 02:51:57PM -0800, Tony Lindgren wrote:
> > > Here's what I got. Looks like the removal of the sr[12]_hwmod
> > > part is no longer needed, so only the r value check part is needed.
> > 
> > Err.  So do you have anything in your git tree which you're pushing out
> > this evening which removes the sr[12]_hwmod from the omap_3xxx_hwmod
> > list?
> > 
> > If not, how does that bug get fixed in mainline?
> 
> Ah sorry, there's also the following commit there that deals
> with other related issues:

Great, so it looks like everything that I've found over the last two days
should be solved completely by what you have queued for Arnd.

One last issue though...

We had this patch:

http://lists.arm.linux.org.uk/lurker/message/20111006.232441.227dfcf6.en.html

which is from Paul, post my complaint about IS_ERR_VALUE being used.
This removed sr1_hwmod and sr2_hwmod, and the commit message explicitly
talks about doing this.

There's also the patch below.  Somehow, this resulted in that bit of
Paul's patch being removed (possibly automatically by git) but the commit
comments are retained, which are now stale and no longer reflect what the
patch is doing...  That's rather unfortunate, but at this point its
probably too late to do something about it.

> From: Abhilash K V <abhilash.kv@ti.com>
> Date: Fri, 7 Oct 2011 03:08:56 -0600
> Subject: [PATCH] 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 at pwsan.com: dropped 'mailbox class' comments; updated changelog]
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> 
> --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
> @@ -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
>  };
>  

[PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd

[Tony Lindgren]

* Russell King - ARM Linux <linux@arm.linux.org.uk> [111107 14:41]:
> On Mon, Nov 07, 2011 at 03:07:28PM -0800, Tony Lindgren wrote:
> > * Russell King - ARM Linux <linux@arm.linux.org.uk> [111107 14:20]:
> > > On Mon, Nov 07, 2011 at 02:51:57PM -0800, Tony Lindgren wrote:
> > > > Here's what I got. Looks like the removal of the sr[12]_hwmod
> > > > part is no longer needed, so only the r value check part is needed.
> > > 
> > > Err.  So do you have anything in your git tree which you're pushing out
> > > this evening which removes the sr[12]_hwmod from the omap_3xxx_hwmod
> > > list?
> > > 
> > > If not, how does that bug get fixed in mainline?
> > 
> > Ah sorry, there's also the following commit there that deals
> > with other related issues:
> 
> Great, so it looks like everything that I've found over the last two days
> should be solved completely by what you have queued for Arnd.

OK good to hear.

> One last issue though...
> 
> We had this patch:
> 
> http://lists.arm.linux.org.uk/lurker/message/20111006.232441.227dfcf6.en.html
> 
> which is from Paul, post my complaint about IS_ERR_VALUE being used.
> This removed sr1_hwmod and sr2_hwmod, and the commit message explicitly
> talks about doing this.
> 
> There's also the patch below.  Somehow, this resulted in that bit of
> Paul's patch being removed (possibly automatically by git) but the commit
> comments are retained, which are now stale and no longer reflect what the
> patch is doing...  That's rather unfortunate, but at this point its
> probably too late to do something about it.

Yeah that's a bit unfortunate. At least the commit message mentions
what it fixes, and then mentions the secondary bug related to the
sr[12]_hwmod entries. Anyways, I'd rather not start messing with commit
unless people think it's worth rebasing about half of the patches
in fixes.

Regards,

Tony

[PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd

[Paul Walmsley]

On Mon, 7 Nov 2011, Felipe Balbi wrote:

> commit d6504acd (OMAP2+: hwmod: remove OMAP_CHIP*) has
> mistakenly added MUSB as a hwmod available only on ES2.0
> of OMAP3430.
> 
> MUSB hwmod has always be available on all OMAP revisions
> since OMAP2430.

Are you sure about this?  I don't see it in my 3430ES1 TRM text.


- Paul