From: Andre Puschmann <andre.puschmann@tu-ilmenau.de>
To: linux-omap@vger.kernel.org
Subject: [PATCH] fix issue where hwmods are being called twice during init
Date: Thu, 08 Dec 2011 22:36:13 +0100 [thread overview]
Message-ID: <jbrake$vnf$1@dough.gmane.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 2748 bytes --]
Hi list,
when compiling the current git HEAD for a Gumstix Overo based board I
discovered an issue during init causing the error message which is
attached. I believe this is because they are called twice during init
(the omap34xx_hwmods struct already contains them).
The attached patch fixes this issue.
BR
Andre
Signed-off-by: Andre Puschmann <andre.puschmann@tu-ilmenau.de>
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 7f8915a..eef43e2 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3247,18 +3247,14 @@ 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
};
Kernel output:
------------[ cut here ]------------
[ 0.000000] WARNING: at arch/arm/mach-omap2/omap_hwmod.c:1959
omap_hwmod_r)
[ 0.000000] omap_hwmod: iva: _register returned -22
[ 0.000000] Modules linked in:
[ 0.000000] [<c001b478>] (unwind_backtrace+0x0/0xf0) from
[<c0053a70>] (wa)
[ 0.000000] [<c0053a70>] (warn_slowpath_common+0x4c/0x64) from
[<c0053b1c>)
[ 0.000000] [<c0053b1c>] (warn_slowpath_fmt+0x30/0x40) from
[<c0681690>] ()
[ 0.000000] [<c0681690>] (omap_hwmod_register+0x11c/0x158) from
[<c067e9e8)
[ 0.000000] [<c067e9e8>] (omap3_init_early+0x1c/0x28) from
[<c067ad50>] (s)
[ 0.000000] [<c067ad50>] (setup_arch+0x814/0x934) from [<c0677560>]
(start)
[ 0.000000] [<c0677560>] (start_kernel+0x80/0x304) from [<80008044>]
(0x80)
[ 0.000000] ---[ end trace 1b75b31a2719ed1c ]---
[ 0.000000] ------------[ cut here ]------------
[ 0.000000] WARNING: at arch/arm/mach-omap2/omap_hwmod.c:1959
omap_hwmod_r)
[ 0.000000] omap_hwmod: mailbox: _register returned -22
[ 0.000000] Modules linked in:
[ 0.000000] [<c001b478>] (unwind_backtrace+0x0/0xf0) from
[<c0053a70>] (wa)
[ 0.000000] [<c0053a70>] (warn_slowpath_common+0x4c/0x64) from
[<c0053b1c>)
[ 0.000000] [<c0053b1c>] (warn_slowpath_fmt+0x30/0x40) from
[<c0681690>] ()
[ 0.000000] [<c0681690>] (omap_hwmod_register+0x11c/0x158) from
[<c067e9e8)
[ 0.000000] [<c067e9e8>] (omap3_init_early+0x1c/0x28) from
[<c067ad50>] (s)
[ 0.000000] [<c067ad50>] (setup_arch+0x814/0x934) from [<c0677560>]
(start)
[ 0.000000] [<c0677560>] (start_kernel+0x80/0x304) from [<80008044>]
(0x80)
[ 0.000000] ---[ end trace 1b75b31a2719ed1d ]---
[-- Attachment #2: remove_double_call_hwmods.patch --]
[-- Type: text/x-patch, Size: 712 bytes --]
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 7f8915a..eef43e2 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -3247,18 +3247,14 @@ 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
};
next reply other threads:[~2011-12-08 21:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-08 21:36 Andre Puschmann [this message]
2011-12-08 21:54 ` [PATCH] fix issue where hwmods are being called twice during init Andre Puschmann
2011-12-08 22:59 ` Paul Walmsley
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='jbrake$vnf$1@dough.gmane.org' \
--to=andre.puschmann@tu-ilmenau.de \
--cc=linux-omap@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox