| Message ID | 1315910969-4018-1-git-send-email-dave.martin@linaro.org |
|---|---|
| State | Accepted |
| Headers | show |
On Tue, Sep 13, 2011 at 11:49:29AM +0100, Dave Martin wrote: > The SMSC911X_USE_16BIT needs to be set when using 16-bit register > access. However, currently no flag is set if the device tree > doesn't specify 32-bit access, resulting in a BUG() and a non- > working driver when 16-bit register access is configured for > smsc911x in the DT. > > This patch should set the SMSC911X_USE_16BIT flag in a manner > consistent with the documented DT bindings. > > Signed-off-by: Dave Martin <dave.martin@linaro.org> Acked-by: Grant Likely <grant.likely@secretlab.ca> > --- > drivers/net/ethernet/smsc/smsc911x.c | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c > index 788c4fd..a3aa4c0 100644 > --- a/drivers/net/ethernet/smsc/smsc911x.c > +++ b/drivers/net/ethernet/smsc/smsc911x.c > @@ -2121,6 +2121,8 @@ static int __devinit smsc911x_probe_config_dt( > of_property_read_u32(np, "reg-io-width", &width); > if (width == 4) > config->flags |= SMSC911X_USE_32BIT; > + else > + config->flags |= SMSC911X_USE_16BIT; > > if (of_get_property(np, "smsc,irq-active-high", NULL)) > config->irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH; > -- > 1.7.4.1 > > _______________________________________________ > devicetree-discuss mailing list > devicetree-discuss@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/devicetree-discuss
From: Dave Martin <dave.martin@linaro.org> Date: Tue, 13 Sep 2011 11:49:29 +0100 > The SMSC911X_USE_16BIT needs to be set when using 16-bit register > access. However, currently no flag is set if the device tree > doesn't specify 32-bit access, resulting in a BUG() and a non- > working driver when 16-bit register access is configured for > smsc911x in the DT. > > This patch should set the SMSC911X_USE_16BIT flag in a manner > consistent with the documented DT bindings. > > Signed-off-by: Dave Martin <dave.martin@linaro.org> Applied to net-next, thanks.
diff --git a/drivers/net/ethernet/smsc/smsc911x.c b/drivers/net/ethernet/smsc/smsc911x.c index 788c4fd..a3aa4c0 100644 --- a/drivers/net/ethernet/smsc/smsc911x.c +++ b/drivers/net/ethernet/smsc/smsc911x.c @@ -2121,6 +2121,8 @@ static int __devinit smsc911x_probe_config_dt( of_property_read_u32(np, "reg-io-width", &width); if (width == 4) config->flags |= SMSC911X_USE_32BIT; + else + config->flags |= SMSC911X_USE_16BIT; if (of_get_property(np, "smsc,irq-active-high", NULL)) config->irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH;
The SMSC911X_USE_16BIT needs to be set when using 16-bit register access. However, currently no flag is set if the device tree doesn't specify 32-bit access, resulting in a BUG() and a non- working driver when 16-bit register access is configured for smsc911x in the DT. This patch should set the SMSC911X_USE_16BIT flag in a manner consistent with the documented DT bindings. Signed-off-by: Dave Martin <dave.martin@linaro.org> --- drivers/net/ethernet/smsc/smsc911x.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)