From: Felipe Balbi <balbi@ti.com>
To: Tony Lindgren <tony@atomide.com>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux ARM Kernel Mailing List
<linux-arm-kernel@lists.infradead.org>,
Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
Paul Walmsley <paul@pwsan.com>, Felipe Balbi <balbi@ti.com>
Subject: [PATCH] arm: omap2+: hwmod: fix breakage introduced by d6504acd
Date: Mon, 7 Nov 2011 19:56:57 +0200 [thread overview]
Message-ID: <1320688617-4543-1-git-send-email-balbi@ti.com> (raw)
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
next reply other threads:[~2011-11-07 17:57 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-07 17:56 Felipe Balbi [this message]
2011-11-07 18:32 ` Russell King - ARM Linux
2011-11-07 19:39 ` Felipe Balbi
2011-11-07 21:27 ` Russell King - ARM Linux
2011-11-07 21:29 ` Paul Walmsley
2011-11-07 22:41 ` Russell King - ARM Linux
2011-11-07 22:51 ` Tony Lindgren
2011-11-07 22:55 ` Russell King - ARM Linux
2011-11-07 23:07 ` Tony Lindgren
2011-11-07 23:16 ` Russell King - ARM Linux
2011-11-07 23:27 ` Tony Lindgren
2011-11-07 21:30 ` 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=1320688617-4543-1-git-send-email-balbi@ti.com \
--to=balbi@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=tony@atomide.com \
/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
all inboxes | Powered by JetHome®