diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-02 12:07:52 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-12-02 12:07:52 -0800 |
| commit | be6d085d556bf5f2390ab65069ead30e6d2e228d (patch) | |
| tree | 859302b1d5e41396247f3fe16a94db62ae27986c | |
| parent | 90af2ee00c4cc501aca57d0161e36f65ed79ff66 (diff) | |
| download | patches-be6d085d556bf5f2390ab65069ead30e6d2e228d.tar.gz | |
2.6.28-rc7 resync
11 files changed, 1 insertions, 660 deletions
diff --git a/driver-core/bus_id-parisc.patch b/driver-core/bus_id-parisc.patch deleted file mode 100644 index 2e7dcff17e8cf8..00000000000000 --- a/driver-core/bus_id-parisc.patch +++ /dev/null @@ -1,56 +0,0 @@ -From: Kay Sievers <kay.sievers@vrfy.org> -Subject: parisc: struct device - replace bus_id with dev_name(), dev_set_name() - -Cc: Kyle McMartin <kyle@mcmartin.ca> -Cc: Matthew Wilcox <matthew@wil.cx> -Cc: linux-parisc@vger.kernel.org -Signed-off-by: Kay Sievers <kay.sievers@vrfy.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ---- - arch/parisc/include/asm/parisc-device.h | 4 ++-- - arch/parisc/kernel/drivers.c | 6 ++++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - ---- a/arch/parisc/include/asm/parisc-device.h -+++ b/arch/parisc/include/asm/parisc-device.h -@@ -42,9 +42,9 @@ struct parisc_driver { - #define to_parisc_driver(d) container_of(d, struct parisc_driver, drv) - #define parisc_parent(d) to_parisc_device(d->dev.parent) - --static inline char *parisc_pathname(struct parisc_device *d) -+static inline const char *parisc_pathname(struct parisc_device *d) - { -- return d->dev.bus_id; -+ return dev_name(&d->dev); - } - - static inline void ---- a/arch/parisc/kernel/drivers.c -+++ b/arch/parisc/kernel/drivers.c -@@ -43,7 +43,7 @@ struct hppa_dma_ops *hppa_dma_ops __read - EXPORT_SYMBOL(hppa_dma_ops); - - static struct device root = { -- .bus_id = "parisc", -+ .init_name = "parisc", - }; - - static inline int check_dev(struct device *dev) -@@ -393,7 +393,8 @@ EXPORT_SYMBOL(print_pci_hwpath); - static void setup_bus_id(struct parisc_device *padev) - { - struct hardware_path path; -- char *output = padev->dev.bus_id; -+ char name[20]; -+ char *output = name; - int i; - - get_node_path(padev->dev.parent, &path); -@@ -404,6 +405,7 @@ static void setup_bus_id(struct parisc_d - output += sprintf(output, "%u:", (unsigned char) path.bc[i]); - } - sprintf(output, "%u", (unsigned char) padev->hw_path); -+ dev_set_name(&padev->dev, name); - } - - struct parisc_device * create_tree_node(char id, struct device *parent) @@ -16,13 +16,6 @@ driver-core.current/driver-core-fix-using-ret-variable-in-unregister_dynamic_deb ################################# # USB patches for 2.6.28 ################################# -usb.current/revert-usb-improve-ehci_watchdog-s-side-effect-in-cpu-power-management.patch -usb.current/usb-fix-sb600-usb-subsystem-hang-bug.patch -usb.current/usb-fsl_qe_udc-report-disconnect-before-unbinding.patch -usb.current/usb-fsl_usb2_udc-report-disconnect-before-unbinding.patch -usb.current/usb-storage-unusual_devs-entry-for-mio-c520-gps.patch -usb.current/usb-usb-storage-unusual_devs-entry-for-nikon-d2h.patch -usb.current/usb-serial-add-more-onda-device-ids-to-option-driver.patch ##################################################################### # Stuff to be merged after 2.6.28 is out @@ -62,7 +55,6 @@ driver-core/bus_id-rapidio.patch driver-core/bus_id-powerpc.patch driver-core/bus_id-power.patch driver-core/bus_id-pnp.patch -driver-core/bus_id-parisc.patch driver-core/bus_id-mwave.patch driver-core/bus_id-mtd.patch driver-core/bus_id-mips.patch @@ -140,7 +132,6 @@ usb/usb-musb-add-musb-git-tree-to-maintainers-entry.patch usb/usb-musb-check-if-set_irq_wake-succeded-and-remember-it.patch usb/usb-gadget-pxa25x_udc-vbus-sense-initialization.patch usb/usb-gadget-s3c2410_udc-uses-standard-gpio-calls.patch -usb/usb-i2c-isp1301_omap-build-fixes.patch usb/usb-move-isp1301_omap-to-drivers-usb-otg.patch usb/usb-otg-gpio_vbus-transceiver-stub.patch usb/usb-otg-add-otg_put_transceiver.patch diff --git a/usb.current/revert-usb-improve-ehci_watchdog-s-side-effect-in-cpu-power-management.patch b/usb.current/revert-usb-improve-ehci_watchdog-s-side-effect-in-cpu-power-management.patch deleted file mode 100644 index fd43c393650116..00000000000000 --- a/usb.current/revert-usb-improve-ehci_watchdog-s-side-effect-in-cpu-power-management.patch +++ /dev/null @@ -1,51 +0,0 @@ -From da5e902178849a492dc5e2f398e2626c993f0be5 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@suse.de> -Date: Tue, 25 Nov 2008 13:34:45 -0800 -Subject: Revert "USB: improve ehci_watchdog's side effect in CPU power management" - -This reverts commit f0d781d59cb621e1795d510039df973d0f8b23fc. - -It was the wrong thing to do, and does not really do what it said -it did. - -Cc: Yi Yang <yi.y.yang@intel.com> -Cc: David Brownell <dbrownell@users.sourceforge.net> -Cc: Alan Stern <stern@rowland.harvard.edu> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci.h | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - ---- a/drivers/usb/host/ehci.h -+++ b/drivers/usb/host/ehci.h -@@ -183,16 +183,14 @@ timer_action (struct ehci_hcd *ehci, enu - * the async ring; just the I/O watchdog. Note that if a - * SHRINK were pending, OFF would never be requested. - */ -- enum ehci_timer_action oldactions = ehci->actions; -+ if (timer_pending(&ehci->watchdog) -+ && ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF)) -+ & ehci->actions)) -+ return; - - if (!test_and_set_bit (action, &ehci->actions)) { - unsigned long t; - -- if (timer_pending(&ehci->watchdog) -- && ((BIT(TIMER_ASYNC_SHRINK) | BIT(TIMER_ASYNC_OFF)) -- & oldactions)) -- return; -- - switch (action) { - case TIMER_IO_WATCHDOG: - t = EHCI_IO_JIFFIES; -@@ -208,7 +206,7 @@ timer_action (struct ehci_hcd *ehci, enu - t = DIV_ROUND_UP(EHCI_SHRINK_FRAMES * HZ, 1000) + 1; - break; - } -- mod_timer(&ehci->watchdog, round_jiffies(t + jiffies)); -+ mod_timer(&ehci->watchdog, t + jiffies); - } - } - diff --git a/usb.current/usb-fix-sb600-usb-subsystem-hang-bug.patch b/usb.current/usb-fix-sb600-usb-subsystem-hang-bug.patch deleted file mode 100644 index 3e58f8c8a49e9d..00000000000000 --- a/usb.current/usb-fix-sb600-usb-subsystem-hang-bug.patch +++ /dev/null @@ -1,55 +0,0 @@ -From shane.huang@amd.com Tue Nov 25 21:35:48 2008 -From: Shane Huang <shane.huang@amd.com> -Date: Tue, 25 Nov 2008 15:12:33 +0800 -Subject: USB: fix SB600 USB subsystem hang bug -To: greg@kroah.com -Cc: ralfconn@tele2.it, roman@rm.pp.ru, "Yang, Libin" <Libin.Yang@amd.com>, "Xu, Andiry" <Andiry.Xu@amd.com>, "Huang, Shane" <Shane.Huang@amd.com> -Message-ID: <1227597153.5518.6.camel@chunhao-desktop> - -From: Shane Huang <shane.huang@amd.com> - -This patch is required for all AMD SB600 revisions to avoid USB subsystem hang -symptom. The USB subsystem hang symptom is observed when the system has -multiple USB devices connected to it. In some cases a USB hub may be required -to observe this symptom. - -Reported in bugzilla as #11599, the similar patch for SB700 old revision is: -commit b09bc6cbae4dd3a2d35722668ef2c502a7b8b093 - -Reported-by: raffaele <ralfconn@tele2.it> -Tested-by: Roman Mamedov <roman@rm.pp.ru> -Signed-off-by: Shane Huang <shane.huang@amd.com> -Cc: stable <stable@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/host/ehci-pci.c | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - ---- a/drivers/usb/host/ehci-pci.c -+++ b/drivers/usb/host/ehci-pci.c -@@ -169,18 +169,21 @@ static int ehci_pci_setup(struct usb_hcd - } - break; - case PCI_VENDOR_ID_ATI: -- /* SB700 old version has a bug in EHCI controller, -+ /* SB600 and old version of SB700 have a bug in EHCI controller, - * which causes usb devices lose response in some cases. - */ -- if (pdev->device == 0x4396) { -+ if ((pdev->device == 0x4386) || (pdev->device == 0x4396)) { - p_smbus = pci_get_device(PCI_VENDOR_ID_ATI, - PCI_DEVICE_ID_ATI_SBX00_SMBUS, - NULL); - if (!p_smbus) - break; - rev = p_smbus->revision; -- if ((rev == 0x3a) || (rev == 0x3b)) { -+ if ((pdev->device == 0x4386) || (rev == 0x3a) -+ || (rev == 0x3b)) { - u8 tmp; -+ ehci_info(ehci, "applying AMD SB600/SB700 USB " -+ "freeze workaround\n"); - pci_read_config_byte(pdev, 0x53, &tmp); - pci_write_config_byte(pdev, 0x53, tmp | (1<<3)); - } diff --git a/usb.current/usb-fsl_qe_udc-report-disconnect-before-unbinding.patch b/usb.current/usb-fsl_qe_udc-report-disconnect-before-unbinding.patch deleted file mode 100644 index 80d67276bebfa7..00000000000000 --- a/usb.current/usb-fsl_qe_udc-report-disconnect-before-unbinding.patch +++ /dev/null @@ -1,63 +0,0 @@ -From avorontsov@ru.mvista.com Tue Nov 25 10:56:03 2008 -From: Anton Vorontsov <avorontsov@ru.mvista.com> -Date: Thu, 13 Nov 2008 14:57:20 +0300 -Subject: USB: fsl_qe_udc: Report disconnect before unbinding -To: David Brownell <dbrownell@users.sourceforge.net> -Cc: Greg Kroah-Hartman <greg@kroah.com>, Li Yang <leoli@freescale.com>, Alan Stern <stern@rowland.harvard.edu>, linux-usb@vger.kernel.org, linuxppc-dev@ozlabs.org -Message-ID: <20081113115720.GA28276@oksana.dev.rtsoft.ru> - -From: Anton Vorontsov <avorontsov@ru.mvista.com> - -Gadgets disable endpoints in their disconnect callbacks, so -we must call disconnect before unbinding. This also fixes -muram memory leak, since we free muram in the qe_ep_disable(). - -But mainly the patch fixes following badness: - -root@b1:~# insmod fsl_qe_udc.ko -fsl_qe_udc: Freescale QE/CPM USB Device Controller driver, 1.0 -fsl_qe_udc e01006c0.usb: QE USB controller initialized as device -root@b1:~# insmod g_ether.ko -g_ether gadget: using random self ethernet address -g_ether gadget: using random host ethernet address -usb0: MAC be:2d:3c:fa:be:f0 -usb0: HOST MAC 62:b8:6a:df:38:66 -g_ether gadget: Ethernet Gadget, version: Memorial Day 2008 -g_ether gadget: g_ether ready -fsl_qe_udc e01006c0.usb: fsl_qe_udc bind to driver g_ether -g_ether gadget: high speed config #1: CDC Ethernet (ECM) -root@b1:~# rmmod g_ether.ko -------------[ cut here ]------------ -Badness at drivers/usb/gadget/composite.c:871 -[...] -NIP [d10c1374] composite_unbind+0x24/0x15c [g_ether] -LR [d10a82f4] usb_gadget_unregister_driver+0x128/0x168 [fsl_qe_udc] -Call Trace: -[cfb93e80] [cfb1f3a0] 0xcfb1f3a0 (unreliable) -[cfb93eb0] [d10a82f4] usb_gadget_unregister_driver+0x128/0x168 [fsl_qe_udc] -[cfb93ed0] [d10c2a3c] usb_composite_unregister+0x3c/0x4c [g_ether] -[cfb93ee0] [c006bde0] sys_delete_module+0x130/0x19c -[cfb93f40] [c00142d8] ret_from_syscall+0x0/0x38 -[...] -fsl_qe_udc e01006c0.usb: unregistered gadget driver 'g_ether' - -Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> -Acked-by: David Brownell <dbrownell@users.sourceforge.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/gadget/fsl_qe_udc.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/usb/gadget/fsl_qe_udc.c -+++ b/drivers/usb/gadget/fsl_qe_udc.c -@@ -2363,6 +2363,9 @@ int usb_gadget_unregister_driver(struct - nuke(loop_ep, -ESHUTDOWN); - spin_unlock_irqrestore(&udc_controller->lock, flags); - -+ /* report disconnect; the controller is already quiesced */ -+ driver->disconnect(&udc_controller->gadget); -+ - /* unbind gadget and unhook driver. */ - driver->unbind(&udc_controller->gadget); - udc_controller->gadget.dev.driver = NULL; diff --git a/usb.current/usb-fsl_usb2_udc-report-disconnect-before-unbinding.patch b/usb.current/usb-fsl_usb2_udc-report-disconnect-before-unbinding.patch deleted file mode 100644 index c5f6acb0119973..00000000000000 --- a/usb.current/usb-fsl_usb2_udc-report-disconnect-before-unbinding.patch +++ /dev/null @@ -1,62 +0,0 @@ -From avorontsov@ru.mvista.com Tue Nov 25 10:56:48 2008 -From: Anton Vorontsov <avorontsov@ru.mvista.com> -Date: Thu, 13 Nov 2008 15:00:46 +0300 -Subject: USB: fsl_usb2_udc: Report disconnect before unbinding -To: David Brownell <dbrownell@users.sourceforge.net> -Cc: Greg Kroah-Hartman <greg@kroah.com>, Li Yang <leoli@freescale.com>, Alan Stern <stern@rowland.harvard.edu>, linux-usb@vger.kernel.org, linuxppc-dev@ozlabs.org -Message-ID: <20081113120046.GA29942@oksana.dev.rtsoft.ru> -Content-Disposition: inline - -From: Anton Vorontsov <avorontsov@ru.mvista.com> - -Gadgets disable endpoints in their disconnect callbacks, so -we must call disconnect before unbinding. - -The patch fixes following badness: - -root@b1:~# insmod fsl_usb2_udc.ko -Freescale High-Speed USB SOC Device Controller driver (Apr 20, 2007) -root@b1:~# insmod g_ether.ko -g_ether gadget: using random self ethernet address -g_ether gadget: using random host ethernet address -usb0: MAC 26:07:ba:c0:44:33 -usb0: HOST MAC 96:81:0c:05:4d:e3 -g_ether gadget: Ethernet Gadget, version: Memorial Day 2008 -g_ether gadget: g_ether ready -fsl-usb2-udc: bind to driver g_ether -g_ether gadget: high speed config #1: CDC Ethernet (ECM) -root@b1:~# rmmod g_ether.ko -------------[ cut here ]------------ -Badness at drivers/usb/gadget/composite.c:871 -[...] -NIP [e10c3454] composite_unbind+0x24/0x15c [g_ether] -LR [e10aa454] usb_gadget_unregister_driver+0x13c/0x164 [fsl_usb2_udc] -Call Trace: -[df145e80] [ffffff94] 0xffffff94 (unreliable) -[df145eb0] [e10aa454] usb_gadget_unregister_driver+0x13c/0x164 [fsl_usb2_udc] -[df145ed0] [e10c4c40] usb_composite_unregister+0x3c/0x4c [g_ether] -[df145ee0] [c006bcc0] sys_delete_module+0x130/0x19c -[df145f40] [c00142d8] ret_from_syscall+0x0/0x38 -[...] -unregistered gadget driver 'g_ether' - -Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> -Acked-by: David Brownell <dbrownell@users.sourceforge.net> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/gadget/fsl_usb2_udc.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/usb/gadget/fsl_usb2_udc.c -+++ b/drivers/usb/gadget/fsl_usb2_udc.c -@@ -1836,6 +1836,9 @@ int usb_gadget_unregister_driver(struct - nuke(loop_ep, -ESHUTDOWN); - spin_unlock_irqrestore(&udc_controller->lock, flags); - -+ /* report disconnect; the controller is already quiesced */ -+ driver->disconnect(&udc_controller->gadget); -+ - /* unbind gadget and unhook driver. */ - driver->unbind(&udc_controller->gadget); - udc_controller->gadget.dev.driver = NULL; diff --git a/usb.current/usb-serial-add-more-onda-device-ids-to-option-driver.patch b/usb.current/usb-serial-add-more-onda-device-ids-to-option-driver.patch deleted file mode 100644 index 1b1eee1371ec23..00000000000000 --- a/usb.current/usb-serial-add-more-onda-device-ids-to-option-driver.patch +++ /dev/null @@ -1,68 +0,0 @@ -From foo@baz Sat Nov 29 11:46:21 PST 2008 -Date: Sat, 29 Nov 2008 11:46:21 -0800 -To: Greg KH <greg@kroah.com> -From: Greg Kroah-Hartman <gregkh@suse.de> -Subject: USB: serial: add more Onda device ids to option driver - -From: Greg Kroah-Hartman <gregkh@suse.de> - -Thanks to Domenico Riccio for pointing these out. - -Cc: Domenico Riccio <domenico.riccio@gmail.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/serial/option.c | 35 +++++++++++++++++++++++++++++++++++ - 1 file changed, 35 insertions(+) - ---- a/drivers/usb/serial/option.c -+++ b/drivers/usb/serial/option.c -@@ -224,6 +224,7 @@ static int option_send_setup(struct tty - #define ONDA_VENDOR_ID 0x19d2 - #define ONDA_PRODUCT_MSA501HS 0x0001 - #define ONDA_PRODUCT_ET502HS 0x0002 -+#define ONDA_PRODUCT_MT503HS 0x0200 - - #define BANDRICH_VENDOR_ID 0x1A8D - #define BANDRICH_PRODUCT_C100_1 0x1002 -@@ -413,6 +414,40 @@ static struct usb_device_id option_ids[] - { USB_DEVICE(AXESSTEL_VENDOR_ID, AXESSTEL_PRODUCT_MV110H) }, - { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MSA501HS) }, - { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_ET502HS) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0003) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0004) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0005) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0006) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0007) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0008) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0009) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x000a) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x000b) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x000c) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x000d) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x000e) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x000f) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0010) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0011) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0012) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0013) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0014) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0015) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0016) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0017) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0018) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0019) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0020) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0021) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0022) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0023) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0024) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0025) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0026) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0027) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0028) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, 0x0029) }, -+ { USB_DEVICE(ONDA_VENDOR_ID, ONDA_PRODUCT_MT503HS) }, - { USB_DEVICE(YISO_VENDOR_ID, YISO_PRODUCT_U893) }, - { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_1) }, - { USB_DEVICE(BANDRICH_VENDOR_ID, BANDRICH_PRODUCT_C100_2) }, diff --git a/usb.current/usb-storage-unusual_devs-entry-for-mio-c520-gps.patch b/usb.current/usb-storage-unusual_devs-entry-for-mio-c520-gps.patch deleted file mode 100644 index 37d720d9ba74a1..00000000000000 --- a/usb.current/usb-storage-unusual_devs-entry-for-mio-c520-gps.patch +++ /dev/null @@ -1,44 +0,0 @@ -From stern@rowland.harvard.edu Tue Nov 25 11:05:48 2008 -From: Alan Stern <stern@rowland.harvard.edu> -Date: Fri, 21 Nov 2008 16:15:12 -0500 (EST) -Subject: USB: storage: unusual_devs entry for Mio C520-GPS -To: Greg KH <greg@kroah.com>, Phil Dibowitz <phil@ipom.com> -Cc: Tamas Kerecsen <kerecsen@bigfoot.com>, USB Storage list <usb-storage@lists.one-eyed-alien.net> -Message-ID: <Pine.LNX.4.44L0.0811211612160.2376-100000@iolanthe.rowland.org> - - -This patch (as1176) adds an unusual_devs entry for the Mio C520 GPS -unit. Other devices also based on the Mitac hardware use the same USB -interface firmware, so the Vendor and Product names are generalized. - -This fixes Bugzilla #11583. - -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Tested-by: Tamas Kerecsen <kerecsen@bigfoot.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/storage/unusual_devs.h | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - ---- a/drivers/usb/storage/unusual_devs.h -+++ b/drivers/usb/storage/unusual_devs.h -@@ -318,6 +318,18 @@ UNUSUAL_DEV( 0x045a, 0x5210, 0x0101, 0x - US_SC_SCSI, US_PR_KARMA, rio_karma_init, 0), - #endif - -+/* Reported by Tamas Kerecsen <kerecsen@bigfoot.com> -+ * Obviously the PROM has not been customized by the VAR; -+ * the Vendor and Product string descriptors are: -+ * Generic Mass Storage (PROTOTYPE--Remember to change idVendor) -+ * Generic Manufacturer (PROTOTYPE--Remember to change idVendor) -+ */ -+UNUSUAL_DEV( 0x045e, 0xffff, 0x0000, 0x0000, -+ "Mitac", -+ "GPS", -+ US_SC_DEVICE, US_PR_DEVICE, NULL, -+ US_FL_MAX_SECTORS_64 ), -+ - /* - * This virtual floppy is found in Sun equipment (x4600, x4200m2, etc.) - * Reported by Pete Zaitcev <zaitcev@redhat.com> diff --git a/usb.current/usb-usb-storage-unusual_devs-entry-for-nikon-d2h.patch b/usb.current/usb-usb-storage-unusual_devs-entry-for-nikon-d2h.patch deleted file mode 100644 index e693360828932b..00000000000000 --- a/usb.current/usb-usb-storage-unusual_devs-entry-for-nikon-d2h.patch +++ /dev/null @@ -1,36 +0,0 @@ -From stern@rowland.harvard.edu Tue Nov 25 11:11:27 2008 -From: Tobias Kunze Brise�o <t@fictive.com>, -Date: Mon, 24 Nov 2008 11:28:31 -0500 (EST) -Subject: USB: usb-storage: unusual_devs entry for Nikon D2H -To: Greg KH <greg@kroah.com>, Phil Dibowitz <phil@ipom.com> -Cc: Tobias Kunze Brise�o <t@fictive.com>, USB Storage list <usb-storage@lists.one-eyed-alien.net> -Message-ID: <Pine.LNX.4.44L0.0811241125420.2851-100000@iolanthe.rowland.org> - -From: Tobias Kunze Brise�o <t@fictive.com>, - -This patch adds an unusual_devs entry for the Nikon D2H camera. - -From: Tobias Kunze Brise�o <t@fictive.com>, -Signed-off-by: Alan Stern <stern@rowland.harvard.edu> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/usb/storage/unusual_devs.h | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/drivers/usb/storage/unusual_devs.h -+++ b/drivers/usb/storage/unusual_devs.h -@@ -389,6 +389,13 @@ UNUSUAL_DEV( 0x04b0, 0x0401, 0x0200, 0x - US_SC_DEVICE, US_PR_DEVICE, NULL, - US_FL_FIX_CAPACITY), - -+/* Reported by Tobias Kunze Briseno <t-linux@fictive.com> */ -+UNUSUAL_DEV( 0x04b0, 0x0403, 0x0200, 0x0200, -+ "NIKON", -+ "NIKON DSC D2H", -+ US_SC_DEVICE, US_PR_DEVICE, NULL, -+ US_FL_FIX_CAPACITY), -+ - /* Reported by Milinevsky Dmitry <niam.niam@gmail.com> */ - UNUSUAL_DEV( 0x04b0, 0x0409, 0x0100, 0x0100, - "NIKON", diff --git a/usb/usb-i2c-isp1301_omap-build-fixes.patch b/usb/usb-i2c-isp1301_omap-build-fixes.patch deleted file mode 100644 index c6bb9b95729802..00000000000000 --- a/usb/usb-i2c-isp1301_omap-build-fixes.patch +++ /dev/null @@ -1,215 +0,0 @@ -From david-b@pacbell.net Tue Nov 25 13:38:10 2008 -From: David Brownell <david-b@pacbell.net> -Date: Mon, 24 Nov 2008 11:51:02 -0800 -Subject: USB: i2c: isp1301_omap build fixes -To: linux-usb@vger.kernel.org -Cc: Greg KH <greg@kroah.com>, Tony Lindgren <tony@atomide.com>, Jean Delvare <khali@linux-fr.org> -Message-ID: <200811241151.02867.david-b@pacbell.net> -Content-Disposition: inline - - -From: David Brownell <dbrownell@users.sourceforge.net> - -Build fixes for isp1301_omap; no behavior changes: - - - fix incorrect probe() signature (it changed many months ago) - - provide missing functions on H3 and H4 boards - - "sparse" fixes (static, NULL-vs-0) - -The H3 build bits subset some of the stuff that was previously in -the OMAP tree but never went to mainline. - -Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> -Cc: Jean Delvare <khali@linux-fr.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - ---- - drivers/i2c/chips/isp1301_omap.c | 65 ++++++++++++++++++++++++++++----------- - 1 file changed, 47 insertions(+), 18 deletions(-) - ---- a/drivers/i2c/chips/isp1301_omap.c -+++ b/drivers/i2c/chips/isp1301_omap.c -@@ -25,6 +25,7 @@ - #include <linux/slab.h> - #include <linux/interrupt.h> - #include <linux/platform_device.h> -+#include <linux/gpio.h> - #include <linux/usb/ch9.h> - #include <linux/usb/gadget.h> - #include <linux/usb.h> -@@ -33,7 +34,10 @@ - #include <linux/workqueue.h> - - #include <asm/irq.h> -+#include <asm/mach-types.h> -+ - #include <mach/usb.h> -+#include <mach/mux.h> - - - #ifndef DEBUG -@@ -88,14 +92,9 @@ struct isp1301 { - - /*-------------------------------------------------------------------------*/ - --#ifdef CONFIG_MACH_OMAP_H2 -- - /* board-specific PM hooks */ - --#include <asm/gpio.h> --#include <mach/mux.h> --#include <asm/mach-types.h> -- -+#if defined(CONFIG_MACH_OMAP_H2) || defined(CONFIG_MACH_OMAP_H3) - - #if defined(CONFIG_TPS65010) || defined(CONFIG_TPS65010_MODULE) - -@@ -135,6 +134,33 @@ static inline void notresponding(struct - - #endif - -+#if defined(CONFIG_MACH_OMAP_H4) -+ -+static void enable_vbus_draw(struct isp1301 *isp, unsigned mA) -+{ -+ /* H4 controls this by DIP switch S2.4; no soft control. -+ * ON means the charger is always enabled. Leave it OFF -+ * unless the OTG port is used only in B-peripheral mode. -+ */ -+} -+ -+static void enable_vbus_source(struct isp1301 *isp) -+{ -+ /* this board won't supply more than 8mA vbus power. -+ * some boards can switch a 100ma "unit load" (or more). -+ */ -+} -+ -+ -+/* products will deliver OTG messages with LEDs, GUI, etc */ -+static inline void notresponding(struct isp1301 *isp) -+{ -+ printk(KERN_NOTICE "OTG device not responding.\n"); -+} -+ -+ -+#endif -+ - /*-------------------------------------------------------------------------*/ - - static struct i2c_driver isp1301_driver; -@@ -334,8 +360,7 @@ static int gadget_suspend(struct isp1301 - * NOTE: guaranteeing certain response times might mean we shouldn't - * share keventd's work queue; a realtime task might be safest. - */ --void --isp1301_defer_work(struct isp1301 *isp, int work) -+static void isp1301_defer_work(struct isp1301 *isp, int work) - { - int status; - -@@ -512,7 +537,6 @@ static void update_otg1(struct isp1301 * - otg_ctrl &= ~OTG_XCEIV_INPUTS; - otg_ctrl &= ~(OTG_ID|OTG_ASESSVLD|OTG_VBUSVLD); - -- - if (int_src & INTR_SESS_VLD) - otg_ctrl |= OTG_ASESSVLD; - else if (isp->otg.state == OTG_STATE_A_WAIT_VFALL) { -@@ -886,11 +910,11 @@ static int otg_probe(struct platform_dev - - static int otg_remove(struct platform_device *dev) - { -- otg_dev = 0; -+ otg_dev = NULL; - return 0; - } - --struct platform_driver omap_otg_driver = { -+static struct platform_driver omap_otg_driver = { - .probe = otg_probe, - .remove = otg_remove, - .driver = { -@@ -1212,6 +1236,8 @@ static void isp1301_release(struct devic - - isp = dev_get_drvdata(dev); - -+ /* FIXME -- not with a "new style" driver, it doesn't!! */ -+ - /* ugly -- i2c hijacks our memory hook to wait_for_completion() */ - if (isp->i2c_release) - isp->i2c_release(dev); -@@ -1233,7 +1259,7 @@ static int __exit isp1301_remove(struct - otg_unbind(isp); - #endif - if (machine_is_omap_h2()) -- omap_free_gpio(2); -+ gpio_free(2); - - isp->timer.data = 0; - set_bit(WORK_STOP, &isp->todo); -@@ -1241,7 +1267,7 @@ static int __exit isp1301_remove(struct - flush_scheduled_work(); - - put_device(&i2c->dev); -- the_transceiver = 0; -+ the_transceiver = NULL; - - return 0; - } -@@ -1295,7 +1321,7 @@ isp1301_set_host(struct otg_transceiver - if (!host) { - omap_writew(0, OTG_IRQ_EN); - power_down(isp); -- isp->otg.host = 0; -+ isp->otg.host = NULL; - return 0; - } - -@@ -1344,7 +1370,9 @@ static int - isp1301_set_peripheral(struct otg_transceiver *otg, struct usb_gadget *gadget) - { - struct isp1301 *isp = container_of(otg, struct isp1301, otg); -+#ifndef CONFIG_USB_OTG - u32 l; -+#endif - - if (!otg || isp != the_transceiver) - return -ENODEV; -@@ -1354,7 +1382,7 @@ isp1301_set_peripheral(struct otg_transc - if (!isp->otg.default_a) - enable_vbus_draw(isp, 0); - usb_gadget_vbus_disconnect(isp->otg.gadget); -- isp->otg.gadget = 0; -+ isp->otg.gadget = NULL; - power_down(isp); - return 0; - } -@@ -1379,7 +1407,7 @@ isp1301_set_peripheral(struct otg_transc - power_up(isp); - isp->otg.state = OTG_STATE_B_IDLE; - -- if (machine_is_omap_h2()) -+ if (machine_is_omap_h2() || machine_is_omap_h3()) - isp1301_set_bits(isp, ISP1301_MODE_CONTROL_1, MC1_DAT_SE0); - - isp1301_set_bits(isp, ISP1301_INTERRUPT_RISING, -@@ -1499,7 +1527,8 @@ isp1301_start_hnp(struct otg_transceiver - - /*-------------------------------------------------------------------------*/ - --static int __init isp1301_probe(struct i2c_client *i2c) -+static int __init -+isp1301_probe(struct i2c_client *i2c, const struct i2c_device_id *id) - { - int status; - struct isp1301 *isp; -@@ -1647,7 +1676,7 @@ module_init(isp_init); - static void __exit isp_exit(void) - { - if (the_transceiver) -- otg_set_transceiver(0); -+ otg_set_transceiver(NULL); - i2c_del_driver(&isp1301_driver); - } - module_exit(isp_exit); @@ -1 +1 @@ -2.6.28-rc6 +2.6.28-rc7 |