OSDN Git Service

Merge branch 'fixed_phy'
authorDavid S. Miller <davem@davemloft.net>
Thu, 22 May 2014 19:17:34 +0000 (15:17 -0400)
committerDavid S. Miller <davem@davemloft.net>
Thu, 22 May 2014 19:17:34 +0000 (15:17 -0400)
commitcb421c2845dfb496637dd00c6780682bb3b1e3c5
tree2093e6cb47d33d4c3172ad911d29f61a9cc9f987
parenta33fa47e89841a7230c21a33d4a4158dbf9b226c
parent1f8c486fac2cab3615c2872c4ba4bffc1c2ea93c
Merge branch 'fixed_phy'

Florian Fainelli says:

====================
net: of_phy_connect_fixed_link removal

This patch set removes of_phy_connect_fixed_link() from the tree now that
we have a better solution for dealing with fixed PHY (emulated PHY) devices
for drivers that require them.

First two patches update the 'fixed-link' Device Tree binding and drivers to
refere to it.

Patches 3 to 7 update the in-tree network drivers that use
of_phy_connect_fixed_link()

Patch 8 removes of_phy_connect_fixed_link

Patch 9 removes the PowerPC code that parsed the 'fixed-link' property.

Patch 9 can be merged via the net-next tree if the PowerPC folks ack it,
but it really has to be merged after the first 8 patches in order to avoid
breakage.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>