Skip to content

Commit 1577ece

Browse files
Andy Flemingdavem330
authored andcommitted
netdev: Merge UCC and gianfar MDIO bus drivers
The MDIO bus drivers for the UCC and gianfar ethernet controllers are essentially the same. There's no reason to duplicate that much code. Signed-off-by: Andy Fleming <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 9c46f6d commit 1577ece

File tree

12 files changed

+549
-490
lines changed

12 files changed

+549
-490
lines changed

drivers/net/Kconfig

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2272,9 +2272,17 @@ config GELIC_WIRELESS_OLD_PSK_INTERFACE
22722272

22732273
If unsure, say N.
22742274

2275+
config FSL_PQ_MDIO
2276+
tristate "Freescale PQ MDIO"
2277+
depends on FSL_SOC
2278+
select PHYLIB
2279+
help
2280+
This driver supports the MDIO bus used by the gianfar and UCC drivers.
2281+
22752282
config GIANFAR
22762283
tristate "Gianfar Ethernet"
22772284
depends on FSL_SOC
2285+
select FSL_PQ_MDIO
22782286
select PHYLIB
22792287
select CRC32
22802288
help
@@ -2284,6 +2292,7 @@ config GIANFAR
22842292
config UCC_GETH
22852293
tristate "Freescale QE Gigabit Ethernet"
22862294
depends on QUICC_ENGINE
2295+
select FSL_PQ_MDIO
22872296
select PHYLIB
22882297
help
22892298
This driver supports the Gigabit Ethernet mode of the QUICC Engine,

drivers/net/Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,12 @@ obj-$(CONFIG_JME) += jme.o
2424

2525
gianfar_driver-objs := gianfar.o \
2626
gianfar_ethtool.o \
27-
gianfar_mii.o \
2827
gianfar_sysfs.o
2928

3029
obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
31-
ucc_geth_driver-objs := ucc_geth.o ucc_geth_mii.o ucc_geth_ethtool.o
30+
ucc_geth_driver-objs := ucc_geth.o ucc_geth_ethtool.o
31+
32+
obj-$(CONFIG_FSL_PQ_MDIO) += fsl_pq_mdio.o
3233

3334
#
3435
# link order important here

0 commit comments

Comments
 (0)