[ar7] refresh 2.6.32 patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23736 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Florian Fainelli 2010-10-31 13:10:49 +00:00
parent 57aa0caf28
commit 9069f702b3
7 changed files with 12 additions and 12 deletions

View File

@ -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;

View File

@ -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)
+{

View File

@ -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;
}

View File

@ -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) {

View File

@ -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;

View File

@ -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) {

View File

@ -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;
}