diff options
| author |   David S. Miller <davem@davemloft.net> | 2016-10-18 14:14:22 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-10-18 14:14:22 -0400 |
| commit | 7cafb0ba141e4836604b1c3b35ed6e7a15448d7b (patch) | |
| tree | 3cd14a3eabd49dbdbc4684043985dbb22bf2337a /include/linux | |
| parent | ethernet/sfc: use core min/max MTU checking (diff) | |
| parent | net: smsc91x: add u16 workaround for pxa platforms (diff) | |
Merge branch 'smc91x-dt'
Robert Jarzmik says:
====================
support smc91x on mainstone and devicetree
This series aims at bringing support to mainstone board on a
device-tree based build, as what is already in place for legacy
mainstone.
The bulk of the mainstone "specific" behavior is that a u16 write
doesn't work on a address of the form 4*n + 2, while it works on 4*n.
The legacy workaround was in SMC_outw(), with calls to
machine_is_mainstone(). These calls don't work with a pxa27x-dt
machine type, which is used when a generic device-tree pxa27x machine
is used to boot the mainstone board.
Therefore, this series enables the smc91c111 adapter of the mainstone
board to work on a device-tree build, exaclty as it's been working for
years with the legacy arch/arm/mach-pxa/mainstone.c definition.
As a sum up, this extends an existing mechanism to device-tree based
pxa platforms.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/smc91x.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/smc91x.h b/include/linux/smc91x.h index e302c447e057..129bc674dcf5 100644 --- a/include/linux/smc91x.h +++ b/include/linux/smc91x.h @@ -39,6 +39,7 @@ struct smc91x_platdata { unsigned long flags; unsigned char leda; unsigned char ledb; + bool pxa_u16_align4; /* PXA buggy u16 writes on 4*n+2 addresses */ }; #endif /* __SMC91X_H__ */ |