Merge tag 'marvell-neta-for-3.8' of...

* Marvell Armada 370 / Armada XP Ethernet Controller (NETA)

Required properties:

- compatible: should be "marvell,armada-370-neta".

- reg: address and length of the register set for the device.

- interrupts: interrupt for the device

- phy: A phandle to a phy node defining the PHY address (as the reg

  property, a single integer).

- phy-mode: The interface between the SoC and the PHY (a string that

  of_get_phy_mode() can understand)

- clock-frequency: frequency of the peripheral clock of the SoC.

Example:

ethernet@d0070000 {

	compatible = "marvell,armada-370-neta";

	reg = <0xd0070000 0x2500>;

	interrupts = <8>;

	clock-frequency = <250000000>;

	status = "okay";

	phy = <&phy0>;

	phy-mode = "rgmii-id";

};

* Marvell MDIO Ethernet Controller interface

The Ethernet controllers of the Marvel Kirkwood, Dove, Orion5x,

MV78xx0, Armada 370 and Armada XP have an identical unit that provides

an interface with the MDIO bus. This driver handles this MDIO

interface.

Required properties:

- compatible: "marvell,orion-mdio"

- reg: address and length of the SMI register

The child nodes of the MDIO driver are the individual PHY devices

connected to this MDIO bus. They must have a "reg" property given the

PHY address on the MDIO bus.

Example at the SoC level:

mdio {

	#address-cells = <1>;

	#size-cells = <0>;

	compatible = "marvell,orion-mdio";

	reg = <0xd0072004 0x4>;

};

And at the board level:

mdio {

	phy0: ethernet-phy@0 {

		reg = <0>;

	};

	phy1: ethernet-phy@1 {

		reg = <1>;

	};

}

F:	drivers/net/ethernet/marvell/mv643xx_eth.*

F:	include/linux/mv643xx.h

MARVELL MVNETA ETHERNET DRIVER

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

L:	netdev@vger.kernel.org

S:	Maintained

F:	drivers/net/ethernet/marvell/mvneta.*

MARVELL MWIFIEX WIRELESS DRIVER

M:	Bing Zhao <bzhao@marvell.com>

L:	linux-wireless@vger.kernel.org

	  Some boards that use the Discovery chipset are the Momenco

	  Ocelot C and Jaguar ATX and Pegasos II.

config MVMDIO

	tristate "Marvell MDIO interface support"

	---help---

	  This driver supports the MDIO interface found in the network

	  interface units of the Marvell EBU SoCs (Kirkwood, Orion5x,

	  Dove, Armada 370 and Armada XP).

	  For now, this driver is only needed for the MVNETA driver

	  (used on Armada 370 and XP), but it could be used in the

	  future by the MV643XX_ETH driver.

config MVNETA

	tristate "Marvell Armada 370/XP network interface support"

	depends on MACH_ARMADA_370_XP

	select PHYLIB

	select MVMDIO

	---help---

	  This driver supports the network interface units in the

	  Marvell ARMADA XP and ARMADA 370 SoC family.

	  Note that this driver is distinct from the mv643xx_eth

	  driver, which should be used for the older Marvell SoCs

	  (Dove, Orion, Discovery, Kirkwood).

config PXA168_ETH

	tristate "Marvell pxa168 ethernet support"

	depends on CPU_PXA168

#

obj-$(CONFIG_MV643XX_ETH) += mv643xx_eth.o

obj-$(CONFIG_MVMDIO) += mvmdio.o

obj-$(CONFIG_MVNETA) += mvneta.o

obj-$(CONFIG_PXA168_ETH) += pxa168_eth.o

obj-$(CONFIG_SKGE) += skge.o

obj-$(CONFIG_SKY2) += sky2.o