[rdc] backport some mainline fixes, refresh mtd driver

[openwrt-github/.git] / target / linux / rdc / patches-2.6.28 / 007-r6040_git_updates.patch

diff --git a/target/linux/rdc/patches-2.6.28/007-r6040_git_updates.patch b/target/linux/rdc/patches-2.6.28/007-r6040_git_updates.patch
index 6447be43b6b4ec09a03305907584989dff82e992..704786ae768abe8d2fea5b64d0366c5454f1e3d7 100644 (file)
--- a/target/linux/rdc/patches-2.6.28/007-r6040_git_updates.patch
+++ b/target/linux/rdc/patches-2.6.28/007-r6040_git_updates.patch
@@ -193,3 +193,49 @@
        /* Link new device into r6040_root_dev */
        lp->pdev = pdev;
        lp->dev = dev;
+--- a/drivers/net/r6040.c
++++ b/drivers/net/r6040.c
+@@ -742,6 +742,14 @@ static int r6040_up(struct net_device *d
+       struct r6040_private *lp = netdev_priv(dev);
+       void __iomem *ioaddr = lp->base;
+       int ret;
++      u16 val;
++
++      /* Check presence of a second PHY */
++      val = r6040_phy_read(ioaddr, lp->phy_addr, 2);
++      if (val == 0xFFFF) {
++              printk(KERN_ERR DRV_NAME " no second PHY attached\n");
++              return -EIO;
++      }
+ 
+       /* Initialise and alloc RX/TX buffers */
+       r6040_init_txbufs(dev);
+--- a/drivers/net/r6040.c
++++ b/drivers/net/r6040.c
+@@ -401,6 +401,9 @@ static void r6040_init_mac_regs(struct n
+        * we may got called by r6040_tx_timeout which has left
+        * some unsent tx buffers */
+       iowrite16(0x01, ioaddr + MTPR);
++
++      /* Check media */
++      mii_check_media(&lp->mii_if, 1, 1);
+ }
+ 
+ static void r6040_tx_timeout(struct net_device *dev)
+@@ -528,6 +531,8 @@ static int r6040_phy_mode_chk(struct net
+                       phy_dat = 0x0000;
+       }
+ 
++      mii_check_media(&lp->mii_if, 0, 1);
++
+       return phy_dat;
+ };
+ 
+@@ -810,7 +815,6 @@ static void r6040_timer(unsigned long da
+               lp->phy_mode = phy_mode;
+               lp->mcr0 = (lp->mcr0 & 0x7fff) | phy_mode;
+               iowrite16(lp->mcr0, ioaddr);
+-              printk(KERN_INFO "Link Change %x \n", ioread16(ioaddr));
+       }
+ 
+       /* Timer active again */