From: khilman@ti•com (Kevin Hilman)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v3] ARM: OMAP2+: gpmc-smsc911x: add required smsc911x regulators
Date: Thu, 01 Mar 2012 12:36:57 -0800 [thread overview]
Message-ID: <87wr74gis6.fsf@ti.com> (raw)
In-Reply-To: <1330006564-13290-1-git-send-email-mporter@ti.com> (Matt Porter's message of "Thu, 23 Feb 2012 09:16:04 -0500")
Matt Porter <mporter@ti•com> writes:
> This fixes smsc911x support on platforms using gpmc_smsc911x_init().
>
> Commit c7e963f6888816 (net/smsc911x: Add regulator support) added
> the requirement that platforms provide vdd33a and vddvario supplies.
>
> Signed-off-by: Matt Porter <mporter@ti•com>
[...]
> /*
> * Initialize smsc911x device connected to the GPMC. Note that we
> * assume that pin multiplexing is done in the board-*.c file,
> @@ -55,6 +101,12 @@ void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *board_data)
>
> gpmc_cfg = board_data;
>
> + ret = platform_device_register(&gpmc_smsc911x_regulator);
> + if (ret < 0) {
> + pr_err("Unable to register smsc911x regulators: %d\n", ret);
> + return;
> + }
> +
Boards that have more than one instance of the smsc911x (OMAP3/Overo)
barf here because of trying to register the same device twice.
We need something like the patch below to make Overo boot again.
Kevin
>From 4114dea2fb897ab75d05eaa943d29454034fc025 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@ti•com>
Date: Thu, 1 Mar 2012 12:30:42 -0800
Subject: [PATCH] ARM: OMAP2+: gpmc-smsc911x: only register regulators once
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
tracking the regulator registration ensuring only a single device is
registered.
Cc: Matt Porter <mporter@ti•com>
Signed-off-by: Kevin Hilman <khilman@ti•com>
---
arch/arm/mach-omap2/gpmc-smsc911x.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/gpmc-smsc911x.c b/arch/arm/mach-omap2/gpmc-smsc911x.c
index bbb870c..95e6c7d 100644
--- a/arch/arm/mach-omap2/gpmc-smsc911x.c
+++ b/arch/arm/mach-omap2/gpmc-smsc911x.c
@@ -88,6 +88,8 @@ static struct platform_device gpmc_smsc911x_regulator = {
},
};
+static bool regulator_registered;
+
/*
* Initialize smsc911x device connected to the GPMC. Note that we
* assume that pin multiplexing is done in the board-*.c file,
@@ -101,10 +103,14 @@ void __init gpmc_smsc911x_init(struct omap_smsc911x_platform_data *board_data)
gpmc_cfg = board_data;
- ret = platform_device_register(&gpmc_smsc911x_regulator);
- if (ret < 0) {
- pr_err("Unable to register smsc911x regulators: %d\n", ret);
- return;
+ if (!regulator_registered) {
+ ret = platform_device_register(&gpmc_smsc911x_regulator);
+ if (ret < 0) {
+ pr_err("Unable to register smsc911x regulators: %d\n",
+ ret);
+ return;
+ }
+ regulator_registered = true;
}
if (gpmc_cs_request(gpmc_cfg->cs, SZ_16M, &cs_mem_base) < 0) {
--
1.7.9.2
next prev parent reply other threads:[~2012-03-01 20:36 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-23 14:16 [PATCH v3] ARM: OMAP2+: gpmc-smsc911x: add required smsc911x regulators Matt Porter
2012-03-01 20:36 ` Kevin Hilman [this message]
2012-03-01 20:45 ` Felipe Balbi
2012-03-05 18:18 ` Kevin Hilman
2012-03-07 16:00 ` Russ Dill
2012-03-07 17:21 ` Tony Lindgren
2012-03-07 19:36 ` Kevin Hilman
2012-03-08 21:08 ` Tony Lindgren
2012-03-08 21:26 ` Kevin Hilman
2012-03-09 0:06 ` Tony Lindgren
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=87wr74gis6.fsf@ti.com \
--to=khilman@ti$(echo .)com \
--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