ixp4xx: revert kernel support for 2.6.33 & 2.6.35

[openwrt/staging/chunkeey.git] / target / linux / ixp4xx / patches-2.6.33 / 207-npe_driver_multiphy_support.patch

diff --git a/target/linux/ixp4xx/patches-2.6.33/207-npe_driver_multiphy_support.patch b/target/linux/ixp4xx/patches-2.6.33/207-npe_driver_multiphy_support.patch
deleted file mode 100644 (file)
index afcf7e1..0000000
--- a/target/linux/ixp4xx/patches-2.6.33/207-npe_driver_multiphy_support.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-TODO: take care of additional PHYs through the PHY abstraction layer
-
---- a/arch/arm/mach-ixp4xx/include/mach/platform.h
-+++ b/arch/arm/mach-ixp4xx/include/mach/platform.h
-@@ -72,7 +72,7 @@ extern unsigned long ixp4xx_exp_bus_size
- /*
-  * Clock Speed Definitions.
-  */
--#define IXP4XX_PERIPHERAL_BUS_CLOCK   (66) /* 66Mhzi APB BUS   */ 
-+#define IXP4XX_PERIPHERAL_BUS_CLOCK   (66) /* 66Mhzi APB BUS   */
- #define IXP4XX_UART_XTAL              14745600
- 
- /*
-@@ -95,12 +95,23 @@ struct sys_timer;
- #define IXP4XX_ETH_NPEB               0x10
- #define IXP4XX_ETH_NPEC               0x20
- 
-+#define IXP4XX_ETH_PHY_MAX_ADDR       32
-+
- /* Information about built-in Ethernet MAC interfaces */
- struct eth_plat_info {
-       u8 phy;         /* MII PHY ID, 0 - 31 */
-       u8 rxq;         /* configurable, currently 0 - 31 only */
-       u8 txreadyq;
-       u8 hwaddr[6];
-+
-+      u32 phy_mask;
-+#if 0
-+      int speed;
-+      int duplex;
-+#else
-+      int speed_10;
-+      int half_duplex;
-+#endif
- };
- 
- /* Information about built-in HSS (synchronous serial) interfaces */
---- a/drivers/net/arm/ixp4xx_eth.c
-+++ b/drivers/net/arm/ixp4xx_eth.c
-@@ -417,6 +417,37 @@ static int ixp4xx_phy_connect(struct net
-       struct eth_plat_info *plat = port->plat;
-       char phy_id[MII_BUS_ID_SIZE + 3];
- 
-+      if (plat->phy == IXP4XX_ETH_PHY_MAX_ADDR) {
-+#if 0
-+              switch (plat->speed) {
-+              case SPEED_10:
-+              case SPEED_100:
-+                      break;
-+              default:
-+                      printk(KERN_ERR "%s: invalid speed (%d)\n",
-+                                      dev->name, plat->speed);
-+                      return -EINVAL;
-+              }
-+
-+              switch (plat->duplex) {
-+              case DUPLEX_HALF:
-+              case DUPLEX_FULL:
-+                      break;
-+              default:
-+                      printk(KERN_ERR "%s: invalid duplex mode (%d)\n",
-+                                      dev->name, plat->duplex);
-+                      return -EINVAL;
-+              }
-+              port->speed = plat->speed;
-+              port->duplex = plat->duplex;
-+#else
-+              port->speed = plat->speed_10 ? SPEED_10 : SPEED_100;
-+              port->duplex = plat->half_duplex ? DUPLEX_HALF : DUPLEX_FULL;
-+#endif
-+
-+              return 0;
-+      }
-+
-       snprintf(phy_id, MII_BUS_ID_SIZE + 3, PHY_ID_FMT, "0", plat->phy);
-       port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
-                                  PHY_INTERFACE_MODE_MII);
-@@ -438,21 +469,32 @@ static void ixp4xx_phy_disconnect(struct
- {
-       struct port *port = netdev_priv(dev);
- 
--      phy_disconnect(port->phydev);
-+      if (port->phydev)
-+              phy_disconnect(port->phydev);
- }
- 
- static void ixp4xx_phy_start(struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
- 
--      phy_start(port->phydev);
-+      if (port->phydev) {
-+              phy_start(port->phydev);
-+      } else {
-+              port->link = 1;
-+              ixp4xx_update_link(dev);
-+      }
- }
- 
- static void ixp4xx_phy_stop(struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
- 
--      phy_stop(port->phydev);
-+      if (port->phydev) {
-+              phy_stop(port->phydev);
-+      } else {
-+              port->link = 0;
-+              ixp4xx_update_link(dev);
-+      }
- }
- 
- static inline void debug_pkt(struct net_device *dev, const char *func,
-@@ -826,6 +868,10 @@ static int eth_ioctl(struct net_device *
- 
-       if (!netif_running(dev))
-               return -EINVAL;
-+
-+      if (!port->phydev)
-+              return -EOPNOTSUPP;
-+
-       return phy_mii_ioctl(port->phydev, if_mii(req), cmd);
- }
- 
-@@ -845,18 +891,30 @@ static void ixp4xx_get_drvinfo(struct ne
- static int ixp4xx_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
- {
-       struct port *port = netdev_priv(dev);
-+
-+      if (!port->phydev)
-+              return -EOPNOTSUPP;
-+
-       return phy_ethtool_gset(port->phydev, cmd);
- }
- 
- static int ixp4xx_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
- {
-       struct port *port = netdev_priv(dev);
-+
-+      if (!port->phydev)
-+              return -EOPNOTSUPP;
-+
-       return phy_ethtool_sset(port->phydev, cmd);
- }
- 
- static int ixp4xx_nway_reset(struct net_device *dev)
- {
-       struct port *port = netdev_priv(dev);
-+
-+      if (!port->phydev)
-+              return -EOPNOTSUPP;
-+
-       return phy_start_aneg(port->phydev);
- }
-