[ar7] refresh 2.6.32 patches

SVN-Revision: 23736

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 984663547c8d5e6380191fac2f279bc026b54400..84958551be9e8c561021211760572288b2e4e947 100644 (file)
--- a/target/linux/ar7/patches-2.6.32/920-ar7part.patch
+++ b/target/linux/ar7/patches-2.6.32/920-ar7part.patch
@@ -26,7 +26,7 @@
  static int create_mtd_partitions(struct mtd_info *master,
                                 struct mtd_partition **pparts,
                                 unsigned long origin)
  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;
  
        int retries = 10;
        struct mtd_partition *ar7_parts;
  

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 cf6966dd109eedf5869174ba99326744944c2e16..21b585b1690953069126dabc25353ff294a63a0b 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
 --- 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",
  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[] = {
        {
  
  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[] =

        },
  };
  
        },
  };
  


@@ -329,9 +329,9 @@
  
  /* Interrupts */
  #define AR7_IRQ_UART0 15
  
  /* Interrupts */
  #define AR7_IRQ_UART0 15

-@@ -95,14 +115,22 @@ struct plat_dsl_data {
+@@ -97,14 +117,22 @@ extern int ar7_cpu_clock, ar7_bus_clock,

  
  

- extern int ar7_cpu_clock, ar7_bus_clock, ar7_dsp_clock;
+ extern void __init ar7_init_clocks(void);

  
 +static inline int ar7_is_titan(void)
 +{
  
 +static inline int ar7_is_titan(void)
 +{

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 d47ef388384d25d051693bf2f2ca047f959d9923..84bba9b1c3a35d0a000ae216bd5fda3c3c510d4b 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
  
 --- 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;
        }
  
                goto fail;
        }
  

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 102b829749a81aa6b2b5bd2b7c05c89be1430729..005822075f32ff7c7ec8bce1ea1008b5d7c29d73 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
 --- 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) {
        }
  
        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 c6cdc063cf073d323961bf11d75b73c9145ec218..0e72267ab5bbd2c75ad2bbb2d3bb4dfd5203f354 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
        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;
  
  
        pdata = pdev->dev.platform_data;
  

diff --git a/target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch b/target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch
index ea13bb140ef910b454687b58d39f3a2afc0722ea..754119a41cee86adb5130773545ef1a8a8be59b1 100644 (file)
--- a/target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch
+++ b/target/linux/ar7/patches-2.6.32/971-cpmac_cleanup.patch
@@ -17,7 +17,7 @@
  static int __devinit cpmac_probe(struct platform_device *pdev)
  {
        int rc, phy_id;
  static int __devinit cpmac_probe(struct platform_device *pdev)
  {
        int rc, phy_id;

-@@ -1127,10 +1124,8 @@ static int __devinit cpmac_probe(struct 
+@@ -1127,10 +1124,8 @@ static int __devinit cpmac_probe(struct

        }
        
        if (phy_id == PHY_MAX_ADDR) {
        }
        
        if (phy_id == PHY_MAX_ADDR) {

diff --git a/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch b/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch
index d7bbc429bf1a50b33a9c6892342b90fdbadc5e53..941d8889c1900ecc6d3c2a782bfbf085271c67ec 100644 (file)
--- a/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch
+++ b/target/linux/ar7/patches-2.6.32/972-cpmac_multi_probe.patch
@@ -21,7 +21,7 @@
  static void cpmac_dump_regs(struct net_device *dev)
  {
        int i;
  static void cpmac_dump_regs(struct net_device *dev)
  {
        int i;

-@@ -1111,9 +1118,13 @@ static int __devinit cpmac_probe(struct 
+@@ -1111,9 +1118,13 @@ static int __devinit cpmac_probe(struct

        struct cpmac_priv *priv;
        struct net_device *dev;
        struct plat_cpmac_data *pdata;
        struct cpmac_priv *priv;
        struct net_device *dev;
        struct plat_cpmac_data *pdata;


@@ -35,7 +35,7 @@
        for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
                if (!(pdata->phy_mask & (1 << phy_id)))
                        continue;
        for (phy_id = 0; phy_id < PHY_MAX_ADDR; phy_id++) {
                if (!(pdata->phy_mask & (1 << phy_id)))
                        continue;

-@@ -1122,12 +1133,43 @@ static int __devinit cpmac_probe(struct 
+@@ -1122,12 +1133,43 @@ static int __devinit cpmac_probe(struct

                strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE);
                break;
        }
                strncpy(mdio_bus_id, cpmac_mii->id, MII_BUS_ID_SIZE);
                break;
        }