diff options
| author | David S. Miller | 2013-03-22 15:25:25 +0100 |
|---|---|---|
| committer | David S. Miller | 2013-03-22 15:25:25 +0100 |
| commit | 9b924dbd5e903aa6394ff6feee8275b9bde313d1 (patch) | |
| tree | e61bf96df027d188c5b07722911121ec1186e701 /include/net | |
| parent | s6gmac: fix error return code in s6gmac_probe() (diff) | |
| parent | mv643xx_eth: convert to use the Marvell Orion MDIO driver (diff) | |
| download | kernel-qcow2-linux-9b924dbd5e903aa6394ff6feee8275b9bde313d1.tar.gz kernel-qcow2-linux-9b924dbd5e903aa6394ff6feee8275b9bde313d1.tar.xz kernel-qcow2-linux-9b924dbd5e903aa6394ff6feee8275b9bde313d1.zip | |
Merge branch 'mv643xx_eth'
Florian Fainelli says:
====================
This patch converts the mv643xx_eth driver to use the mvmdio MDIO bus driver
instead of rolling its own implementation. As a result, all users of this
mv643xx_eth driver are converted to register an "orion-mdio" platform_device.
The mvmdio driver is also updated to support an interrupt line which reports
SMI error/completion, and to allow traditionnal platform device registration
instead of just device tree.
David, I think it makes sense for you to merge all of this, since we do
not want the architecture files to be desynchronized from the mv643xx_eth to
avoid runtime breakage. The potential for merge conflicts should be very small.
====================
Tested-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Tested-by: Jason Cooper <jason@lakedaemon.net>
Acked-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
0 files changed, 0 insertions, 0 deletions