diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-08 16:28:41 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-08 16:28:41 -0700 |
| commit | ddc242fccea4abe9e2c9fe4a25492c838afe7ccc (patch) | |
| tree | 7575ecdd6c950c1fe36e72ce60e0d589651d89b2 /usb.current | |
| parent | db862ceb2e1ce94c05b6be2ed10221e7089393c8 (diff) | |
| download | patches-ddc242fccea4abe9e2c9fe4a25492c838afe7ccc.tar.gz | |
usb patches
Diffstat (limited to 'usb.current')
| -rw-r--r-- | usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch | 21 | ||||
| -rw-r--r-- | usb.current/usb-quirk-pll-power-down-mode.patch | 50 |
2 files changed, 42 insertions, 29 deletions
diff --git a/usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch b/usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch index f158748d723b92..2bf23bb9904580 100644 --- a/usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch +++ b/usb.current/usb-omap_udc-fix-compilation-with-debug-enabled.patch @@ -1,20 +1,19 @@ -From dbaryshkov@gmail.com Wed Aug 6 16:41:16 2008 +From dbaryshkov@gmail.com Fri Aug 8 16:18:49 2008 From: Dmitry Baryshkov <dbaryshkov@gmail.com> -Date: Sun, 6 Jul 2008 14:25:53 +0400 +Date: Thu, 7 Aug 2008 16:29:25 +0400 Subject: USB: omap_udc: fix compilation with debug enabled To: linux-usb@vger.kernel.org -Message-ID: <20080706102553.GA29914@doriath.ww600.siemens.net> -Content-Disposition: inline +Cc: David Brownell <david-b@pacbell.net>, Dmitry Baryshkov <dbaryshkov@gmail.com> +Message-ID: <619853cc417c86624ba22c87c2f0e7f1ad022895.1218111855.git.dbaryshkov@gmail.com> Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com> Acked-by: David Brownell <dbrownell@users.sourceforge.net> -Cc: stable <stable@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/usb/gadget/omap_udc.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + drivers/usb/gadget/omap_udc.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c @@ -26,8 +25,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include "omap_udc.h" -@@ -2313,7 +2314,7 @@ static int proc_otg_show(struct seq_file - tmp = OTG_REV_REG; +@@ -2310,10 +2311,10 @@ static int proc_otg_show(struct seq_file + u32 trans; + char *ctrl_name; + +- tmp = OTG_REV_REG; ++ tmp = omap_readl(OTG_REV); if (cpu_is_omap24xx()) { ctrl_name = "control_devconf"; - trans = CONTROL_DEVCONF_REG; diff --git a/usb.current/usb-quirk-pll-power-down-mode.patch b/usb.current/usb-quirk-pll-power-down-mode.patch index 24f292073ed2a8..2fc051eec7ae96 100644 --- a/usb.current/usb-quirk-pll-power-down-mode.patch +++ b/usb.current/usb-quirk-pll-power-down-mode.patch @@ -1,11 +1,10 @@ -From Libin.Yang@amd.com Wed Aug 6 16:45:35 2008 +From Libin.Yang@amd.com Fri Aug 8 16:24:29 2008 From: Libin Yang <Libin.Yang@amd.com> -Date: Thu, 31 Jul 2008 10:31:50 +0800 +Date: Fri, 8 Aug 2008 15:03:31 +0800 Subject: USB: quirk PLL power down mode -To: David Brownell <david-b@pacbell.net> -Cc: Greg KH <gregkh@suse.de>, linux-usb@vger.kernel.org, oliver@neukum.org, stern@rowland.harvard.edu -Message-ID: <1217471510.5418.3.camel@crane-laptop> - +To: Greg KH <greg@kroah.com> +Cc: David Brownell <david-b@pacbell.net>, Greg KH <gregkh@suse.de>, linux-usb@vger.kernel.org, oliver@neukum.org, stern@rowland.harvard.edu, libin.yang@amd.com +Message-ID: <1218179011.5654.5.camel@crane-laptop> On some AMD 700 series southbridges, ISO OUT transfers (such as audio playback through speakers) on the USB OHCI controller may be corrupted @@ -21,11 +20,11 @@ Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - drivers/usb/host/ohci-hcd.c | 2 + drivers/usb/host/ohci-hcd.c | 17 +++++ drivers/usb/host/ohci-pci.c | 132 ++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/host/ohci-q.c | 6 ++ - drivers/usb/host/ohci.h | 20 ++++++ - 4 files changed, 160 insertions(+) + drivers/usb/host/ohci.h | 9 +++ + 4 files changed, 164 insertions(+) --- a/drivers/usb/host/ohci.h +++ b/drivers/usb/host/ohci.h @@ -37,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> // there are also chip quirks/bugs in init logic struct work_struct nec_work; /* Worker for NEC quirk */ -@@ -428,6 +429,12 @@ static inline int quirk_zfmicro(struct o +@@ -428,6 +429,10 @@ static inline int quirk_zfmicro(struct o { return ohci->flags & OHCI_QUIRK_ZFMICRO; } @@ -45,12 +44,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +{ + return ohci->flags & OHCI_QUIRK_AMD_ISO; +} -+static void quirk_amd_pll(int state); -+static void amd_iso_dev_put(void); #else static inline int quirk_nec(struct ohci_hcd *ohci) { -@@ -437,6 +444,19 @@ static inline int quirk_zfmicro(struct o +@@ -437,6 +442,10 @@ static inline int quirk_zfmicro(struct o { return 0; } @@ -58,7 +55,19 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +{ + return 0; +} -+ + #endif + + /* convert between an hcd pointer and the corresponding ohci_hcd */ +--- a/drivers/usb/host/ohci-hcd.c ++++ b/drivers/usb/host/ohci-hcd.c +@@ -86,6 +86,21 @@ static void ohci_stop (struct usb_hcd *h + static int ohci_restart (struct ohci_hcd *ohci); + #endif + ++#ifdef CONFIG_PCI ++static void quirk_amd_pll(int state); ++static void amd_iso_dev_put(void); ++#else +static inline void quirk_amd_pll(int state) +{ + return; @@ -67,12 +76,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +{ + return; +} - #endif - - /* convert between an hcd pointer and the corresponding ohci_hcd */ ---- a/drivers/usb/host/ohci-hcd.c -+++ b/drivers/usb/host/ohci-hcd.c -@@ -886,6 +886,8 @@ static void ohci_stop (struct usb_hcd *h ++#endif ++ ++ + #include "ohci-hub.c" + #include "ohci-dbg.c" + #include "ohci-mem.c" +@@ -886,6 +901,8 @@ static void ohci_stop (struct usb_hcd *h if (quirk_zfmicro(ohci)) del_timer(&ohci->unlink_watchdog); |