From: arnd@arndb•de (Arnd Bergmann)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] ARM: OMAP2+: gpmc-smsc911x: only register regulator for first instance
Date: Mon, 19 Mar 2012 22:09:43 +0000 [thread overview]
Message-ID: <201203192209.43906.arnd@arndb.de> (raw)
In-Reply-To: <87mx7c5kzj.fsf@ti.com>
On Monday 19 March 2012, Kevin Hilman wrote:
> > On Wednesday 07 March 2012, Kevin Hilman wrote:
> >> commit e4b0b2cbbb (ARM: OMAP2+: gpmc-smsc911x: add required smsc911x
> >> regulators) added regulators which are registered during
> >> gpmc_smsc911x_init(). However, some platforms (OMAP3/Overo) have more
> >> than one instance of the SMSC911x and result in attempting to register
> >> the same regulator more than once which causes a panic().
> >>
> >> Fix this by only registering the regulator when the platform_data id
> >> field is zero, indicating its the first instance.
> >>
> >> Cc: Matt Porter <mporter@ti•com>
> >> Signed-off-by: Kevin Hilman <khilman@ti•com>
> >
> > It seems that both Olof and I forgot to forward this one to Linus.
> >
> > If it's ok for you, I'll add it to the fixes branch for v3.4 now
> > and mark it for backporting to v3.3-stable.
>
> A slightly different version of this is already in linux-next as commit
> bb60424af517d6e6148505fb5ef256caa91b5b43.
>
> It was in your 'fixes' branch, and was merged by Olaf from Tony on 3/13:
> Merge branch 'fix-smsc911x-regulator' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
>
Yes, I know it's in linux-next because I found it in the fixes branch.
That is the branch with stuff that should have gone into v3.3 :(
Is the bb60424af version ok? If I add a stable at vger.kernel.org tag in
there, it will obviously get a new changeset ID but I was not planning
on changing the contents to the version from the mailing list in case
that is different.
Arnd
next prev parent reply other threads:[~2012-03-19 22:09 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-07 0:39 [PATCH] ARM: OMAP2+: gpmc-smsc911x: only register regulator for first instance Kevin Hilman
2012-03-07 0:44 ` Tony Lindgren
2012-03-07 1:39 ` Kevin Hilman
2012-03-07 2:28 ` Tony Lindgren
2012-03-19 21:18 ` Arnd Bergmann
2012-03-19 21:39 ` Kevin Hilman
2012-03-19 22:09 ` Arnd Bergmann [this message]
2012-03-19 22:48 ` Tony Lindgren
2012-03-20 8:20 ` Arnd Bergmann
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=201203192209.43906.arnd@arndb.de \
--to=arnd@arndb$(echo .)de \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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