diff options
| author |   Dave Martin <dave.martin@linaro.org> | 2011-09-13 00:49:29 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-09-21 15:18:31 -0400 |
| commit | f26cd41ae56f3c0ef4521505ad5b6e3940849c33 (patch) | |
| tree | 1edbdbb1946b154a9e929da18605afef9a998663 /drivers/net | |
| parent | net/phy: add IC+ IP101A and support APS. (diff) | |
| download | linux-dev-f26cd41ae56f3c0ef4521505ad5b6e3940849c33.tar.xz linux-dev-f26cd41ae56f3c0ef4521505ad5b6e3940849c33.zip | |
net/smsc911x: Correctly configure 16-bit register access from DT
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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | 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 788c4fdab9c2..a3aa4c0e87f3 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; |