640-mvswitch.patch 1.4 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748
  1. --- a/drivers/net/phy/Kconfig
  2. +++ b/drivers/net/phy/Kconfig
  3. @@ -70,6 +70,12 @@ config ADM6996_PHY
  4. ---help---
  5. Currently supports the ADM6996F switch
  6. +config MVSWITCH_PHY
  7. + tristate "Driver for Marvell switches"
  8. + select VLAN_8021Q
  9. + ---help---
  10. + Currently supports the Marvell 88E6060 switch.
  11. +
  12. config FIXED_PHY
  13. bool "Driver for MDIO Bus/PHY emulation with fixed speed/link PHYs"
  14. depends on PHYLIB=y
  15. --- a/drivers/net/phy/Makefile
  16. +++ b/drivers/net/phy/Makefile
  17. @@ -13,6 +13,7 @@ obj-$(CONFIG_VITESSE_PHY) += vitesse.o
  18. obj-$(CONFIG_BROADCOM_PHY) += broadcom.o
  19. obj-$(CONFIG_ICPLUS_PHY) += icplus.o
  20. obj-$(CONFIG_ADM6996_PHY) += adm6996.o
  21. +obj-$(CONFIG_MVSWITCH_PHY) += mvswitch.o
  22. obj-$(CONFIG_REALTEK_PHY) += realtek.o
  23. obj-$(CONFIG_FIXED_PHY) += fixed.o
  24. obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o
  25. --- a/drivers/net/phy/mdio_bus.c
  26. +++ b/drivers/net/phy/mdio_bus.c
  27. @@ -35,6 +35,12 @@
  28. #include <asm/irq.h>
  29. #include <asm/uaccess.h>
  30. +static void mdio_dev_release(struct device *dev)
  31. +{
  32. + /* nothing to do */
  33. +}
  34. +
  35. +
  36. /**
  37. * mdiobus_register - bring up all the PHYs on a given bus and attach them to bus
  38. * @bus: target mii_bus
  39. @@ -85,6 +91,7 @@ int mdiobus_register(struct mii_bus *bus
  40. phydev->dev.parent = bus->dev;
  41. phydev->dev.bus = &mdio_bus_type;
  42. + phydev->dev.release = mdio_dev_release;
  43. snprintf(phydev->dev.bus_id, BUS_ID_SIZE, PHY_ID_FMT, bus->id, i);
  44. phydev->bus = bus;