ar71xx: refresh patches
SVN-Revision: 22803
This commit is contained in:
@@ -30,7 +30,7 @@
|
||||
depends on USB_OHCI_HCD && (STB03xxx || PPC_MPC52xx)
|
||||
--- a/drivers/usb/host/ehci-hcd.c
|
||||
+++ b/drivers/usb/host/ehci-hcd.c
|
||||
@@ -1158,6 +1158,11 @@ MODULE_LICENSE ("GPL");
|
||||
@@ -1159,6 +1159,11 @@ MODULE_LICENSE ("GPL");
|
||||
#define PLATFORM_DRIVER ehci_atmel_driver
|
||||
#endif
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||
@@ -1130,8 +1130,8 @@ static int __xipram do_write_oneword(str
|
||||
@@ -1158,8 +1158,8 @@ static int __xipram do_write_oneword(str
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
|
||||
/* Latency issues. Drop the lock, wait a while and retry */
|
||||
UDELAY(map, chip, adr, 1);
|
||||
@@ -1147,6 +1147,8 @@ static int __xipram do_write_oneword(str
|
||||
@@ -1175,6 +1175,8 @@ static int __xipram do_write_oneword(str
|
||||
|
||||
ret = -EIO;
|
||||
}
|
||||
@@ -20,7 +20,7 @@
|
||||
xip_enable(map, chip, adr);
|
||||
op_done:
|
||||
chip->state = FL_READY;
|
||||
@@ -1493,7 +1495,6 @@ static int cfi_amdstd_write_buffers(stru
|
||||
@@ -1521,7 +1523,6 @@ static int cfi_amdstd_write_buffers(stru
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
/*
|
||||
* Handle devices with one erase region, that only implement
|
||||
* the chip erase command.
|
||||
@@ -1557,8 +1558,8 @@ static int __xipram do_erase_chip(struct
|
||||
@@ -1585,8 +1586,8 @@ static int __xipram do_erase_chip(struct
|
||||
chip->erase_suspended = 0;
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
|
||||
if (time_after(jiffies, timeo)) {
|
||||
printk(KERN_WARNING "MTD %s(): software timeout\n",
|
||||
@@ -1578,6 +1579,7 @@ static int __xipram do_erase_chip(struct
|
||||
@@ -1606,6 +1607,7 @@ static int __xipram do_erase_chip(struct
|
||||
ret = -EIO;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@
|
||||
chip->state = FL_READY;
|
||||
xip_enable(map, chip, adr);
|
||||
put_chip(map, chip, adr);
|
||||
@@ -1645,9 +1647,9 @@ static int __xipram do_erase_oneblock(st
|
||||
@@ -1673,9 +1675,9 @@ static int __xipram do_erase_oneblock(st
|
||||
chip->erase_suspended = 0;
|
||||
}
|
||||
|
||||
@@ -59,7 +59,7 @@
|
||||
}
|
||||
|
||||
if (time_after(jiffies, timeo)) {
|
||||
@@ -1669,6 +1671,7 @@ static int __xipram do_erase_oneblock(st
|
||||
@@ -1697,6 +1699,7 @@ static int __xipram do_erase_oneblock(st
|
||||
ret = -EIO;
|
||||
}
|
||||
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
/* makes sure the async qh will become idle */
|
||||
--- a/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 need_io_watchdog:1;
|
||||
unsigned broken_periodic:1;
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
#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_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_varsize(struct mtd_info *, struct erase_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
|
||||
|
||||
@@ -27,7 +27,7 @@
|
||||
static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
@@ -35,7 +35,7 @@
|
||||
|
||||
/* Atmel chips don't use the same PRI format as AMD chips */
|
||||
static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
|
||||
@@ -1304,6 +1308,7 @@ static int cfi_amdstd_write_words(struct
|
||||
@@ -1332,6 +1336,7 @@ static int cfi_amdstd_write_words(struct
|
||||
/*
|
||||
* 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,
|
||||
unsigned long adr, const u_char *buf,
|
||||
int len)
|
||||
@@ -1415,7 +1420,6 @@ static int __xipram do_write_buffer(stru
|
||||
@@ -1443,7 +1448,6 @@ static int __xipram do_write_buffer(stru
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
static int cfi_amdstd_write_buffers(struct mtd_info *mtd, loff_t to, size_t len,
|
||||
size_t *retlen, const u_char *buf)
|
||||
{
|
||||
@@ -1494,6 +1498,7 @@ static int cfi_amdstd_write_buffers(stru
|
||||
@@ -1522,6 +1526,7 @@ static int cfi_amdstd_write_buffers(stru
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user