Skip to content

Commit

Permalink
ucc_geth: migrate ucc_geth to phylib
Browse files Browse the repository at this point in the history
migrate ucc_geth to use the common phylib code.

There are several side effects from doing this:

o deprecate 'interface' property specification present
  in some old device tree source files in
  favour of a split 'max-speed' and 'interface-type'
  description to appropriately match definitions
  in include/linux/phy.h.  Note that 'interface' property
  is still honoured if max-speed or interface-type
  are not present (backward compatible).
o compile-time CONFIG_UGETH_HAS_GIGA is eliminated
  in favour of probe time speed derivation logic.
o adjust_link streamlined to only operate on maccfg2
  and upsmr.r10m, instead of reapplying static initial
  values related to the interface-type.
o Addition of UEC MDIO of_platform driver requires
  platform code add 'mdio' type to id list
  prior to calling of_platform_bus_probe (separate patch).
o ucc_struct_init introduced to reduce ucc_geth_startup
  complexity.

Signed-off-by: Li Yang <leoli@freescale.com>
Signed-off-by: Kim Phillips <kim.phillips@freescale.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
  • Loading branch information
Kim Phillips authored and Jeff Garzik committed Apr 28, 2007
1 parent a999589 commit 728de4c
Show file tree
Hide file tree
Showing 9 changed files with 659 additions and 1,689 deletions.
4 changes: 0 additions & 4 deletions drivers/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -2296,10 +2296,6 @@ config UGETH_TX_ON_DEMOND
bool "Transmit on Demond support"
depends on UCC_GETH

config UGETH_HAS_GIGA
bool
depends on UCC_GETH && PPC_MPC836x

config MV643XX_ETH
tristate "MV-643XX Ethernet support"
depends on MOMENCO_OCELOT_C || MOMENCO_JAGUAR_ATX || MV64360 || MOMENCO_OCELOT_3 || (PPC_MULTIPLATFORM && PPC32)
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gianfar_driver-objs := gianfar.o \
gianfar_sysfs.o

obj-$(CONFIG_UCC_GETH) += ucc_geth_driver.o
ucc_geth_driver-objs := ucc_geth.o ucc_geth_phy.o
ucc_geth_driver-objs := ucc_geth.o ucc_geth_mii.o

#
# link order important here
Expand Down
Loading

0 comments on commit 728de4c

Please sign in to comment.