Changeset 22769


Ignore:
Timestamp:
2010-08-22T19:08:47+02:00 (6 years ago)
Author:
florian
Message:

[ar7] refresh patches

Location:
trunk/target/linux/ar7/patches-2.6.32
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar7/patches-2.6.32/920-ar7part.patch

    r21691 r22769  
    1 --- a/drivers/mtd/ar7part.c-back        2010-01-13 15:58:44.000000000 -0500 
    2 +++ b/drivers/mtd/ar7part.c     2010-01-13 16:16:05.000000000 -0500 
     1--- a/drivers/mtd/ar7part.c 
     2+++ b/drivers/mtd/ar7part.c 
    33@@ -27,12 +27,14 @@ 
    44 #include <linux/mtd/partitions.h> 
     
    2727                                 struct mtd_partition **pparts, 
    2828                                 unsigned long origin) 
    29 @@ -57,6 +63,16 @@ static int create_mtd_partitions(struct  
     29@@ -57,6 +63,16 @@ static int create_mtd_partitions(struct 
    3030        int retries = 10; 
    3131        struct mtd_partition *ar7_parts; 
     
    4444        if (!ar7_parts) 
    4545                return -ENOMEM; 
    46 --- a/drivers/mtd/Makefile      2010-01-11 14:44:12.000000000 -0500 
    47 +++ a/drivers/mtd/Makefile      2010-02-03 13:44:38.000000000 -0500 
     46--- a/drivers/mtd/Makefile 
     47+++ b/drivers/mtd/Makefile 
    4848@@ -12,6 +12,7 @@ obj-$(CONFIG_MTD_REDBOOT_PARTS) += redbo 
    4949 obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o 
  • trunk/target/linux/ar7/patches-2.6.32/930-titan-platform.patch

    r21690 r22769  
    11--- a/arch/mips/ar7/platform.c 
    22+++ b/arch/mips/ar7/platform.c 
    3 @@ -131,6 +131,36 @@ static struct resource cpmac_high_res[]  
     3@@ -131,6 +131,36 @@ static struct resource cpmac_high_res[] 
    44        }, 
    55 }; 
     
    3838        { 
    3939                .name = "regs", 
    40 @@ -185,6 +215,60 @@ static struct resource vlynq_high_res[]  
     40@@ -185,6 +215,60 @@ static struct resource vlynq_high_res[] 
    4141        }, 
    4242 }; 
     
    193193 static struct gpio_led default_leds[] = { 
    194194        { 
    195 @@ -300,6 +450,11 @@ static struct gpio_led default_leds[] =  
     195@@ -300,6 +450,11 @@ static struct gpio_led default_leds[] = 
    196196        }, 
    197197 }; 
  • trunk/target/linux/ar7/patches-2.6.32/940-cpmac-titan.patch

    r21566 r22769  
    4646--- a/drivers/net/cpmac.c 
    4747+++ b/drivers/net/cpmac.c 
    48 @@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct  
     48@@ -1153,6 +1153,8 @@ static int __devinit cpmac_probe(struct 
    4949                goto fail; 
    5050        } 
     
    5555  
    5656        dev->netdev_ops = &cpmac_netdev_ops; 
    57 @@ -1228,7 +1230,7 @@ int __devinit cpmac_init(void) 
     57@@ -1229,7 +1231,7 @@ int __devinit cpmac_init(void) 
    5858        cpmac_mii->reset = cpmac_mdio_reset; 
    5959        cpmac_mii->irq = mii_irqs; 
     
    6464        if (!cpmac_mii->priv) { 
    6565                printk(KERN_ERR "Can't ioremap mdio registers\n"); 
    66 @@ -1239,10 +1241,17 @@ int __devinit cpmac_init(void) 
     66@@ -1240,10 +1242,17 @@ int __devinit cpmac_init(void) 
    6767 #warning FIXME: unhardcode gpio&reset bits 
    6868        ar7_gpio_disable(26); 
     
    8484  
    8585        for (i = 0; i < 300; i++) 
    86 @@ -1257,7 +1266,8 @@ int __devinit cpmac_init(void) 
     86@@ -1258,7 +1267,8 @@ int __devinit cpmac_init(void) 
    8787                mask = 0; 
    8888        } 
  • trunk/target/linux/ar7/patches-2.6.32/950-cpmac_fallback_switch.patch

    r21566 r22769  
    11--- a/drivers/net/cpmac.c 
    22+++ b/drivers/net/cpmac.c 
    3 @@ -1132,8 +1132,9 @@ static int __devinit cpmac_probe(struct  
     3@@ -1132,8 +1132,9 @@ static int __devinit cpmac_probe(struct 
    44        } 
    55  
  • trunk/target/linux/ar7/patches-2.6.32/970-remove_fixed_phy.patch

    r22727 r22769  
    4848--- a/drivers/net/cpmac.c 
    4949+++ b/drivers/net/cpmac.c 
    50 @@ -1117,21 +1117,17 @@ static int __devinit cpmac_probe(struct  
     50@@ -1117,21 +1117,17 @@ static int __devinit cpmac_probe(struct 
    5151  
    5252        pdata = pdev->dev.platform_data; 
     
    7979                strncpy(mdio_bus_id, "0", MII_BUS_ID_SIZE); /* fixed phys bus */ 
    8080                phy_id = pdev->id; 
    81 @@ -1268,7 +1264,7 @@ int __devinit cpmac_init(void) 
     81@@ -1269,7 +1265,7 @@ int __devinit cpmac_init(void) 
    8282        } 
    8383  
Note: See TracChangeset for help on using the changeset viewer.