Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f26cd41a authored by Dave Martin's avatar Dave Martin Committed by David S. Miller
Browse files

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: default avatarDave Martin <dave.martin@linaro.org>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c9b1f24

drivers/net/ethernet/smsc/smsc911x.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -2121,6 +2121,8 @@ static int __devinit smsc911x_probe_config_dt( 
	of_property_read_u32(np, "reg-io-width", &width);

	of_property_read_u32(np, "reg-io-width", &width);

	if (width == 4)

	if (width == 4)

		config->flags |= SMSC911X_USE_32BIT;

		config->flags |= SMSC911X_USE_32BIT;

	else

		config->flags |= SMSC911X_USE_16BIT;





	if (of_get_property(np, "smsc,irq-active-high", NULL))

	if (of_get_property(np, "smsc,irq-active-high", NULL))

		config->irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH;

		config->irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH;