Hi, On Thu, Mar 01, 2012 at 12:36:57PM -0800, Kevin Hilman wrote: > Matt Porter <[email protected]> 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 <[email protected]> > > [...] > > > /* > > * 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 <[email protected]> > 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 <[email protected]> > Signed-off-by: Kevin Hilman <[email protected]> > --- > 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;
Wow, this is quite a hack. Is the regulator part of the SMSC911x device or is it outside ? If it's outside the SMSC91xx (which I believe it is) there should be a regulator driver instead of this hack. For boards which don't provide such a regulator (and tie the supply pin to some constant voltage source) there should be a constant regulator supplying the pin. But this patch is quite hacky. -- balbi
signature.asc
Description: Digital signature
