[ar7] refresh patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22769 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/ar7/patches-2.6.32/920-ar7part.patch b/target/linux/ar7/patches-2.6.32/920-ar7part.patch
index e4ad09f..8495855 100644 (file)
--- a/target/linux/ar7/patches-2.6.32/920-ar7part.patch
+++ b/target/linux/ar7/patches-2.6.32/920-ar7part.patch
@@ -1,5 +1,5 @@
---- a/drivers/mtd/ar7part.c-back       2010-01-13 15:58:44.000000000 -0500
-+++ b/drivers/mtd/ar7part.c    2010-01-13 16:16:05.000000000 -0500
+--- a/drivers/mtd/ar7part.c
++++ b/drivers/mtd/ar7part.c
 @@ -27,12 +27,14 @@
  #include <linux/mtd/partitions.h>
  #include <linux/bootmem.h>
@@ -26,7 +26,7 @@
  static int create_mtd_partitions(struct mtd_info *master,
                                 struct mtd_partition **pparts,
                                 unsigned long origin)
-@@ -57,6 +63,16 @@ static int create_mtd_partitions(struct 
+@@ -57,6 +63,16 @@ static int create_mtd_partitions(struct
        int retries = 10;
        struct mtd_partition *ar7_parts;
  
@@ -43,8 +43,8 @@
        ar7_parts = kzalloc(sizeof(*ar7_parts) * AR7_PARTS, GFP_KERNEL);
        if (!ar7_parts)
                return -ENOMEM;
---- a/drivers/mtd/Makefile     2010-01-11 14:44:12.000000000 -0500
-+++ a/drivers/mtd/Makefile     2010-02-03 13:44:38.000000000 -0500
+--- a/drivers/mtd/Makefile
++++ b/drivers/mtd/Makefile
 @@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo
  obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
  obj-$(CONFIG_MTD_AFS_PARTS)   += afs.o

diff --git a/target/linux/ar7/patches-2.6.32/930-titan-platform.patch b/target/linux/ar7/patches-2.6.32/930-titan-platform.patch
index cf6966d..2678876 100644 (file)
--- a/target/linux/ar7/patches-2.6.32/930-titan-platform.patch
+++ b/target/linux/ar7/patches-2.6.32/930-titan-platform.patch
@@ -1,6 +1,6 @@
 --- a/arch/mips/ar7/platform.c
 +++ b/arch/mips/ar7/platform.c
-@@ -131,6 +131,36 @@ static struct resource cpmac_high_res[] 
+@@ -131,6 +131,36 @@ static struct resource cpmac_high_res[]
        },
  };
  
@@ -37,7 +37,7 @@
  static struct resource vlynq_low_res[] = {
        {
                .name = "regs",
-@@ -185,6 +215,60 @@ static struct resource vlynq_high_res[] 
+@@ -185,6 +215,60 @@ static struct resource vlynq_high_res[]
        },
  };
  
@@ -192,7 +192,7 @@
  
  static struct gpio_led default_leds[] = {
        {
-@@ -300,6 +450,11 @@ static struct gpio_led default_leds[] = 
+@@ -300,6 +450,11 @@ static struct gpio_led default_leds[] =
        },
  };
  

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 884d46d..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
@@ -45,7 +45,7 @@
  
 --- a/drivers/net/cpmac.c
 +++ b/drivers/net/cpmac.c
-@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct 
+@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct
                goto fail;
        }
  
@@ -54,7 +54,7 @@
        dev->irq = platform_get_irq_byname(pdev, "irq");
  
        dev->netdev_ops = &cpmac_netdev_ops;
-@@ -1228,7 +1230,7 @@ int __devinit cpmac_init(void)
+@@ -1229,7 +1231,7 @@ int __devinit cpmac_init(void)
        cpmac_mii->reset = cpmac_mdio_reset;
        cpmac_mii->irq = mii_irqs;
  
@@ -63,7 +63,7 @@
  
        if (!cpmac_mii->priv) {
                printk(KERN_ERR "Can't ioremap mdio registers\n");
-@@ -1239,10 +1241,17 @@ int __devinit cpmac_init(void)
+@@ -1240,10 +1242,17 @@ int __devinit cpmac_init(void)
  #warning FIXME: unhardcode gpio&reset bits
        ar7_gpio_disable(26);
        ar7_gpio_disable(27);
@@ -83,7 +83,7 @@
        cpmac_mii->reset(cpmac_mii);
  
        for (i = 0; i < 300; i++)
-@@ -1257,7 +1266,8 @@ int __devinit cpmac_init(void)
+@@ -1258,7 +1267,8 @@ int __devinit cpmac_init(void)
                mask = 0;
        }
  

diff --git a/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch b/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch
index 102b829..0058220 100644 (file)
--- a/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch
+++ b/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/cpmac.c
 +++ b/drivers/net/cpmac.c
-@@ -1132,8 +1132,9 @@ static int __devinit cpmac_probe(struct 
+@@ -1132,8 +1132,9 @@ static int __devinit cpmac_probe(struct
        }
  
        if (phy_id == PHY_MAX_ADDR) {

diff --git a/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch b/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
index 289be17..0e72267 100644 (file)
--- a/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
+++ b/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch
@@ -47,7 +47,7 @@
        res = platform_device_register(ar7_is_titan() ? &cpmac_low_titan :
 --- a/drivers/net/cpmac.c
 +++ b/drivers/net/cpmac.c
-@@ -1117,21 +1117,17 @@ static int __devinit cpmac_probe(struct 
+@@ -1117,21 +1117,17 @@ static int __devinit cpmac_probe(struct
  
        pdata = pdev->dev.platform_data;
  
@@ -78,7 +78,7 @@
                dev_err(&pdev->dev, "no PHY present, falling back to switch mode\n");
                strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */
                phy_id = pdev->id;
-@@ -1268,7 +1264,7 @@ int __devinit cpmac_init(void)
+@@ -1269,7 +1265,7 @@ int __devinit cpmac_init(void)
        }
  
        cpmac_mii->phy_mask = ar7_is_titan()? ~(mask | 0x80000000 | 0x40000000):