--- v5
+++ v4
@@ -1,7 +1,7 @@
This patch set picks up work by Florian Fainelli bringing full DT
support to mv643xx_eth and Marvell SoCs using it.
-The current v5 patch set drops 1:1 compatibiliy with PPC binding
+The current v4 patch set drops 1:1 compatibiliy with PPC binding
for two reasons:
(a) PPC parses DT nodes in arch/ppc/sysdev and creates non-DT
platform_devices itself,
@@ -20,8 +20,7 @@
Also this patch set picks up the opportunity to fix some repeatedly
reported issues with modular mvmdio/mv643xx_eth loading, unloading,
and reloading. It has been tested on SolidRun CuBox (Dove) and
-Seagate Dockstar, QNAP, and USI Topkick (Kirkwood) by me or Andrew
-Lunn.
+Seagate Dockstar (Kirkwood) so far.
Patch 1 fixes an issue introduced with switch to separate mvmdio
driver, where detaching mv643xx_eth from a phy will not stop the
@@ -38,42 +37,31 @@
pointer to platform_data and exploiting that phy_node when attaching
to a phy.
-Patch 5 adds a Kirkwood specific workaround for PORT_SERIAL_CTRL1
-register which is reset to loopback mode when clocks are gated.
+Patch 5 introduces DT parsing support for mv643xx_eth by adding a
+match table to the shared driver and adding a platform_device for
+each of its child nodes.
-Patch 6 introduces DT parsing support for mv643xx_eth by adding a
-match table for marvell,orion-eth and marvell,kirkwood-eth to the
-shared driver and adding a platform_device for each of its child
-nodes.
-
-Patches 7-9 add corresponding device tree nodes to Marvell Dove,
+Patches 6-8 add corresponding device tree nodes to Marvell Dove,
Kirkwood, and Orion5x including all boards. Where known, also
the PHY compatible string has been set to what is reported in the
boards boot loader.
-Patches 10, 11-12, and 14 finally remove all legacy platform_device
+Patches 9, 10-11, and 12 finally remove all legacy platform_device
based registration from Dove, Kirkwood, and Orion5x DT setup. For
Kirkwood also now obsolete board specific setup is removed from
common DT board setup, Kconfig, Makefile, and kirkwood_defconfig.
-For the patches above I suggest to take Patches 1-6 through David
-Miller's branch, and Patches 7-12 through Jason Cooper's when the
-former have appeared on mainline linux. The patch set has been based
-on v3.10-rc3.
+For the patches above I suggest to take Patches 1-5 through David
+Miller's branch, and Patches 6-12 through Jason Cooper's when they
+have appeared on mainline linux. The patch set has been based on
+todays net-next, if I shall rebase them on any other branch please
+name it.
-Overall Changelog:
-v4->v5: v5 drops Kirkwood MAC address workaround by using DT
- property because OF API does not allow to modify properties
- easily. Instead the current workaround by not gating ge clocks
- is kept. The OF property workaround is postponed until some
- easy to use of_set_property is available.
-
-Sebastian Hesselbarth (13):
+Sebastian Hesselbarth (12):
net: mv643xx_eth: use phy_disconnect instead of phy_detach
net: mv643xx_eth: use managed devm_ioremap for port registers
net: mv643xx_eth: add phy_node to platform_data struct
net: mv643xx_eth: use of_phy_connect if phy_node present
- net: mv643xx_eth: proper initialization for Kirkwood SoCs
net: mv643xx_eth: add DT parsing support
ARM: dove: add gigabit ethernet and mvmdio device tree nodes
ARM: kirkwood: add gigabit ethernet and mvmdio device tree nodes
@@ -83,7 +71,7 @@
ARM: kirkwood: remove redundant DT board files
ARM: orion5x: remove legacy mv643xx_eth board setup
- .../devicetree/bindings/net/marvell-orion-net.txt | 85 +++++++++
+ .../devicetree/bindings/net/marvell-orion-net.txt | 83 +++++++++
arch/arm/boot/dts/dove-cubox.dts | 7 +
arch/arm/boot/dts/dove.dtsi | 35 ++++
arch/arm/boot/dts/kirkwood-cloudbox.dts | 16 ++
@@ -91,7 +79,7 @@
arch/arm/boot/dts/kirkwood-dockstar.dts | 17 ++
arch/arm/boot/dts/kirkwood-dreamplug.dts | 28 +++
arch/arm/boot/dts/kirkwood-goflexnet.dts | 16 ++
- .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 30 +++
+ .../arm/boot/dts/kirkwood-guruplug-server-plus.dts | 30 ++++
arch/arm/boot/dts/kirkwood-ib62x0.dts | 16 ++
arch/arm/boot/dts/kirkwood-iconnect.dts | 16 ++
arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts | 24 +++
@@ -112,19 +100,19 @@
arch/arm/boot/dts/kirkwood-ts219.dtsi | 16 ++
arch/arm/boot/dts/kirkwood.dtsi | 52 ++++++
.../dts/orion5x-lacie-ethernet-disk-mini-v2.dts | 17 ++
- arch/arm/boot/dts/orion5x.dtsi | 29 +++
+ arch/arm/boot/dts/orion5x.dtsi | 29 ++++
arch/arm/configs/kirkwood_defconfig | 16 --
arch/arm/mach-dove/board-dt.c | 9 -
- arch/arm/mach-kirkwood/Kconfig | 117 ------------
+ arch/arm/mach-kirkwood/Kconfig | 117 -------------
arch/arm/mach-kirkwood/Makefile | 16 --
arch/arm/mach-kirkwood/board-dnskw.c | 7 -
arch/arm/mach-kirkwood/board-dockstar.c | 32 ----
arch/arm/mach-kirkwood/board-dreamplug.c | 35 ----
- arch/arm/mach-kirkwood/board-dt.c | 64 +------
+ arch/arm/mach-kirkwood/board-dt.c | 40 -----
arch/arm/mach-kirkwood/board-goflexnet.c | 34 ----
arch/arm/mach-kirkwood/board-guruplug.c | 33 ----
- arch/arm/mach-kirkwood/board-ib62x0.c | 29 ---
- arch/arm/mach-kirkwood/board-iconnect.c | 10 -
+ arch/arm/mach-kirkwood/board-ib62x0.c | 29 ----
+ arch/arm/mach-kirkwood/board-iconnect.c | 10 --
arch/arm/mach-kirkwood/board-iomega_ix2_200.c | 34 ----
arch/arm/mach-kirkwood/board-km_kirkwood.c | 44 -----
arch/arm/mach-kirkwood/board-lsxl.c | 16 --
@@ -133,11 +121,11 @@
arch/arm/mach-kirkwood/board-openblocks_a6.c | 26 ---
arch/arm/mach-kirkwood/board-readynas.c | 6 -
arch/arm/mach-kirkwood/board-ts219.c | 13 --
- arch/arm/mach-kirkwood/board-usi_topkick.c | 29 ---
- arch/arm/mach-orion5x/edmini_v2-setup.c | 10 -
- drivers/net/ethernet/marvell/mv643xx_eth.c | 194 ++++++++++++++++++--
+ arch/arm/mach-kirkwood/board-usi_topkick.c | 29 ----
+ arch/arm/mach-orion5x/edmini_v2-setup.c | 10 --
+ drivers/net/ethernet/marvell/mv643xx_eth.c | 182 ++++++++++++++++++--
include/linux/mv643xx_eth.h | 2 +
- 54 files changed, 754 insertions(+), 644 deletions(-)
+ 54 files changed, 739 insertions(+), 621 deletions(-)
create mode 100644 Documentation/devicetree/bindings/net/marvell-orion-net.txt
delete mode 100644 arch/arm/mach-kirkwood/board-dockstar.c
delete mode 100644 arch/arm/mach-kirkwood/board-dreamplug.c
@@ -159,5 +147,6 @@
Cc: linux-arm-kernel@lists.infradead.org
Cc: linuxppc-dev@lists.ozlabs.org
Cc: linux-kernel@vger.kernel.org
+
--
1.7.10.4