aboutsummaryrefslogtreecommitdiffstats
path: root/usb
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2009-07-29 07:02:05 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2009-07-29 07:02:05 -0700
commit82314d1be36ae7984f54dd878074b51c672cfc0f (patch)
tree35943175c9a2ded3d45a9915d6003d757836434c /usb
parent3dca4a7e6b695903b870a7185a9ec2b7e71ffa06 (diff)
downloadpatches-82314d1be36ae7984f54dd878074b51c672cfc0f.tar.gz
more patchfun
Diffstat (limited to 'usb')
-rw-r--r--usb/usb-add-api-for-userspace-drivers-to-claim-ports.patch4
-rw-r--r--usb/usb-audio-guard-kernel-only-code-with-__kernel__.patch38
-rw-r--r--usb/usb-ehci-ohci-remove-unnecessary-includes-of-reboot.h.patch51
-rw-r--r--usb/usb-make-the-usbfs_snoop-log-more-pertinent.patch4
-rw-r--r--usb/usb-musb-cleanup-the-nop-registration-for-omap3evm.patch94
-rw-r--r--usb/usb-r8a66597-hcd-platform-data-on_chip-support.patch1
6 files changed, 94 insertions, 98 deletions
diff --git a/usb/usb-add-api-for-userspace-drivers-to-claim-ports.patch b/usb/usb-add-api-for-userspace-drivers-to-claim-ports.patch
index 120b7b8cbe2edd..c7163745d6a149 100644
--- a/usb/usb-add-api-for-userspace-drivers-to-claim-ports.patch
+++ b/usb/usb-add-api-for-userspace-drivers-to-claim-ports.patch
@@ -64,7 +64,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/* Protect against simultaneous open */
mutex_lock(&usbfs_mutex);
-@@ -1546,6 +1548,29 @@ static int proc_ioctl_compat(struct dev_
+@@ -1548,6 +1550,29 @@ static int proc_ioctl_compat(struct dev_
}
#endif
@@ -94,7 +94,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
/*
* NOTE: All requests here that have interface numbers as parameters
* are assuming that somehow the configuration has been prevented from
-@@ -1687,6 +1712,16 @@ static int usbdev_ioctl(struct inode *in
+@@ -1689,6 +1714,16 @@ static int usbdev_ioctl(struct inode *in
snoop(&dev->dev, "%s: IOCTL\n", __func__);
ret = proc_ioctl_default(ps, p);
break;
diff --git a/usb/usb-audio-guard-kernel-only-code-with-__kernel__.patch b/usb/usb-audio-guard-kernel-only-code-with-__kernel__.patch
new file mode 100644
index 00000000000000..b7321703067a61
--- /dev/null
+++ b/usb/usb-audio-guard-kernel-only-code-with-__kernel__.patch
@@ -0,0 +1,38 @@
+From mst@redhat.com Wed Jul 29 06:41:33 2009
+From: "Michael S. Tsirkin" <mst@redhat.com>
+Date: Wed, 29 Jul 2009 14:23:25 +0300
+Subject: USB: audio: guard kernel-only code with __KERNEL__
+To: gregkh@suse.de, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
+Message-ID: <20090729112324.GA15759@redhat.com>
+
+
+include/linux/usb/audio.h is exported to userspace,
+so part of this file that is for internal kernel
+usage need to be guarded with ifdef __KERNEL__.
+This way make headers_install will stript it out.
+
+Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ include/linux/usb/audio.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/include/linux/usb/audio.h
++++ b/include/linux/usb/audio.h
+@@ -276,6 +276,8 @@ struct uac_iso_endpoint_descriptor {
+ #define UAC_FU_BASS_BOOST (1 << (UAC_BASS_BOOST_CONTROL - 1))
+ #define UAC_FU_LOUDNESS (1 << (UAC_LOUDNESS_CONTROL - 1))
+
++#ifdef __KERNEL__
++
+ struct usb_audio_control {
+ struct list_head list;
+ const char *name;
+@@ -294,4 +296,6 @@ struct usb_audio_control_selector {
+ struct usb_descriptor_header *desc;
+ };
+
++#endif /* __KERNEL__ */
++
+ #endif /* __LINUX_USB_AUDIO_H */
diff --git a/usb/usb-ehci-ohci-remove-unnecessary-includes-of-reboot.h.patch b/usb/usb-ehci-ohci-remove-unnecessary-includes-of-reboot.h.patch
new file mode 100644
index 00000000000000..31b4f4b200a01e
--- /dev/null
+++ b/usb/usb-ehci-ohci-remove-unnecessary-includes-of-reboot.h.patch
@@ -0,0 +1,51 @@
+From gadiyar@ti.com Wed Jul 29 06:52:02 2009
+From: Anand Gadiyar <gadiyar@ti.com>
+Date: Tue, 28 Jul 2009 23:52:21 +0530
+Subject: USB: EHCI: OHCI: Remove unnecessary includes of reboot.h
+To: linux-usb@vger.kernel.org
+Cc: Greg KH <greg@kroah.com>, Anand Gadiyar <gadiyar@ti.com>
+Message-ID: <1248805341-20236-1-git-send-email-gadiyar@ti.com>
+
+
+EHCI: OHCI: Remove unnecessary includes of reboot.h
+
+Signed-off-by: Anand Gadiyar <gadiyar@ti.com>
+Acked-by: David Brownell <dbrownell@users.sourceforge.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/usb/host/ehci-hcd.c | 1 -
+ drivers/usb/host/ohci-hcd.c | 1 -
+ drivers/usb/host/oxu210hp-hcd.c | 1 -
+ 3 files changed, 3 deletions(-)
+
+--- a/drivers/usb/host/ehci-hcd.c
++++ b/drivers/usb/host/ehci-hcd.c
+@@ -30,7 +30,6 @@
+ #include <linux/timer.h>
+ #include <linux/list.h>
+ #include <linux/interrupt.h>
+-#include <linux/reboot.h>
+ #include <linux/usb.h>
+ #include <linux/moduleparam.h>
+ #include <linux/dma-mapping.h>
+--- a/drivers/usb/host/ohci-hcd.c
++++ b/drivers/usb/host/ohci-hcd.c
+@@ -34,7 +34,6 @@
+ #include <linux/usb/otg.h>
+ #include <linux/dma-mapping.h>
+ #include <linux/dmapool.h>
+-#include <linux/reboot.h>
+ #include <linux/workqueue.h>
+ #include <linux/debugfs.h>
+
+--- a/drivers/usb/host/oxu210hp-hcd.c
++++ b/drivers/usb/host/oxu210hp-hcd.c
+@@ -33,7 +33,6 @@
+ #include <linux/timer.h>
+ #include <linux/list.h>
+ #include <linux/interrupt.h>
+-#include <linux/reboot.h>
+ #include <linux/usb.h>
+ #include <linux/moduleparam.h>
+ #include <linux/dma-mapping.h>
diff --git a/usb/usb-make-the-usbfs_snoop-log-more-pertinent.patch b/usb/usb-make-the-usbfs_snoop-log-more-pertinent.patch
index 81bb88b2db20d0..bf7453cf3a6a9b 100644
--- a/usb/usb-make-the-usbfs_snoop-log-more-pertinent.patch
+++ b/usb/usb-make-the-usbfs_snoop-log-more-pertinent.patch
@@ -291,7 +291,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
async_removepending(as);
free_async(as);
return ret;
-@@ -1668,7 +1661,7 @@ static int usbdev_ioctl(struct inode *in
+@@ -1670,7 +1663,7 @@ static int usbdev_ioctl(struct inode *in
break;
case USBDEVFS_REAPURBNDELAY32:
@@ -300,7 +300,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
ret = proc_reapurbnonblock_compat(ps, p);
break;
-@@ -1689,7 +1682,7 @@ static int usbdev_ioctl(struct inode *in
+@@ -1691,7 +1684,7 @@ static int usbdev_ioctl(struct inode *in
break;
case USBDEVFS_REAPURBNDELAY:
diff --git a/usb/usb-musb-cleanup-the-nop-registration-for-omap3evm.patch b/usb/usb-musb-cleanup-the-nop-registration-for-omap3evm.patch
deleted file mode 100644
index fe6004bb0f6abe..00000000000000
--- a/usb/usb-musb-cleanup-the-nop-registration-for-omap3evm.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From ajay.gupta@ti.com Fri Jul 10 15:20:10 2009
-From: Ajay Kumar Gupta <ajay.gupta@ti.com>
-Date: Fri, 3 Jul 2009 14:30:26 +0530
-Subject: USB: musb: cleanup the nop registration for OMAP3EVM
-To: linux-usb@vger.kernel.org
-Cc: linux-omap@vger.kernel.org, david-b@pacbell.net, felipe.balbi@nokia.com, tony@atomide.com, Ajay Kumar Gupta <ajay.gupta@ti.com>
-Message-ID: <1246611626-28137-1-git-send-email-ajay.gupta@ti.com>
-
-
-OMAP3EVM uses ISP1504 phy which doesn't require any
-programming and thus has to use NOP otg transceiver.
-
-Cleanups being done:
- - Remove unwanted code in usb-musb.c file
- - Register nop in OMAP3EVM board file using
- usb_nop_xceiv_register().
- - Select NOP_USB_XCEIV for OMAP3EVM boards.
-
-Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
-Acked-by: David Brownell <dbrownell@users.sourceforge.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- arch/arm/mach-omap2/board-omap3evm.c | 3 +++
- arch/arm/mach-omap2/usb-musb.c | 21 ---------------------
- drivers/usb/musb/Kconfig | 1 +
- 3 files changed, 4 insertions(+), 21 deletions(-)
-
---- a/arch/arm/mach-omap2/board-omap3evm.c
-+++ b/arch/arm/mach-omap2/board-omap3evm.c
-@@ -25,6 +25,7 @@
- #include <linux/spi/spi.h>
- #include <linux/spi/ads7846.h>
- #include <linux/i2c/twl4030.h>
-+#include <linux/usb/otg.h>
-
- #include <mach/hardware.h>
- #include <asm/mach-types.h>
-@@ -307,6 +308,8 @@ static void __init omap3_evm_init(void)
- ARRAY_SIZE(omap3evm_spi_board_info));
-
- omap_serial_init();
-+ /* OMAP3EVM uses ISP1504 phy and thus has to register nop transceiver */
-+ usb_nop_xceiv_register();
- usb_musb_init();
- ads7846_dev_init();
- }
---- a/arch/arm/mach-omap2/usb-musb.c
-+++ b/arch/arm/mach-omap2/usb-musb.c
-@@ -155,20 +155,6 @@ static struct platform_device musb_devic
- .resource = musb_resources,
- };
-
--#ifdef CONFIG_NOP_USB_XCEIV
--static u64 nop_xceiv_dmamask = DMA_BIT_MASK(32);
--
--static struct platform_device nop_xceiv_device = {
-- .name = "nop_usb_xceiv",
-- .id = -1,
-- .dev = {
-- .dma_mask = &nop_xceiv_dmamask,
-- .coherent_dma_mask = DMA_BIT_MASK(32),
-- .platform_data = NULL,
-- },
--};
--#endif
--
- void __init usb_musb_init(void)
- {
- if (cpu_is_omap243x())
-@@ -183,13 +169,6 @@ void __init usb_musb_init(void)
- */
- musb_plat.clock = "ick";
-
--#ifdef CONFIG_NOP_USB_XCEIV
-- if (platform_device_register(&nop_xceiv_device) < 0) {
-- printk(KERN_ERR "Unable to register NOP-XCEIV device\n");
-- return;
-- }
--#endif
--
- if (platform_device_register(&musb_device) < 0) {
- printk(KERN_ERR "Unable to register HS-USB (MUSB) device\n");
- return;
---- a/drivers/usb/musb/Kconfig
-+++ b/drivers/usb/musb/Kconfig
-@@ -11,6 +11,7 @@ config USB_MUSB_HDRC
- depends on (USB || USB_GADGET) && HAVE_CLK
- depends on !SUPERH
- select NOP_USB_XCEIV if ARCH_DAVINCI
-+ select NOP_USB_XCEIV if MACH_OMAP3EVM
- select TWL4030_USB if MACH_OMAP_3430SDP
- select USB_OTG_UTILS
- tristate 'Inventra Highspeed Dual Role Controller (TI, ADI, ...)'
diff --git a/usb/usb-r8a66597-hcd-platform-data-on_chip-support.patch b/usb/usb-r8a66597-hcd-platform-data-on_chip-support.patch
index b4b68d73073de3..283b7df1d17c79 100644
--- a/usb/usb-r8a66597-hcd-platform-data-on_chip-support.patch
+++ b/usb/usb-r8a66597-hcd-platform-data-on_chip-support.patch
@@ -21,6 +21,7 @@ we with this patch can add support for new processors
with on-chip r8a66597 without modifying the Kconfig.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
+Acked-by: Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 19:20:15 +0000