[ar7] refresh 2.6.32 patches

[openwrt.git] / target / linux / ar7 / patches-2.6.32 / 940-cpmac-titan.patch

diff --git a/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch b/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
index 3f939b0..84bba9b 100644 (file)
--- a/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
+++ b/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.32.7/arch/mips/ar7/platform.c
-===================================================================
---- linux-2.6.32.7.orig/arch/mips/ar7/platform.c       2010-02-04 14:00:53.000000000 +0100
-+++ linux-2.6.32.7/arch/mips/ar7/platform.c    2010-02-04 14:14:21.000000000 +0100
-@@ -716,23 +716,35 @@
+--- a/arch/mips/ar7/platform.c
++++ b/arch/mips/ar7/platform.c
+@@ -716,23 +716,35 @@ static int __init ar7_register_devices(v

        }
  
        if (ar7_has_high_cpmac()) {
        }
  
        if (ar7_has_high_cpmac()) {


@@ -45,12 +43,37 @@ Index: linux-2.6.32.7/arch/mips/ar7/platform.c
        if (res)
                return res;
  
        if (res)
                return res;
  

-Index: linux-2.6.32.7/drivers/net/cpmac.c
-===================================================================
---- linux-2.6.32.7.orig/drivers/net/cpmac.c    2010-01-29 00:06:20.000000000 +0100
-+++ linux-2.6.32.7/drivers/net/cpmac.c 2010-02-04 14:05:24.000000000 +0100
-@@ -1243,6 +1243,10 @@
-       ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
+--- a/drivers/net/cpmac.c
++++ b/drivers/net/cpmac.c
+@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct
+               goto fail;
+       }
+ 
++      ar7_device_reset(pdata->reset_bit);
++
+       dev->irq = platform_get_irq_byname(pdev, "irq");
+ 
+       dev->netdev_ops = &cpmac_netdev_ops;
+@@ -1229,7 +1231,7 @@ int __devinit cpmac_init(void)
+       cpmac_mii->reset = cpmac_mdio_reset;
+       cpmac_mii->irq = mii_irqs;
+ 
+-      cpmac_mii->priv = ioremap(AR7_REGS_MDIO, 256);
++      cpmac_mii->priv = ioremap(ar7_is_titan() ? TITAN_REGS_MDIO : AR7_REGS_MDIO, 256);
+ 
+       if (!cpmac_mii->priv) {
+               printk(KERN_ERR "Can't ioremap mdio registers\n");
+@@ -1240,10 +1242,17 @@ int __devinit cpmac_init(void)
+ #warning FIXME: unhardcode gpio&reset bits
+       ar7_gpio_disable(26);
+       ar7_gpio_disable(27);
+-      ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
+-      ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
++
++      if (!ar7_is_titan()) {
++              ar7_device_reset(AR7_RESET_BIT_CPMAC_LO);
++              ar7_device_reset(AR7_RESET_BIT_CPMAC_HI);
++      }

        ar7_device_reset(AR7_RESET_BIT_EPHY);
  
 +      if (ar7_is_titan()) {
        ar7_device_reset(AR7_RESET_BIT_EPHY);
  
 +      if (ar7_is_titan()) {


@@ -60,7 +83,7 @@ Index: linux-2.6.32.7/drivers/net/cpmac.c
        cpmac_mii->reset(cpmac_mii);
  
        for (i = 0; i < 300; i++)
        cpmac_mii->reset(cpmac_mii);
  
        for (i = 0; i < 300; i++)

-@@ -1257,7 +1261,8 @@
+@@ -1258,7 +1267,8 @@ int __devinit cpmac_init(void)

                mask = 0;
        }
  
                mask = 0;
        }
  


@@ -70,3 +93,18 @@ Index: linux-2.6.32.7/drivers/net/cpmac.c
        snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
  
        res = mdiobus_register(cpmac_mii);
        snprintf(cpmac_mii->id, MII_BUS_ID_SIZE, "1");
  
        res = mdiobus_register(cpmac_mii);

+--- a/arch/mips/include/asm/mach-ar7/ar7.h
++++ b/arch/mips/include/asm/mach-ar7/ar7.h
+@@ -50,8 +50,10 @@
+ #define UR8_REGS_WDT  (AR7_REGS_BASE + 0x0b00)
+ #define UR8_REGS_UART1        (AR7_REGS_BASE + 0x0f00)
+ 
+-#define TITAN_REGS_MAC0               (0x08640000)
+-#define TITAN_REGS_MAC1               (TITAN_REGS_MAC0 + 0x0800)
++#define TITAN_REGS_ESWITCH_BASE       (0x08640000)
++#define TITAN_REGS_MAC0                       (TITAN_REGS_ESWITCH_BASE + 0)
++#define TITAN_REGS_MAC1                       (TITAN_REGS_ESWITCH_BASE + 0x0800)
++#define TITAN_REGS_MDIO                       (TITAN_REGS_ESWITCH_BASE + 0x02000)
+ #define TITAN_REGS_VLYNQ0     (AR7_REGS_BASE + 0x1c00)
+ #define TITAN_REGS_VLYNQ1     (AR7_REGS_BASE + 0x1300)
+