Commit 9747e231 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'phylib-support-for-MV88X3310-10G-phy' 



Russell King says:

====================
net: Add phylib support for MV88X3310 10G phy

This patch series adds support for the Marvell 88x3310 PHY found on
the SolidRun Macchiatobin board.

The first patch introduces a set of generic Clause 45 PHY helpers that
C45 PHY drivers can make use of if they wish.

Patch 2 ensures that the Clause 22 aneg_done function will not be
called for incompatible Clause 45 PHYs.

Patch 3 fixes the aneg restart to be compatible with C45 PHYs - it can
currently only cope with C22 PHYs.

Patch 4 moves the "gen10g" driver into the Clause 45 code, grouping all
core clause 45 code together.

Patch 5 adds the phy_interface_t types for XAUI and 10GBase-KR links.
As 10GBase-KR appears to be compatible with XFI and SFI, XFI and SFI,
I currently see no reason to add XFI and SFI interface modes.  There
seems to be vendor code out there using these, but they all alias back
to the same hardware settings.

Patch 6 adds support for the MV88X3310 PHY, which supports both the
copper and fiber interfaces.  It should be noted that the MV88X3310
automatically switches its MAC facing interface between 10GBase-KR
and SGMII depending on the negotiated speed.  This was discussed with
Florian, and we agreed to update the phy interface mode depending on
the properties of the actual link mode to the PHY.

v2:
- update sysfs-class-net-phydev documentation
- avoid genphy_aneg_done for non-C22 PHYs
- expand comment about 0x30 constant
- add comment about lack of reset
- configure driver using MARVELL_10G_PHY
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 92046578 20b2af32

Documentation/ABI/testing/sysfs-class-net-phydev

+1 −1
Original line number Diff line number Diff line
@@ -32,5 +32,5 @@ Description: 
		<empty> (not available), mii, gmii, sgmii, tbi, rev-mii,

		rmii, rgmii, rgmii-id, rgmii-rxid, rgmii-txid, rtbi, smii

		xgmii, moca, qsgmii, trgmii, 1000base-x, 2500base-x, rxaui,

		unknown

		xaui, 10gbase-kr, unknown

Documentation/devicetree/bindings/net/ethernet.txt

+2 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ The following properties are common to the Ethernet controllers: 
  * "2000base-x",

  * "2500base-x",

  * "rxaui"

  * "xaui"

  * "10gbase-kr" (10GBASE-KR, XFI, SFI)

- phy-connection-type: the same as "phy-mode" property but described in ePAPR;

- phy-handle: phandle, specifies a reference to a node representing a PHY

  device; this property is described in ePAPR and so preferred;

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -7979,6 +7979,12 @@ S: Maintained 
F:	drivers/net/ethernet/marvell/mv643xx_eth.*

F:	include/linux/mv643xx.h



MARVELL MV88X3310 PHY DRIVER

M:	Russell King <rmk@armlinux.org.uk>

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/phy/marvell10g.c



MARVELL MVNETA ETHERNET DRIVER

M:	Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

L:	netdev@vger.kernel.org

drivers/net/phy/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -292,6 +292,11 @@ config MARVELL_PHY 
	---help---

	  Currently has a driver for the 88E1011S



config MARVELL_10G_PHY

	tristate "Marvell Alaska 10Gbit PHYs"

	---help---

	  Support for the Marvell Alaska MV88X3310 and compatible PHYs.



config MESON_GXL_PHY

	tristate "Amlogic Meson GXL Internal PHY"

	depends on ARCH_MESON || COMPILE_TEST

drivers/net/phy/Makefile

+2 −1
Original line number Diff line number Diff line 
# Makefile for Linux PHY drivers and MDIO bus drivers



libphy-y			:= phy.o phy-core.o phy_device.o

libphy-y			:= phy.o phy-c45.o phy-core.o phy_device.o

mdio-bus-y			+= mdio_bus.o mdio_device.o



ifdef CONFIG_MDIO_DEVICE
@@ -57,6 +57,7 @@ obj-$(CONFIG_INTEL_XWAY_PHY) += intel-xway.o 
obj-$(CONFIG_LSI_ET1011C_PHY)	+= et1011c.o

obj-$(CONFIG_LXT_PHY)		+= lxt.o

obj-$(CONFIG_MARVELL_PHY)	+= marvell.o

obj-$(CONFIG_MARVELL_10G_PHY)	+= marvell10g.o

obj-$(CONFIG_MESON_GXL_PHY)	+= meson-gxl.o

obj-$(CONFIG_MICREL_KS8995MA)	+= spi_ks8995.o

obj-$(CONFIG_MICREL_PHY)	+= micrel.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE