1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 18:23:09 +02:00

[backfire] ar71xx: refresh patches

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23713 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2010-10-29 19:26:05 +00:00
parent 460d95817f
commit a2736bb8fe
7 changed files with 18 additions and 18 deletions

View File

@ -30,7 +30,7 @@
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx) depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
--- a/drivers/usb/host/ehci-hcd.c --- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c
@@ -1141,6 +1141,11 @@ MODULE_LICENSE ("GPL"); @@ -1142,6 +1142,11 @@ MODULE_LICENSE ("GPL");
#define PLATFORM_DRIVER ehci_atmel_driver #define PLATFORM_DRIVER ehci_atmel_driver
#endif #endif

View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c
@@ -867,6 +867,16 @@ static int __devinit m25p_probe(struct s @@ -868,6 +868,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0); part_probes, &parts, 0);
} }

View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c
@@ -877,6 +877,15 @@ static int __devinit m25p_probe(struct s @@ -878,6 +878,15 @@ static int __devinit m25p_probe(struct s
} }
#endif #endif

View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/chips/cfi_cmdset_0002.c --- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -1141,8 +1141,8 @@ static int __xipram do_write_oneword(str @@ -1169,8 +1169,8 @@ static int __xipram do_write_oneword(str
break; break;
} }
@ -11,7 +11,7 @@
/* Latency issues. Drop the lock, wait a while and retry */ /* Latency issues. Drop the lock, wait a while and retry */
UDELAY(map, chip, adr, 1); UDELAY(map, chip, adr, 1);
@@ -1158,6 +1158,8 @@ static int __xipram do_write_oneword(str @@ -1186,6 +1186,8 @@ static int __xipram do_write_oneword(str
ret = -EIO; ret = -EIO;
} }
@ -20,7 +20,7 @@
xip_enable(map, chip, adr); xip_enable(map, chip, adr);
op_done: op_done:
chip->state = FL_READY; chip->state = FL_READY;
@@ -1504,7 +1506,6 @@ static int cfi_amdstd_write_buffers(stru @@ -1532,7 +1534,6 @@ static int cfi_amdstd_write_buffers(stru
return 0; return 0;
} }
@ -28,7 +28,7 @@
/* /*
* Handle devices with one erase region, that only implement * Handle devices with one erase region, that only implement
* the chip erase command. * the chip erase command.
@@ -1568,8 +1569,8 @@ static int __xipram do_erase_chip(struct @@ -1596,8 +1597,8 @@ static int __xipram do_erase_chip(struct
chip->erase_suspended = 0; chip->erase_suspended = 0;
} }
@ -39,7 +39,7 @@
if (time_after(jiffies, timeo)) { if (time_after(jiffies, timeo)) {
printk(KERN_WARNING "MTD %s(): software timeout\n", printk(KERN_WARNING "MTD %s(): software timeout\n",
@@ -1589,6 +1590,7 @@ static int __xipram do_erase_chip(struct @@ -1617,6 +1618,7 @@ static int __xipram do_erase_chip(struct
ret = -EIO; ret = -EIO;
} }
@ -47,7 +47,7 @@
chip->state = FL_READY; chip->state = FL_READY;
xip_enable(map, chip, adr); xip_enable(map, chip, adr);
put_chip(map, chip, adr); put_chip(map, chip, adr);
@@ -1656,9 +1658,9 @@ static int __xipram do_erase_oneblock(st @@ -1684,9 +1686,9 @@ static int __xipram do_erase_oneblock(st
chip->erase_suspended = 0; chip->erase_suspended = 0;
} }
@ -59,7 +59,7 @@
} }
if (time_after(jiffies, timeo)) { if (time_after(jiffies, timeo)) {
@@ -1680,6 +1682,7 @@ static int __xipram do_erase_oneblock(st @@ -1708,6 +1710,7 @@ static int __xipram do_erase_oneblock(st
ret = -EIO; ret = -EIO;
} }

View File

@ -1,6 +1,6 @@
--- a/drivers/mtd/devices/m25p80.c --- a/drivers/mtd/devices/m25p80.c
+++ b/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c
@@ -886,6 +886,16 @@ static int __devinit m25p_probe(struct s @@ -887,6 +887,16 @@ static int __devinit m25p_probe(struct s
part_probes, &parts, 0); part_probes, &parts, 0);
} }
#endif #endif

View File

@ -12,7 +12,7 @@
/* makes sure the async qh will become idle */ /* makes sure the async qh will become idle */
--- a/drivers/usb/host/ehci.h --- a/drivers/usb/host/ehci.h
+++ b/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h
@@ -129,6 +129,7 @@ struct ehci_hcd { /* one per controlle @@ -130,6 +130,7 @@ struct ehci_hcd { /* one per controlle
unsigned has_amcc_usb23:1; unsigned has_amcc_usb23:1;
unsigned need_io_watchdog:1; unsigned need_io_watchdog:1;
unsigned broken_periodic:1; unsigned broken_periodic:1;

View File

@ -9,7 +9,7 @@
#define MAX_WORD_RETRIES 3 #define MAX_WORD_RETRIES 3
@@ -55,7 +55,9 @@ @@ -54,7 +54,9 @@
static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); static int cfi_amdstd_write_words(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);
@ -19,7 +19,7 @@
static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *); static int cfi_amdstd_erase_chip(struct mtd_info *, struct erase_info *);
static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *); static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *);
static void cfi_amdstd_sync (struct mtd_info *); static void cfi_amdstd_sync (struct mtd_info *);
@@ -190,6 +192,7 @@ static void fixup_amd_bootblock(struct m @@ -189,6 +191,7 @@ static void fixup_amd_bootblock(struct m
} }
#endif #endif
@ -27,7 +27,7 @@
static void fixup_use_write_buffers(struct mtd_info *mtd, void *param) static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
{ {
struct map_info *map = mtd->priv; struct map_info *map = mtd->priv;
@@ -199,6 +202,7 @@ static void fixup_use_write_buffers(stru @@ -198,6 +201,7 @@ static void fixup_use_write_buffers(stru
mtd->write = cfi_amdstd_write_buffers; mtd->write = cfi_amdstd_write_buffers;
} }
} }
@ -35,7 +35,7 @@
/* Atmel chips don't use the same PRI format as AMD chips */ /* Atmel chips don't use the same PRI format as AMD chips */
static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param) static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
@@ -1315,6 +1319,7 @@ static int cfi_amdstd_write_words(struct @@ -1343,6 +1347,7 @@ static int cfi_amdstd_write_words(struct
/* /*
* FIXME: interleaved mode not tested, and probably not supported! * FIXME: interleaved mode not tested, and probably not supported!
*/ */
@ -43,7 +43,7 @@
static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip, static int __xipram do_write_buffer(struct map_info *map, struct flchip *chip,
unsigned long adr, const u_char *buf, unsigned long adr, const u_char *buf,
int len) int len)
@@ -1426,7 +1431,6 @@ static int __xipram do_write_buffer(stru @@ -1454,7 +1459,6 @@ static int __xipram do_write_buffer(stru
return ret; return ret;
} }
@ -51,7 +51,7 @@
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len, static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
size_t *retlen, const u_char *buf) size_t *retlen, const u_char *buf)
{ {
@@ -1505,6 +1509,7 @@ static int cfi_amdstd_write_buffers(stru @@ -1533,6 +1537,7 @@ static int cfi_amdstd_write_buffers(stru
return 0; return 0;
} }