ppc32: Update 8260_io/fcc_enet.c to function again
PATCH 1/1 ppc32: Update 8260_io/fcc_enet.c to function again
There's too many things in here that've sat too long (I'd been hoping to just delete the driver, but that hasn't happened yet, so). A cobbled together list of changes is:
- Update MDIO support for workqueues.
- Make use of <linux/mii.h>
- Add RPX6 support.
- Comment out set_multicast_list (broken).
- Rework tx_ring stuff so we have tx_free, not tx_Full/n_pkts.
- Other PHY updates/fixes.
- Leo Li: Rework FCC clock configuration, make it easier.
- 2.4 : VLAN header room, other misc bits.
- Kill MII_REG_NNN in favor of defines from <linux/mii.h>
- DM9161 PHY support (2.4, Myself & [email protected])
- PQ2ADS and PQ2FADS support bits (Myself & [email protected]
From: Leo Li <[email protected]>
arch/ppc/8260_io/Kconfig | 11 arch/ppc/8260_io/fcc_enet.c | 969 +++++++++++++------------------------------- include/asm-ppc/cpm2.h | 1 3 files changed, 301 insertions(+), 680 deletions(-)
arch/ppc/8260_io/Kconfig +2 -9
@@ -42,7 +42,7 @@ choice prompt "Type of PHY" depends on 8260 && USE_MDIO - default FCC_GENERIC_PHY + default FCC_LXT971 config FCC_LXT970 bool "LXT970"
@@ -53,13 +53,6 @@ config FCC_QS6612 bool "QS6612" -config FCC_DM9131 - bool "DM9131" - -config FCC_DM9161 - bool "DM9161" - -config FCC_GENERIC_PHY - bool "Generic" endchoice endmenu +
arch/ppc/8260_io/fcc_enet.c +299 -670
1,559 lines not on this page · raw message
include/asm-ppc/cpm2.h +0 -1
@@ -69,7 +69,6 @@#define CPM_CR_INIT_TX ((ushort)0x0002)#define CPM_CR_HUNT_MODE ((ushort)0x0003)#define CPM_CR_STOP_TX ((ushort)0x0004) -#define CPM_CR_GRA_STOP_TX ((ushort)0x0005)#define CPM_CR_RESTART_TX ((ushort)0x0006)#define CPM_CR_SET_GADDR ((ushort)0x0008)#define CPM_CR_START_IDMA ((ushort)0x0009)
Signature · 2 lines
Tom Rini http://gate.crashing.org/~trini/
Quoted 17 lines · Tom Rini
There's too many things in here that've sat too long (I'd been hoping to
just delete the driver, but that hasn't happened yet, so). A cobbled together list of changes is:- Update MDIO support for workqueues.
- Make use of <linux/mii.h>
- Add RPX6 support.
- Comment outset_multicast_list(broken).
- Reworktx_ringstuff so we havetx_free, not tx_Full/n_pkts.
- Other PHY updates/fixes.
- Leo Li: Rework FCC clock configuration, make it easier.
- 2.4 : VLAN header room, other misc bits.
- KillMII_REG_NNNin favor of defines from <linux/mii.h>
- DM9161 PHY support (2.4, Myself & [email protected])
- PQ2ADS and PQ2FADS support bits (Myself & [email protected]
Quoted 3 lines
From: Leo Li <[email protected]>
Signed-off-by Tom Rini <[email protected]>Signed-off-by Alexandre Bastos <[email protected]>
That's unfortunate - Oray sent a patch in just a few days ago which also fixes up this driver. See
ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.11/2.6.11-mm3/broken-out/ppc-8260-fcc-ethernet-driver-cannot-read-lxt971-phy-id.patch
What should we do?
Quoted 4 lines · Tom Rini
There's too many things in here that've sat too long (I'd been hoping to just delete the driver, but that hasn't happened yet, so). A cobbled together list of changes is:
Quoted 11 lines
- Update MDIO support for workqueues.
- Make use of <linux/mii.h>
- Add RPX6 support.
- Comment outset_multicast_list(broken).
- Reworktx_ringstuff so we havetx_free, not tx_Full/n_pkts.
- Other PHY updates/fixes.
- Leo Li: Rework FCC clock configuration, make it easier.
- 2.4 : VLAN header room, other misc bits.
- KillMII_REG_NNNin favor of defines from <linux/mii.h>
- DM9161 PHY support (2.4, Myself & [email protected])
- PQ2ADS and PQ2FADS support bits (Myself & [email protected]
Please make sure I and [email protected] are CC'd on all net driver patches.
Also, it would be nice to move this into drivers/net/*
Jeff