diff options
| author | Kevin Hilman | 2012-03-01 21:30:42 +0100 |
|---|---|---|
| committer | Tony Lindgren | 2012-03-07 03:27:19 +0100 |
| commit | bb60424af517d6e6148505fb5ef256caa91b5b43 (patch) | |
| tree | b3ee991a59b381d525da78121effea7e15c4fff1 /arch | |
| parent | ARM: OMAP2+: Fix module build errors with CONFIG_OMAP4_ERRATA_I688 (diff) | |
| download | kernel-qcow2-linux-bb60424af517d6e6148505fb5ef256caa91b5b43.tar.gz kernel-qcow2-linux-bb60424af517d6e6148505fb5ef256caa91b5b43.tar.xz kernel-qcow2-linux-bb60424af517d6e6148505fb5ef256caa91b5b43.zip | |
ARM: OMAP2+: gpmc-smsc911x: only register regulator for first instance
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>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/gpmc-smsc911x.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/gpmc-smsc911x.c b/arch/arm/mach-omap2/gpmc-smsc911x.c index bbb870c04a5e..5e5880d6d099 100644 --- a/arch/arm/mach-omap2/gpmc-smsc911x.c +++ b/arch/arm/mach-omap2/gpmc-smsc911x.c @@ -101,10 +101,13 @@ 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 (!gpmc_cfg->id) { + ret = platform_device_register(&gpmc_smsc911x_regulator); + if (ret < 0) { + pr_err("Unable to register smsc911x regulators: %d\n", + ret); + return; + } } if (gpmc_cs_request(gpmc_cfg->cs, SZ_16M, &cs_mem_base) < 0) { |