diff options
Diffstat (limited to 'target/linux/ar7')
7 files changed, 12 insertions, 12 deletions
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 984663547c..84958551be 100644 --- 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) -@@ -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; 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 cf6966dd10..21b585b169 100644 --- 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[] = }, }; @@ -329,9 +329,9 @@ /* 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) +{ 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 d47ef38838..84bba9b1c3 100644 --- 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; } 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 102b829749..005822075f 100644 --- 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 c6cdc063cf..0e72267ab5 100644 --- 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; 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 ea13bb140e..754119a41c 100644 --- 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; -@@ -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) { 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 d7bbc429bf..941d8889c1 100644 --- 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; -@@ -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; @@ -35,7 +35,7 @@ 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; } |