From: David S. Miller Date: Fri, 22 Mar 2013 14:25:25 +0000 (-0400) Subject: Merge branch 'mv643xx_eth' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9b924dbd5e903aa6394ff6feee8275b9bde313d1;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Tested-by: Jason Cooper Acked-by: Jason Cooper Signed-off-by: David S. Miller --- 9b924dbd5e903aa6394ff6feee8275b9bde313d1