Le 03/22/13 15:14, Jason Cooper a écrit :

On Fri, Mar 22, 2013 at 02:39:24PM +0100, Florian Fainelli wrote:

quoted

Hi all,

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.

Florian Fainelli (4):
   net: mvmdio: allow platform device style registration
   net: mvmdio: rename base register cookie from smireg to regs
   net: mvmdio: enhance driver to support SMI error/done interrupts
   mv643xx_eth: convert to use the Marvell Orion MDIO driver

  .../devicetree/bindings/net/marvell-orion-mdio.txt |    3 +
  arch/arm/plat-orion/common.c                       |   54 +++---
  arch/powerpc/platforms/chrp/pegasos_eth.c          |   20 ++
  arch/powerpc/sysdev/mv64x60_dev.c                  |   16 +-
  drivers/net/ethernet/marvell/Kconfig               |    5 +-
  drivers/net/ethernet/marvell/Makefile              |    2 +-
  drivers/net/ethernet/marvell/mv643xx_eth.c         |  195 ++------------------
  drivers/net/ethernet/marvell/mvmdio.c              |  130 ++++++++++---
  include/linux/mv643xx_eth.h                        |    1 -
  9 files changed, 187 insertions(+), 239 deletions(-)

Whole series applied on top of v3.9-rc3 and tested on dreamplug
(kirkwood DT boot with legacy mv643xx_eth init)

Ok, thanks! Does that mean that you want these changes to go via your 
tree? David initially applied my v2 of this patchset, and since it 
thouches mostly ethernet driver stuff, I would rather make it go via his 
tree if both of you agree.
--
Florian