* [GIT PATCH] USB patches for .37-rc1
@ 2010-10-22 17:51 Greg KH
2010-10-22 17:57 ` Greg Kroah-Hartman
2010-10-25 23:33 ` [GIT PATCH] USB patches for .37-rc1 Nguyen Dinh-R00091
0 siblings, 2 replies; 13+ messages in thread
From: Greg KH @ 2010-10-22 17:51 UTC (permalink / raw)
To: Linus Torvalds, Andrew Morton; +Cc: linux-kernel, linux-usb
Here is the big USB patchset for .37-rc1.
Nothing major here, just some new drivers, new device ids, and of
course, more xhci fixes/speedups for all to enjoy.
There are a few patches here outside of the drivers/usb/ tree, for
platform specific code, that has been acked by the proper people and
asked to go through this tree as it affects USB driver stuff.
There's also some scsi changes, which have been discussed by the scsi
developers and agreed to go through this tree as they are related to the
usb-storage driver changes at the same time.
Please pull from:
master.kernel.org:/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/
All of these patches have been in the linux-next and mm trees for a
while.
The full patches will be sent to the linux-usb mailing list, if anyone
wants to see them.
thanks,
greg k-h
------------
Documentation/devices.txt | 5 +-
Documentation/powerpc/dts-bindings/fsl/usb.txt | 22 +
Documentation/usb/proc_usb_info.txt | 34 +-
MAINTAINERS | 8 +
arch/arm/mach-mx3/mach-cpuimx35.c | 1 +
arch/arm/mach-omap2/board-am3517evm.c | 30 +
arch/arm/mach-omap2/usb-musb.c | 4 +
arch/arm/plat-omap/include/plat/usb.h | 21 +
arch/powerpc/sysdev/fsl_soc.c | 163 --
drivers/block/ub.c | 2 +-
drivers/hid/hid-core.c | 1 +
drivers/hid/hid-ids.h | 3 +
drivers/scsi/sd.c | 12 +
drivers/scsi/sr.c | 8 +-
drivers/usb/Kconfig | 1 +
drivers/usb/atm/Makefile | 6 +-
drivers/usb/c67x00/Makefile | 6 +-
drivers/usb/class/cdc-acm.c | 2 +-
drivers/usb/core/Makefile | 21 +-
drivers/usb/core/devices.c | 11 +-
drivers/usb/core/driver.c | 2 +-
drivers/usb/core/endpoint.c | 2 +-
drivers/usb/core/hcd-pci.c | 4 +-
drivers/usb/core/hcd.c | 19 +-
drivers/usb/core/hub.c | 41 +-
drivers/usb/core/message.c | 14 +-
drivers/usb/core/urb.c | 5 +-
drivers/usb/early/Makefile | 2 +-
drivers/usb/gadget/Kconfig | 22 +-
drivers/usb/gadget/Makefile | 41 +-
drivers/usb/gadget/amd5536udc.c | 15 +-
drivers/usb/gadget/at91_udc.c | 11 +-
drivers/usb/gadget/atmel_usba_udc.c | 10 +-
drivers/usb/gadget/audio.c | 10 +-
drivers/usb/gadget/cdc2.c | 10 +-
drivers/usb/gadget/ci13xxx_udc.c | 18 +-
drivers/usb/gadget/composite.c | 139 +-
drivers/usb/gadget/dbgp.c | 19 +-
drivers/usb/gadget/dummy_hcd.c | 18 +-
drivers/usb/gadget/ether.c | 16 +-
drivers/usb/gadget/f_acm.c | 2 +-
drivers/usb/gadget/f_loopback.c | 7 +-
drivers/usb/gadget/f_mass_storage.c | 88 +-
drivers/usb/gadget/f_sourcesink.c | 5 +-
drivers/usb/gadget/file_storage.c | 128 +-
drivers/usb/gadget/fsl_mxc_udc.c | 15 +
drivers/usb/gadget/fsl_qe_udc.c | 12 +-
drivers/usb/gadget/fsl_udc_core.c | 10 +-
drivers/usb/gadget/g_ffs.c | 91 +-
drivers/usb/gadget/gmidi.c | 5 +-
drivers/usb/gadget/goku_udc.c | 35 +-
drivers/usb/gadget/hid.c | 10 +-
drivers/usb/gadget/imx_udc.c | 9 +-
drivers/usb/gadget/inode.c | 6 +-
drivers/usb/gadget/langwell_udc.c | 1058 +++++++-----
drivers/usb/gadget/langwell_udc.h | 15 +-
drivers/usb/gadget/lh7a40x_udc.c | 10 +-
drivers/usb/gadget/m66592-udc.c | 9 +-
drivers/usb/gadget/mass_storage.c | 82 +-
drivers/usb/gadget/multi.c | 36 +-
drivers/usb/gadget/net2280.c | 10 +-
drivers/usb/gadget/nokia.c | 11 +-
drivers/usb/gadget/omap_udc.c | 10 +-
drivers/usb/gadget/printer.c | 7 +-
drivers/usb/gadget/pxa25x_udc.c | 9 +-
drivers/usb/gadget/pxa27x_udc.c | 12 +-
drivers/usb/gadget/r8a66597-udc.c | 14 +-
drivers/usb/gadget/r8a66597-udc.h | 2 +-
drivers/usb/gadget/rndis.c | 492 +++---
drivers/usb/gadget/s3c-hsotg.c | 9 +-
drivers/usb/gadget/s3c2410_udc.c | 17 +-
drivers/usb/gadget/serial.c | 11 +-
drivers/usb/gadget/storage_common.c | 49 +-
drivers/usb/gadget/webcam.c | 11 +-
drivers/usb/gadget/zero.c | 5 +-
drivers/usb/host/Kconfig | 10 +-
drivers/usb/host/Makefile | 24 +-
drivers/usb/host/ehci-fsl.c | 105 +-
drivers/usb/host/ehci-fsl.h | 14 +-
drivers/usb/host/ehci-hcd.c | 15 +
drivers/usb/host/ehci-mem.c | 2 +-
drivers/usb/host/ehci-mxc.c | 13 +-
drivers/usb/host/fsl-mph-dr-of.c | 308 +++
drivers/usb/host/imx21-hcd.c | 284 +++-
drivers/usb/host/imx21-hcd.h | 8 +-
drivers/usb/host/isp116x-hcd.c | 6 +-
drivers/usb/host/isp1362-hcd.c | 25 +-
drivers/usb/host/ohci-hcd.c | 12 +-
drivers/usb/host/ohci-pci.c | 18 +
drivers/usb/host/ohci-sh.c | 3 +-
drivers/usb/host/ohci-sm501.c | 4 +-
drivers/usb/host/ohci.h | 1 +
drivers/usb/host/oxu210hp-hcd.c | 2 +-
drivers/usb/host/pci-quirks.c | 18 +-
drivers/usb/host/r8a66597.h | 2 +-
drivers/usb/host/uhci-q.c | 33 +-
drivers/usb/host/whci/Kbuild | 2 +-
drivers/usb/host/xhci-hub.c | 419 ++++-
drivers/usb/host/xhci-mem.c | 5 +
drivers/usb/host/xhci-pci.c | 38 +-
drivers/usb/host/xhci-ring.c | 101 +-
drivers/usb/host/xhci.c | 343 +++-
drivers/usb/host/xhci.h | 65 +-
drivers/usb/misc/Kconfig | 13 +
drivers/usb/misc/Makefile | 45 +-
drivers/usb/misc/ftdi-elan.c | 2 +-
drivers/usb/misc/iowarrior.c | 2 +-
drivers/usb/misc/sisusbvga/Makefile | 3 +-
drivers/usb/misc/usbtest.c | 667 ++++----
drivers/usb/misc/yurex.c | 563 ++++++
drivers/usb/mon/Makefile | 2 +-
drivers/usb/musb/Kconfig | 16 +-
drivers/usb/musb/Makefile | 71 +-
drivers/usb/musb/am35x.c | 524 +++++
drivers/usb/musb/blackfin.c | 7 +-
drivers/usb/musb/cppi_dma.c | 2 +-
drivers/usb/musb/da8xx.c | 469 +++++
drivers/usb/musb/davinci.c | 2 +
drivers/usb/musb/musb_core.c | 57 +-
drivers/usb/musb/musb_core.h | 2 +
drivers/usb/musb/musb_debug.h | 11 +-
drivers/usb/musb/musb_gadget.c | 132 +-
drivers/usb/musb/musb_gadget.h | 2 +
drivers/usb/musb/musb_host.c | 11 +-
drivers/usb/musb/musbhsdma.c | 2 +-
drivers/usb/musb/omap2430.c | 1 +
drivers/usb/musb/tusb6010.c | 4 +
drivers/usb/otg/Kconfig | 14 +
drivers/usb/otg/Makefile | 8 +-
drivers/usb/otg/langwell_otg.c | 2408 ++++++++++++++++++++++++
drivers/usb/otg/ulpi.c | 60 +-
drivers/usb/serial/Kconfig | 9 +
drivers/usb/serial/Makefile | 10 +-
drivers/usb/serial/cp210x.c | 2 +
drivers/usb/serial/ftdi_sio.c | 42 +-
drivers/usb/serial/ftdi_sio_ids.h | 39 +-
drivers/usb/serial/mct_u232.c | 7 +-
drivers/usb/serial/opticon.c | 44 +-
drivers/usb/serial/option.c | 30 +-
drivers/usb/serial/qcserial.c | 33 +-
drivers/usb/serial/sam-ba.c | 206 ++
drivers/usb/serial/visor.c | 11 +-
drivers/usb/storage/Kconfig | 13 +
drivers/usb/storage/Makefile | 35 +-
drivers/usb/storage/scsiglue.c | 16 +-
drivers/usb/storage/sddr09.c | 2 +-
drivers/usb/storage/transport.c | 10 +-
drivers/usb/storage/uas.c | 751 ++++++++
drivers/usb/storage/unusual_alauda.h | 4 +-
drivers/usb/storage/unusual_cypress.h | 4 +-
drivers/usb/storage/unusual_datafab.h | 20 +-
drivers/usb/storage/unusual_devs.h | 580 +++---
drivers/usb/storage/unusual_freecom.h | 2 +-
drivers/usb/storage/unusual_isd200.h | 12 +-
drivers/usb/storage/unusual_jumpshot.h | 2 +-
drivers/usb/storage/unusual_karma.h | 2 +-
drivers/usb/storage/unusual_onetouch.h | 4 +-
drivers/usb/storage/unusual_sddr09.h | 12 +-
drivers/usb/storage/unusual_sddr55.h | 8 +-
drivers/usb/storage/unusual_usbat.h | 8 +-
drivers/usb/storage/usb.c | 30 +-
drivers/usb/wusbcore/Makefile | 19 +-
drivers/uwb/address.c | 5 +-
drivers/uwb/wlp/wss-lc.c | 7 +-
include/linux/fsl_devices.h | 18 +
include/linux/init.h | 13 +-
include/linux/usb/cdc.h | 79 +-
include/linux/usb/ch9.h | 68 +-
include/linux/usb/composite.h | 40 +-
include/linux/usb/gadget.h | 20 +-
include/linux/usb/hcd.h | 2 +
include/linux/usb/intel_mid_otg.h | 180 ++
include/linux/usb/langwell_otg.h | 139 ++
include/linux/usb/ncm.h | 114 --
include/linux/usb/otg.h | 11 +
include/linux/usb/storage.h | 48 +
include/linux/usb_usual.h | 43 +-
include/scsi/scsi.h | 2 +
include/scsi/scsi_device.h | 2 +
179 files changed, 9945 insertions(+), 2874 deletions(-)
create mode 100644 drivers/usb/host/fsl-mph-dr-of.c
create mode 100644 drivers/usb/misc/yurex.c
create mode 100644 drivers/usb/musb/am35x.c
create mode 100644 drivers/usb/musb/da8xx.c
create mode 100644 drivers/usb/otg/langwell_otg.c
create mode 100644 drivers/usb/serial/sam-ba.c
create mode 100644 drivers/usb/storage/uas.c
create mode 100644 include/linux/usb/intel_mid_otg.h
create mode 100644 include/linux/usb/langwell_otg.h
delete mode 100644 include/linux/usb/ncm.h
create mode 100644 include/linux/usb/storage.h
---------------
Ajay Kumar Gupta (3):
USB: AM35x: Add musb support
USB: musb: add musb support for AM35x
USB: musb: AM35x: Workaround for fifo read issue
Alan Stern (5):
USB: g_file_storage: don't generate automatic serial string
OHCI: work around for nVidia shutdown problem
USB: teach "devices" file about Wireless and SuperSpeed USB
USB: disable endpoints after unbinding interfaces, not before
USB: accept some invalid ep0-maxpacket values
Alon Ziv (3):
USB: opticon: Fix long-standing bugs in opticon driver
USB: opticon: Add Opticon OPN2001 write support
USB: opticon: Whitespace fixes in opticon driver
Anatolij Gustschin (2):
USB: add platform glue driver for FSL USB DR controller
USB: add USB EHCI support for MPC5121 SoC
Anders Larsen (1):
USB: cp210x: Add WAGO 750-923 Service Cable device ID
Andiry Xu (7):
USB: xHCI: Add pointer to udev in struct xhci_virt_device
USB: xHCI: change xhci_reset_device() to allocate new device
USB: core: use kernel assigned address for devices under xHCI
USB: xHCI: port power management implementation
USB: xHCI: port remote wakeup implementation
USB: xHCI: bus power management implementation
USB: xHCI: PCI power management implementation
Andy Shevchenko (1):
uwb: use '%pM' format to print MAC address
Anil Shetty (1):
usb: musb: musbhsdma: increase max_len to 1MB
Axel Lin (4):
USB: isp116x-hcd - use resource_size instead of defining its own resource_len macro
USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro
USB: ohci-sh - use resource_size instead of defining its own resource_len macro
USB: imx21-hcd - fix off by one resource size calculation
Bob Liu (1):
usb: musb: Change to direct addr in context save/restore
Christophe Lebouc (1):
usb: langwell_udc: fix big file transfer issue.
DJ Delorie (1):
USB: cp210x: Add Renesas RX-Stick device ID
Dan Carpenter (3):
USB: gadget: dbgp: cleanup: remove unneeded check
USB: ohci-sm501: add iounmap on error path
usb: gadget: goku_udc: Fix error path
Daniel Suchy (1):
USB: ftdi_sio: new VID/PIDs for various Papouch devices
Enrico Mioso (1):
USB: option: Add new ONDA vendor id and product id for ONDA MT825UP
Eric Bénard (1):
mxc_udc: add workaround for ENGcm09152 for i.MX35
Felipe Balbi (1):
usb: musb: gadget: only enable AUTOCLEAR in double buffered case
Felipe Contreras (1):
usb: gadget: fix Kconfig warning
Grazvydas Ignotas (1):
USB: Add more empty functions in otg.h
Greg Kroah-Hartman (2):
USB: yurex: assign a real minor number to the driver
USB: ftdi_sio: add device ids for ScienceScope
Hans de Goede (4):
scsi/sr: add no_read_disc_info scsi_device flag
usb-storage: add new no_read_disc_info quirk
scsi/sd: add a no_read_capacity_16 scsi_device flag
usb-storage: add new no_read_capacity_16 quirk
Hao Wu (3):
usb: Add Intel Langwell USB OTG Transceiver Driver
USB OTG: Add common data structure for Intel MID Platform (Langwell/Penwell)
USB OTG Langwell: Update OTG Kconfig and driver version.
Heikki Krogerus (1):
usb: musb: ignore spurious SESSREQ interrupts
Igor Grinberg (2):
USB: otg/ulpi: improve ulpi phy detection.
USB: otg/ulpi: extend id's table.
Javier Martinez Canillas (2):
USB: r8a66597-udc: Initialize uninitialized variable, fix compile warning
USB: isp1362-hcd: Removes CONFIG_USB_OTG dependent code, fix build breakage
Jean-Christophe PLAGNIOL-VILLARD (1):
USB: atmel_usba_udc: force vbus_pin at -EINVAL when gpio_request failled
JiebingLi (5):
USB: langwell: USB Client driver code cleanup
USB: langwell: USB Client Endpoint initialization
USB: langwell: USB Client PHY low power mode setting
USB: langwell: USB Client Remote Wakeup Support
USB: langwell: USB Client driver memory handling
Joe Perches (3):
USB: langwell: Remove unnecessary return's from void functions
USB: gadget: Remove pr_<level> uses of KERN_<level>
usb: host: oxu210hp-hcd: Use static const char * const where possible
Johan Hovold (5):
USB: sam-ba: add driver for Atmel SAM Boot Assistant (SAM-BA)
USB: ftdi_sio: revert "USB: ftdi_sio: fix DTR/RTS line modes"
USB: visor: fix initialisation of UX50/TH55 devices
USB: ftdi_sio: set device latency timeout at port probe
USB: mct_u232: fix broken close
Jon Povey (1):
USB: musb: suppress warning about unused flags
Julia Lawall (1):
USB: gadget: amd5536udc.c: Remove double test
Kees Cook (1):
usb: iowarrior: don't trust report_size for buffer size
Keshava Munegowda (1):
usb: omap: ohci: Missing driver unregister in module exit
Martin Fuzzey (7):
USB: usbtest fix coding style
USB: usbtest - ensure correct isoc data length
USB: imx21-hcd: remove unused variable
USB: imx21-hcd: refactor hardware data memory management
USB: imx21-hcd: Fix isochronous endpoint idle
USB: introduce unmap_urb_setup_for_dma()
USB: imx21-hcd accept arbitary transfer buffer alignement.
Matthew Garrett (1):
USB: serial: Enable USB autosuspend by default on qcserial
Matthew Wilcox (2):
USB: Move USB Storage definitions to their own header file
USB: Add UAS driver
Matthias G. Eckermann (1):
USB: qcserial: Enable Diagnostics Monitor and GPS ports on Gobi 2000
Matthieu CASTET (1):
USB: ehci tdi : let's tdi_reset set host mode
Maulik Mankad (1):
usb: musb: host: unmap the buffer for PIO data transfers
Mauro Carvalho Chehab (1):
USB: option: Add more ZTE modem USB id's
Michael Prokop (1):
USB: Kconfig: fix typos in USB_FUNCTIONFS* description
Michal Nazarewicz (14):
USB: gadget: g_multi: fixed vendor and product ID
USB: gadget: g_ffs: fixed vendor and product ID
usb: gadget: storage: remove nofua file when unbinding
usb: gadget: mass_storage: optional SCSI WRITE FUA bit
USB: gadget: functionfs: code cleanup
USB: gadget: composite: Better string override handling
USB: gadget: mass_storage: moved strings handling code to composite
USB: gadget: g_multi: moved strings handling code to composite
USB: Revert "USB: gadget: section mismatch warning fixed"
usb gadget: don't save bind callback in struct usb_composite_driver
init.h: add some more documentation to __ref* tags
USB: storage: Use USB_ prefix instead of US_ prefix
USB: gadget: file_storage: reuse definitions from a header file
USB: gadget: storage: reuse definitions from scsi.h header file
Mihai Donțu (1):
USB: gadget: rndis: fix up coding style issues in the file
Ming Lei (3):
usb: musb: support ISO high bandwidth for gadget mode
usb: musb: gadget: fix ZLP sending in musb_g_tx(v1)
USB: UHCI: add native scatter-gather support(v1)
Nobuhiro Iwamatsu (1):
usb: r8a66597-hcd: Change mistake of the outsw function
Otavio Salvador (1):
USB: cdc-acm: fix code indentation
Parirajan Muthalagu (1):
USB Gadget: Verify VBUS current before setting the device self-powered bit
Peter Chen (1):
USB: do not print -ESHUTDOWN message if usb at otg device mode
Philippe Skowronski (1):
usb: langwell_udc: cancel pending requests when controller is suspended.
Praveena Nadahally (1):
USB: Change acm_iad_descriptor bFunctionProtocol to USB_CDC_ACM_PROTO_AT_V25TER
Rahul Ruikar (3):
usb: core: endpoint: Fix error path
usb: gadget: dummy_hcd: Fix error path
USB: gadget: amd5536udc.c: fix error path
Rainer Keller (1):
USB: add PID for FTDI based OpenDCC hardware
Rich Mattes (1):
USB: ftdi_sio: Add PID for accesio products
Roger Quadros (1):
usb gadget: composite: prevent OOPS for non-standard control request
Sarah Sharp (3):
usb: Fix issue with USB 3.0 devices after system resume
USB: xhci: Fix compile error when CONFIG_PM=n
usb: Fix linker errors with CONFIG_PM=n
Sergei Shtylyov (6):
USB: musb: make DBG() calls actually depend on CONFIG_USB_MUSB_DEBUG
usb: musb: introduce DA8xx/OMAP-L1x glue layer
usb: musb: gadget: kill unreachable code in musb_g_rx()
USB: MUSB: fix kernel WARNING/oops when unloading module in OTG mode
usb: musb: blackfin: call usb_nop_xceiv_unregister() in musb_platform_exit()
usb: musb: blackfin: call gpio_free() on error path in musb_platform_init()
Simon Arlott (1):
USB: output an error message when the pipe type doesn't match the endpoint type
T. S., Anil Kumar (1):
usb: musb: host: support DMA transfers greater than max channel length
Tatyana Brokhman (1):
usb: usb3.0 ch9 definitions
Thomas Gleixner (1):
usb: ftdi-elan: Convert "mutex" to semaphore
Tomoki Sekiyama (2):
USB: add driver for Meywa-Denki & Kayac YUREX
USB: yurex: fix memory leak and corrupted messages
Uwe Kleine-König (2):
usb gadget: don't save bind callback in struct usb_gadget_driver
usb gadget: don't save bind callback in struct usb_configuration
Wolfram Sang (1):
USB: core: update comment to match current function name
Yauheni Kaliuta (4):
USB: cdc.h: ncm: typo and style fixes
Revert "USB: ncm: added ncm.h with auxiliary definitions"
USB: cdc.h: ncm: add missed constants and structures
USB: cdc.h: ncm: fix one more typo
Yusuke Goda (1):
usb: r8a66597-udc: Add processing when USB was removed.
matt mooney (2):
usb: change to new flag variable
usb: makefile cleanup
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 132/141] USB: AM35x: Add musb support
2010-10-22 17:51 [GIT PATCH] USB patches for .37-rc1 Greg KH
@ 2010-10-22 17:57 ` Greg Kroah-Hartman
2010-10-25 23:33 ` [GIT PATCH] USB patches for .37-rc1 Nguyen Dinh-R00091
1 sibling, 0 replies; 13+ messages in thread
From: Greg Kroah-Hartman @ 2010-10-22 17:57 UTC (permalink / raw)
To: linux-usb
Cc: Ajay Kumar Gupta, linux-arm-kernel, linux-kernel, linux-omap,
Felipe Balbi, Greg Kroah-Hartman
From: Ajay Kumar Gupta <ajay.gupta@ti.com>
AM35x has musb interface (version 1.8) and uses CPPI41 DMA engine.
It has USB phy built inside the IP itself.
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-omap@vger.kernel.org
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
arch/arm/mach-omap2/board-am3517evm.c | 30 ++++++++++++++++++++++++++++++
arch/arm/mach-omap2/usb-musb.c | 4 ++++
arch/arm/plat-omap/include/plat/usb.h | 21 +++++++++++++++++++++
3 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index 4d0f585..9ac9de6 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -375,6 +375,31 @@ static void __init am3517_evm_init_irq(void)
omap_gpio_init();
}
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 500,
+};
+
+static __init void am3517_evm_musb_init(void)
+{
+ u32 devconf2;
+
+ /*
+ * Set up USB clock/mode in the DEVCONF2 register.
+ */
+ devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
+
+ /* USB2.0 PHY reference clock is 13 MHz */
+ devconf2 &= ~(CONF2_REFFREQ | CONF2_OTGMODE | CONF2_PHY_GPIOMODE);
+ devconf2 |= CONF2_REFFREQ_13MHZ | CONF2_SESENDEN | CONF2_VBDTCTEN
+ | CONF2_DATPOL;
+
+ omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
+
+ usb_musb_init(&musb_board_data);
+}
+
static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
#if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \
@@ -393,6 +418,8 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
#ifdef CONFIG_OMAP_MUX
static struct omap_board_mux board_mux[] __initdata = {
+ /* USB OTG DRVVBUS offset = 0x212 */
+ OMAP3_MUX(SAD2D_MCAD23, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
#else
@@ -459,6 +486,9 @@ static void __init am3517_evm_init(void)
ARRAY_SIZE(am3517evm_i2c1_boardinfo));
/*Ethernet*/
am3517_evm_ethernet_init(&am3517_evm_emac_pdata);
+
+ /* MUSB */
+ am3517_evm_musb_init();
}
MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 33a5cde..7260558 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -28,6 +28,7 @@
#include <mach/hardware.h>
#include <mach/irqs.h>
+#include <mach/am35xx.h>
#include <plat/usb.h>
#ifdef CONFIG_USB_MUSB_SOC
@@ -89,6 +90,9 @@ void __init usb_musb_init(struct omap_musb_board_data *board_data)
{
if (cpu_is_omap243x()) {
musb_resources[0].start = OMAP243X_HS_BASE;
+ } else if (cpu_is_omap3517() || cpu_is_omap3505()) {
+ musb_resources[0].start = AM35XX_IPSS_USBOTGSS_BASE;
+ musb_resources[1].start = INT_35XX_USBOTG_IRQ;
} else if (cpu_is_omap34xx()) {
musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
} else if (cpu_is_omap44xx()) {
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index 2a9427c..9feddac 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -218,6 +218,27 @@ static inline omap2_usbfs_init(struct omap_usb_config *pdata)
# define USBT2TLL5PI (1 << 17)
# define USB0PUENACTLOI (1 << 16)
# define USBSTANDBYCTRL (1 << 15)
+/* AM35x */
+/* USB 2.0 PHY Control */
+#define CONF2_PHY_GPIOMODE (1 << 23)
+#define CONF2_OTGMODE (3 << 14)
+#define CONF2_NO_OVERRIDE (0 << 14)
+#define CONF2_FORCE_HOST (1 << 14)
+#define CONF2_FORCE_DEVICE (2 << 14)
+#define CONF2_FORCE_HOST_VBUS_LOW (3 << 14)
+#define CONF2_SESENDEN (1 << 13)
+#define CONF2_VBDTCTEN (1 << 12)
+#define CONF2_REFFREQ_24MHZ (2 << 8)
+#define CONF2_REFFREQ_26MHZ (7 << 8)
+#define CONF2_REFFREQ_13MHZ (6 << 8)
+#define CONF2_REFFREQ (0xf << 8)
+#define CONF2_PHYCLKGD (1 << 7)
+#define CONF2_VBUSSENSE (1 << 6)
+#define CONF2_PHY_PLLON (1 << 5)
+#define CONF2_RESET (1 << 4)
+#define CONF2_PHYPWRDN (1 << 3)
+#define CONF2_OTGPWRDN (1 << 2)
+#define CONF2_DATPOL (1 << 1)
#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB)
u32 omap1_usb0_init(unsigned nwires, unsigned is_device);
--
1.7.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 132/141] USB: AM35x: Add musb support
@ 2010-10-22 17:57 ` Greg Kroah-Hartman
0 siblings, 0 replies; 13+ messages in thread
From: Greg Kroah-Hartman @ 2010-10-22 17:57 UTC (permalink / raw)
To: linux-arm-kernel
From: Ajay Kumar Gupta <ajay.gupta@ti.com>
AM35x has musb interface (version 1.8) and uses CPPI41 DMA engine.
It has USB phy built inside the IP itself.
Signed-off-by: Ajay Kumar Gupta <ajay.gupta@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-kernel at vger.kernel.org
Cc: linux-omap at vger.kernel.org
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
arch/arm/mach-omap2/board-am3517evm.c | 30 ++++++++++++++++++++++++++++++
arch/arm/mach-omap2/usb-musb.c | 4 ++++
arch/arm/plat-omap/include/plat/usb.h | 21 +++++++++++++++++++++
3 files changed, 55 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index 4d0f585..9ac9de6 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -375,6 +375,31 @@ static void __init am3517_evm_init_irq(void)
omap_gpio_init();
}
+static struct omap_musb_board_data musb_board_data = {
+ .interface_type = MUSB_INTERFACE_ULPI,
+ .mode = MUSB_OTG,
+ .power = 500,
+};
+
+static __init void am3517_evm_musb_init(void)
+{
+ u32 devconf2;
+
+ /*
+ * Set up USB clock/mode in the DEVCONF2 register.
+ */
+ devconf2 = omap_ctrl_readl(AM35XX_CONTROL_DEVCONF2);
+
+ /* USB2.0 PHY reference clock is 13 MHz */
+ devconf2 &= ~(CONF2_REFFREQ | CONF2_OTGMODE | CONF2_PHY_GPIOMODE);
+ devconf2 |= CONF2_REFFREQ_13MHZ | CONF2_SESENDEN | CONF2_VBDTCTEN
+ | CONF2_DATPOL;
+
+ omap_ctrl_writel(devconf2, AM35XX_CONTROL_DEVCONF2);
+
+ usb_musb_init(&musb_board_data);
+}
+
static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
#if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \
@@ -393,6 +418,8 @@ static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
#ifdef CONFIG_OMAP_MUX
static struct omap_board_mux board_mux[] __initdata = {
+ /* USB OTG DRVVBUS offset = 0x212 */
+ OMAP3_MUX(SAD2D_MCAD23, OMAP_MUX_MODE0 | OMAP_PIN_INPUT_PULLDOWN),
{ .reg_offset = OMAP_MUX_TERMINATOR },
};
#else
@@ -459,6 +486,9 @@ static void __init am3517_evm_init(void)
ARRAY_SIZE(am3517evm_i2c1_boardinfo));
/*Ethernet*/
am3517_evm_ethernet_init(&am3517_evm_emac_pdata);
+
+ /* MUSB */
+ am3517_evm_musb_init();
}
MACHINE_START(OMAP3517EVM, "OMAP3517/AM3517 EVM")
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index 33a5cde..7260558 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -28,6 +28,7 @@
#include <mach/hardware.h>
#include <mach/irqs.h>
+#include <mach/am35xx.h>
#include <plat/usb.h>
#ifdef CONFIG_USB_MUSB_SOC
@@ -89,6 +90,9 @@ void __init usb_musb_init(struct omap_musb_board_data *board_data)
{
if (cpu_is_omap243x()) {
musb_resources[0].start = OMAP243X_HS_BASE;
+ } else if (cpu_is_omap3517() || cpu_is_omap3505()) {
+ musb_resources[0].start = AM35XX_IPSS_USBOTGSS_BASE;
+ musb_resources[1].start = INT_35XX_USBOTG_IRQ;
} else if (cpu_is_omap34xx()) {
musb_resources[0].start = OMAP34XX_HSUSB_OTG_BASE;
} else if (cpu_is_omap44xx()) {
diff --git a/arch/arm/plat-omap/include/plat/usb.h b/arch/arm/plat-omap/include/plat/usb.h
index 2a9427c..9feddac 100644
--- a/arch/arm/plat-omap/include/plat/usb.h
+++ b/arch/arm/plat-omap/include/plat/usb.h
@@ -218,6 +218,27 @@ static inline omap2_usbfs_init(struct omap_usb_config *pdata)
# define USBT2TLL5PI (1 << 17)
# define USB0PUENACTLOI (1 << 16)
# define USBSTANDBYCTRL (1 << 15)
+/* AM35x */
+/* USB 2.0 PHY Control */
+#define CONF2_PHY_GPIOMODE (1 << 23)
+#define CONF2_OTGMODE (3 << 14)
+#define CONF2_NO_OVERRIDE (0 << 14)
+#define CONF2_FORCE_HOST (1 << 14)
+#define CONF2_FORCE_DEVICE (2 << 14)
+#define CONF2_FORCE_HOST_VBUS_LOW (3 << 14)
+#define CONF2_SESENDEN (1 << 13)
+#define CONF2_VBDTCTEN (1 << 12)
+#define CONF2_REFFREQ_24MHZ (2 << 8)
+#define CONF2_REFFREQ_26MHZ (7 << 8)
+#define CONF2_REFFREQ_13MHZ (6 << 8)
+#define CONF2_REFFREQ (0xf << 8)
+#define CONF2_PHYCLKGD (1 << 7)
+#define CONF2_VBUSSENSE (1 << 6)
+#define CONF2_PHY_PLLON (1 << 5)
+#define CONF2_RESET (1 << 4)
+#define CONF2_PHYPWRDN (1 << 3)
+#define CONF2_OTGPWRDN (1 << 2)
+#define CONF2_DATPOL (1 << 1)
#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_USB)
u32 omap1_usb0_init(unsigned nwires, unsigned is_device);
--
1.7.2
^ permalink raw reply related [flat|nested] 13+ messages in thread
* RE: [GIT PATCH] USB patches for .37-rc1
2010-10-22 17:51 [GIT PATCH] USB patches for .37-rc1 Greg KH
2010-10-22 17:57 ` Greg Kroah-Hartman
@ 2010-10-25 23:33 ` Nguyen Dinh-R00091
2010-10-28 18:15 ` Greg KH
1 sibling, 1 reply; 13+ messages in thread
From: Nguyen Dinh-R00091 @ 2010-10-25 23:33 UTC (permalink / raw)
To: Greg KH, matthieu.castet, stern
Cc: linux-kernel, linux-usb, Uwe Kleine-König
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 609 bytes --]
Hi Greg,
It seems that this commit is breaking ehci-mxc build for MX51.
USB: ehci tdi : let's tdi_reset set host mode
Commit # 65fd42724aee31018b0bb53f4cb04971423be664
>Matthew Garrett (1):
> USB: serial: Enable USB autosuspend by default on qcserial
>
The error is:
drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':
drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first use in this function)
Thanks,
Dinh Nguyen
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PATCH] USB patches for .37-rc1
2010-10-25 23:33 ` [GIT PATCH] USB patches for .37-rc1 Nguyen Dinh-R00091
@ 2010-10-28 18:15 ` Greg KH
2010-10-28 18:30 ` Uwe Kleine-König
2010-10-29 7:37 ` [PATCH] USB: ehci/mxc: compile fix Uwe Kleine-König
0 siblings, 2 replies; 13+ messages in thread
From: Greg KH @ 2010-10-28 18:15 UTC (permalink / raw)
To: Nguyen Dinh-R00091
Cc: Greg KH, matthieu.castet, stern, linux-kernel, linux-usb,
Uwe Kleine-König
On Mon, Oct 25, 2010 at 04:33:27PM -0700, Nguyen Dinh-R00091 wrote:
> Hi Greg,
>
> It seems that this commit is breaking ehci-mxc build for MX51.
>
> USB: ehci tdi : let's tdi_reset set host mode
> Commit # 65fd42724aee31018b0bb53f4cb04971423be664
>
> >Matthew Garrett (1):
> > USB: serial: Enable USB autosuspend by default on qcserial
> >
>
> The error is:
>
> drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':
> drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first use in this function)
Care to send a build fix for it?
thanks,
greg k-h
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [GIT PATCH] USB patches for .37-rc1
2010-10-28 18:15 ` Greg KH
@ 2010-10-28 18:30 ` Uwe Kleine-König
2010-10-29 7:37 ` [PATCH] USB: ehci/mxc: compile fix Uwe Kleine-König
1 sibling, 0 replies; 13+ messages in thread
From: Uwe Kleine-König @ 2010-10-28 18:30 UTC (permalink / raw)
To: Greg KH
Cc: Nguyen Dinh-R00091, Greg KH, matthieu.castet, stern,
linux-kernel, linux-usb
On Thu, Oct 28, 2010 at 11:15:19AM -0700, Greg KH wrote:
> On Mon, Oct 25, 2010 at 04:33:27PM -0700, Nguyen Dinh-R00091 wrote:
> > Hi Greg,
> >
> > It seems that this commit is breaking ehci-mxc build for MX51.
> >
> > USB: ehci tdi : let's tdi_reset set host mode
> > Commit # 65fd42724aee31018b0bb53f4cb04971423be664
> >
> > >Matthew Garrett (1):
> > > USB: serial: Enable USB autosuspend by default on qcserial
> > >
> >
> > The error is:
> >
> > drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':
> > drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first use in this function)
>
> Care to send a build fix for it?
I reported that issue, too:
http://thread.gmane.org/gmane.linux.usb.general/35817/focus=38096
it contains a patch that fixes the build but isn't confirmed to work,
yet.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] USB: ehci/mxc: compile fix
2010-10-28 18:15 ` Greg KH
2010-10-28 18:30 ` Uwe Kleine-König
@ 2010-10-29 7:37 ` Uwe Kleine-König
2010-10-29 14:06 ` Alan Stern
2010-11-01 12:29 ` Sergei Shtylyov
1 sibling, 2 replies; 13+ messages in thread
From: Uwe Kleine-König @ 2010-10-29 7:37 UTC (permalink / raw)
To: Greg KH
Cc: matthieu.castet, stern, linux-kernel, linux-usb, Nguyen Dinh-R00091
65fd42724aee31018b0bb53f4cb04971423be664 broke the build using
ARM's mx51_defconfig:
CC drivers/usb/host/ehci-hcd.o
In file included from drivers/usb/host/ehci-hcd.c:1166:
drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':
drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first use in this function)
drivers/usb/host/ehci-mxc.c:192: error: (Each undeclared identifier is reported only once
drivers/usb/host/ehci-mxc.c:192: error: for each function it appears in.)
drivers/usb/host/ehci-mxc.c:117: warning: unused variable 'temp'
make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1
make[2]: *** [drivers/usb/host/ehci-hcd.o] Error 2
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2
Fix it together with the warnung about the unused variable.
Tested-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/usb/host/ehci-mxc.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index ac9c4d7..70edb11 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -36,6 +36,8 @@ struct ehci_mxc_priv {
static int ehci_mxc_setup(struct usb_hcd *hcd)
{
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+ struct device *dev = hcd->self.controller;
+ struct mxc_usbh_platform_data *pdata = dev_get_platdata(dev);
int retval;
/* EHCI registers start at offset 0x100 */
@@ -64,6 +66,11 @@ static int ehci_mxc_setup(struct usb_hcd *hcd)
ehci_reset(ehci);
ehci_port_power(ehci, 0);
+
+ /* set up the PORTSCx register */
+ ehci_writel(ehci, pdata->portsc, &ehci->regs->port_status[0]);
+ mdelay(10);
+
return 0;
}
@@ -114,7 +121,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
struct usb_hcd *hcd;
struct resource *res;
- int irq, ret, temp;
+ int irq, ret;
struct ehci_mxc_priv *priv;
struct device *dev = &pdev->dev;
@@ -188,10 +195,6 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
clk_enable(priv->ahbclk);
}
- /* set up the PORTSCx register */
- ehci_writel(ehci, pdata->portsc, &ehci->regs->port_status[0]);
- mdelay(10);
-
/* setup specific usb hw */
ret = mxc_initialize_usb_hw(pdev->id, pdata->flags);
if (ret < 0)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH] USB: ehci/mxc: compile fix
2010-10-29 7:37 ` [PATCH] USB: ehci/mxc: compile fix Uwe Kleine-König
@ 2010-10-29 14:06 ` Alan Stern
2010-11-02 9:30 ` Uwe Kleine-König
2010-11-01 12:29 ` Sergei Shtylyov
1 sibling, 1 reply; 13+ messages in thread
From: Alan Stern @ 2010-10-29 14:06 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Greg KH, matthieu.castet, linux-kernel, linux-usb, Nguyen Dinh-R00091
On Fri, 29 Oct 2010, [UTF-8] Uwe Kleine-König wrote:
> 65fd42724aee31018b0bb53f4cb04971423be664 broke the build using
> ARM's mx51_defconfig:
>
> CC drivers/usb/host/ehci-hcd.o
> In file included from drivers/usb/host/ehci-hcd.c:1166:
> drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':
> drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first use in this function)
> drivers/usb/host/ehci-mxc.c:192: error: (Each undeclared identifier is reported only once
> drivers/usb/host/ehci-mxc.c:192: error: for each function it appears in.)
> drivers/usb/host/ehci-mxc.c:117: warning: unused variable 'temp'
> make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1
> make[2]: *** [drivers/usb/host/ehci-hcd.o] Error 2
> make[1]: *** [sub-make] Error 2
> make: *** [all] Error 2
>
> Fix it together with the warnung about the unused variable.
>
> Tested-by: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> drivers/usb/host/ehci-mxc.c | 13 ++++++++-----
> 1 files changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
> index ac9c4d7..70edb11 100644
> --- a/drivers/usb/host/ehci-mxc.c
> +++ b/drivers/usb/host/ehci-mxc.c
> @@ -36,6 +36,8 @@ struct ehci_mxc_priv {
> static int ehci_mxc_setup(struct usb_hcd *hcd)
> {
> struct ehci_hcd *ehci = hcd_to_ehci(hcd);
> + struct device *dev = hcd->self.controller;
> + struct mxc_usbh_platform_data *pdata = dev_get_platdata(dev);
> int retval;
>
> /* EHCI registers start at offset 0x100 */
> @@ -64,6 +66,11 @@ static int ehci_mxc_setup(struct usb_hcd *hcd)
> ehci_reset(ehci);
>
> ehci_port_power(ehci, 0);
> +
> + /* set up the PORTSCx register */
> + ehci_writel(ehci, pdata->portsc, &ehci->regs->port_status[0]);
> + mdelay(10);
This mdelay really should be changed to msleep. Also according to
Matthieu, in ehci-fsl this is done before the ehci_port_power() call,
not after, and there is no delay. I don't know if this makes any
difference.
Alan Stern
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] USB: ehci/mxc: compile fix
2010-10-29 7:37 ` [PATCH] USB: ehci/mxc: compile fix Uwe Kleine-König
2010-10-29 14:06 ` Alan Stern
@ 2010-11-01 12:29 ` Sergei Shtylyov
1 sibling, 0 replies; 13+ messages in thread
From: Sergei Shtylyov @ 2010-11-01 12:29 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Greg KH, matthieu.castet, stern, linux-kernel, linux-usb,
Nguyen Dinh-R00091
Hello.
On 29-10-2010 11:37, Uwe Kleine-König wrote:
> 65fd42724aee31018b0bb53f4cb04971423be664 broke the build using
Linus has asked people to also specify the commit short description in
parens after SHA1.
> ARM's mx51_defconfig:
> CC drivers/usb/host/ehci-hcd.o
> In file included from drivers/usb/host/ehci-hcd.c:1166:
> drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':
> drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first use in this function)
> drivers/usb/host/ehci-mxc.c:192: error: (Each undeclared identifier is reported only once
> drivers/usb/host/ehci-mxc.c:192: error: for each function it appears in.)
> drivers/usb/host/ehci-mxc.c:117: warning: unused variable 'temp'
> make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1
> make[2]: *** [drivers/usb/host/ehci-hcd.o] Error 2
> make[1]: *** [sub-make] Error 2
> make: *** [all] Error 2
> Fix it together with the warnung about the unused variable.
> Tested-by: Dinh Nguyen<Dinh.Nguyen@freescale.com>
> Signed-off-by: Uwe Kleine-König<u.kleine-koenig@pengutronix.de>
WBR, Sergei
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] USB: ehci/mxc: compile fix
2010-10-29 14:06 ` Alan Stern
@ 2010-11-02 9:30 ` Uwe Kleine-König
2010-11-02 14:05 ` Nguyen Dinh-R00091
0 siblings, 1 reply; 13+ messages in thread
From: Uwe Kleine-König @ 2010-11-02 9:30 UTC (permalink / raw)
To: Greg KH
Cc: kernel, Sergei Shtylyov, matthieu.castet, linux-kernel,
linux-usb, Nguyen Dinh, Dinh Nguyen, Alan Stern
Commit
65fd427 (USB: ehci tdi : let's tdi_reset set host mode)
broke the build using ARM's mx51_defconfig:
CC drivers/usb/host/ehci-hcd.o
In file included from drivers/usb/host/ehci-hcd.c:1166:
drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':
drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first use in this function)
drivers/usb/host/ehci-mxc.c:192: error: (Each undeclared identifier is reported only once
drivers/usb/host/ehci-mxc.c:192: error: for each function it appears in.)
drivers/usb/host/ehci-mxc.c:117: warning: unused variable 'temp'
make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1
make[2]: *** [drivers/usb/host/ehci-hcd.o] Error 2
make[1]: *** [sub-make] Error 2
make: *** [all] Error 2
Fix it together with the warning about the unused variable and use
msleep instead of mdelay as requested by Alan Stern.
Cc: Dinh Nguyen <Dinh.Nguyen@freescale.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Hello,
I currently have no hardware to test it, so I only verified it to
compile.
Dinh: I changed your Tested-by to Cc for the new patch, do you care to
retest?
Best regards
Uwe
---
drivers/usb/host/ehci-mxc.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index ac9c4d7..bce8505 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -36,6 +36,8 @@ struct ehci_mxc_priv {
static int ehci_mxc_setup(struct usb_hcd *hcd)
{
struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+ struct device *dev = hcd->self.controller;
+ struct mxc_usbh_platform_data *pdata = dev_get_platdata(dev);
int retval;
/* EHCI registers start at offset 0x100 */
@@ -63,6 +65,12 @@ static int ehci_mxc_setup(struct usb_hcd *hcd)
ehci_reset(ehci);
+ /* set up the PORTSCx register */
+ ehci_writel(ehci, pdata->portsc, &ehci->regs->port_status[0]);
+
+ /* is this really needed? */
+ msleep(10);
+
ehci_port_power(ehci, 0);
return 0;
}
@@ -114,7 +122,7 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
struct usb_hcd *hcd;
struct resource *res;
- int irq, ret, temp;
+ int irq, ret;
struct ehci_mxc_priv *priv;
struct device *dev = &pdev->dev;
@@ -188,10 +196,6 @@ static int ehci_mxc_drv_probe(struct platform_device *pdev)
clk_enable(priv->ahbclk);
}
- /* set up the PORTSCx register */
- ehci_writel(ehci, pdata->portsc, &ehci->regs->port_status[0]);
- mdelay(10);
-
/* setup specific usb hw */
ret = mxc_initialize_usb_hw(pdev->id, pdata->flags);
if (ret < 0)
--
1.7.2.3
^ permalink raw reply related [flat|nested] 13+ messages in thread
* RE: [PATCH] USB: ehci/mxc: compile fix
2010-11-02 9:30 ` Uwe Kleine-König
@ 2010-11-02 14:05 ` Nguyen Dinh-R00091
2010-11-04 10:28 ` Uwe Kleine-König
0 siblings, 1 reply; 13+ messages in thread
From: Nguyen Dinh-R00091 @ 2010-11-02 14:05 UTC (permalink / raw)
To: Uwe Kleine-König, Greg KH
Cc: kernel, Sergei Shtylyov, matthieu.castet, linux-kernel,
linux-usb, Alan Stern
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset="utf-8", Size: 3487 bytes --]
Hi Uwe,
> -----Original Message-----
> From: Uwe Kleine-König [mailto:u.kleine-koenig@pengutronix.de]
> Sent: Tuesday, November 02, 2010 4:31 AM
> To: Greg KH
> Cc: kernel@pengutronix.de; Sergei Shtylyov; matthieu.castet@parrot.com;
> linux-kernel@vger.kernel.org; linux-usb@vger.kernel.org; Nguyen Dinh-
> R00091; Nguyen Dinh-R00091; Alan Stern
> Subject: [PATCH] USB: ehci/mxc: compile fix
>
> Commit
> 65fd427 (USB: ehci tdi : let's tdi_reset set host mode)
>
> broke the build using ARM's mx51_defconfig:
>
> CC drivers/usb/host/ehci-hcd.o
> In file included from drivers/usb/host/ehci-hcd.c:1166:
> drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':
> drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first
> use in this function)
> drivers/usb/host/ehci-mxc.c:192: error: (Each undeclared identifier
> is reported only once
> drivers/usb/host/ehci-mxc.c:192: error: for each function it
> appears in.)
> drivers/usb/host/ehci-mxc.c:117: warning: unused variable 'temp'
> make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1
> make[2]: *** [drivers/usb/host/ehci-hcd.o] Error 2
> make[1]: *** [sub-make] Error 2
> make: *** [all] Error 2
>
> Fix it together with the warning about the unused variable and use
> msleep instead of mdelay as requested by Alan Stern.
>
> Cc: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> Cc: Alan Stern <stern@rowland.harvard.edu>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
> Hello,
>
> I currently have no hardware to test it, so I only verified it to
> compile.
>
> Dinh: I changed your Tested-by to Cc for the new patch, do you care to
> retest?
Retested - check!
>
> Best regards
> Uwe
> ---
> drivers/usb/host/ehci-mxc.c | 14 +++++++++-----
> 1 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
> index ac9c4d7..bce8505 100644
> --- a/drivers/usb/host/ehci-mxc.c
> +++ b/drivers/usb/host/ehci-mxc.c
> @@ -36,6 +36,8 @@ struct ehci_mxc_priv {
> static int ehci_mxc_setup(struct usb_hcd *hcd)
> {
> struct ehci_hcd *ehci = hcd_to_ehci(hcd);
> + struct device *dev = hcd->self.controller;
> + struct mxc_usbh_platform_data *pdata = dev_get_platdata(dev);
> int retval;
>
> /* EHCI registers start at offset 0x100 */
> @@ -63,6 +65,12 @@ static int ehci_mxc_setup(struct usb_hcd *hcd)
>
> ehci_reset(ehci);
>
> + /* set up the PORTSCx register */
> + ehci_writel(ehci, pdata->portsc, &ehci->regs->port_status[0]);
> +
> + /* is this really needed? */
> + msleep(10);
> +
> ehci_port_power(ehci, 0);
> return 0;
> }
> @@ -114,7 +122,7 @@ static int ehci_mxc_drv_probe(struct platform_device
> *pdev)
> struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
> struct usb_hcd *hcd;
> struct resource *res;
> - int irq, ret, temp;
> + int irq, ret;
> struct ehci_mxc_priv *priv;
> struct device *dev = &pdev->dev;
>
> @@ -188,10 +196,6 @@ static int ehci_mxc_drv_probe(struct platform_device
> *pdev)
> clk_enable(priv->ahbclk);
> }
>
> - /* set up the PORTSCx register */
> - ehci_writel(ehci, pdata->portsc, &ehci->regs->port_status[0]);
> - mdelay(10);
> -
> /* setup specific usb hw */
> ret = mxc_initialize_usb_hw(pdev->id, pdata->flags);
> if (ret < 0)
> --
> 1.7.2.3
>
ÿôèº{.nÇ+‰·Ÿ®‰†+%ŠËÿ±éݶ\x17¥Šwÿº{.nÇ+‰·¥Š{±þG«éÿŠ{ayº\x1dʇڙë,j\a¢f£¢·hšïêÿ‘êçz_è®\x03(階ŠÝ¢j"ú\x1a¶^[m§ÿÿ¾\a«þG«éÿ¢¸?™¨èÚ&£ø§~á¶iO•æ¬z·švØ^\x14\x04\x1a¶^[m§ÿÿÃ\fÿ¶ìÿ¢¸?–I¥
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] USB: ehci/mxc: compile fix
2010-11-02 14:05 ` Nguyen Dinh-R00091
@ 2010-11-04 10:28 ` Uwe Kleine-König
2010-11-04 13:19 ` Greg KH
0 siblings, 1 reply; 13+ messages in thread
From: Uwe Kleine-König @ 2010-11-04 10:28 UTC (permalink / raw)
To: Greg KH
Cc: kernel, Sergei Shtylyov, matthieu.castet, linux-kernel,
linux-usb, Alan Stern, Nguyen Dinh-R00091
Hi Greg,
On Tue, Nov 02, 2010 at 07:05:27AM -0700, Nguyen Dinh-R00091 wrote:
> Hi Uwe,
>
> > -----Original Message-----
> > From: Uwe Kleine-König [mailto:u.kleine-koenig@pengutronix.de]
> > Sent: Tuesday, November 02, 2010 4:31 AM
> > To: Greg KH
> > Cc: kernel@pengutronix.de; Sergei Shtylyov; matthieu.castet@parrot.com;
> > linux-kernel@vger.kernel.org; linux-usb@vger.kernel.org; Nguyen Dinh-
> > R00091; Nguyen Dinh-R00091; Alan Stern
> > Subject: [PATCH] USB: ehci/mxc: compile fix
> >
> > Commit
> > 65fd427 (USB: ehci tdi : let's tdi_reset set host mode)
> >
> > broke the build using ARM's mx51_defconfig:
> >
> > CC drivers/usb/host/ehci-hcd.o
> > In file included from drivers/usb/host/ehci-hcd.c:1166:
> > drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':
> > drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first
> > use in this function)
> > drivers/usb/host/ehci-mxc.c:192: error: (Each undeclared identifier
> > is reported only once
> > drivers/usb/host/ehci-mxc.c:192: error: for each function it
> > appears in.)
> > drivers/usb/host/ehci-mxc.c:117: warning: unused variable 'temp'
> > make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1
> > make[2]: *** [drivers/usb/host/ehci-hcd.o] Error 2
> > make[1]: *** [sub-make] Error 2
> > make: *** [all] Error 2
> >
> > Fix it together with the warning about the unused variable and use
> > msleep instead of mdelay as requested by Alan Stern.
> >
> > Cc: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> > Cc: Alan Stern <stern@rowland.harvard.edu>
> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> > ---
> > Hello,
> >
> > I currently have no hardware to test it, so I only verified it to
> > compile.
> >
> > Dinh: I changed your Tested-by to Cc for the new patch, do you care to
> > retest?
>
> Retested - check!
Do you take this patch and "USB: Fix FSL USB driver on non Open Firmware
systems"?
Just drop me a note if you need them resent.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] USB: ehci/mxc: compile fix
2010-11-04 10:28 ` Uwe Kleine-König
@ 2010-11-04 13:19 ` Greg KH
0 siblings, 0 replies; 13+ messages in thread
From: Greg KH @ 2010-11-04 13:19 UTC (permalink / raw)
To: Uwe Kleine-K?nig
Cc: kernel, Sergei Shtylyov, matthieu.castet, linux-kernel,
linux-usb, Alan Stern, Nguyen Dinh-R00091
On Thu, Nov 04, 2010 at 11:28:18AM +0100, Uwe Kleine-K?nig wrote:
> Hi Greg,
>
> On Tue, Nov 02, 2010 at 07:05:27AM -0700, Nguyen Dinh-R00091 wrote:
> > Hi Uwe,
> >
> > > -----Original Message-----
> > > From: Uwe Kleine-K?nig [mailto:u.kleine-koenig@pengutronix.de]
> > > Sent: Tuesday, November 02, 2010 4:31 AM
> > > To: Greg KH
> > > Cc: kernel@pengutronix.de; Sergei Shtylyov; matthieu.castet@parrot.com;
> > > linux-kernel@vger.kernel.org; linux-usb@vger.kernel.org; Nguyen Dinh-
> > > R00091; Nguyen Dinh-R00091; Alan Stern
> > > Subject: [PATCH] USB: ehci/mxc: compile fix
> > >
> > > Commit
> > > 65fd427 (USB: ehci tdi : let's tdi_reset set host mode)
> > >
> > > broke the build using ARM's mx51_defconfig:
> > >
> > > CC drivers/usb/host/ehci-hcd.o
> > > In file included from drivers/usb/host/ehci-hcd.c:1166:
> > > drivers/usb/host/ehci-mxc.c: In function 'ehci_mxc_drv_probe':
> > > drivers/usb/host/ehci-mxc.c:192: error: 'ehci' undeclared (first
> > > use in this function)
> > > drivers/usb/host/ehci-mxc.c:192: error: (Each undeclared identifier
> > > is reported only once
> > > drivers/usb/host/ehci-mxc.c:192: error: for each function it
> > > appears in.)
> > > drivers/usb/host/ehci-mxc.c:117: warning: unused variable 'temp'
> > > make[3]: *** [drivers/usb/host/ehci-hcd.o] Error 1
> > > make[2]: *** [drivers/usb/host/ehci-hcd.o] Error 2
> > > make[1]: *** [sub-make] Error 2
> > > make: *** [all] Error 2
> > >
> > > Fix it together with the warning about the unused variable and use
> > > msleep instead of mdelay as requested by Alan Stern.
> > >
> > > Cc: Dinh Nguyen <Dinh.Nguyen@freescale.com>
> > > Cc: Alan Stern <stern@rowland.harvard.edu>
> > > Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> > > ---
> > > Hello,
> > >
> > > I currently have no hardware to test it, so I only verified it to
> > > compile.
> > >
> > > Dinh: I changed your Tested-by to Cc for the new patch, do you care to
> > > retest?
> >
> > Retested - check!
> Do you take this patch and "USB: Fix FSL USB driver on non Open Firmware
> systems"?
Not yet, I'm at the Plumbers conference and have had limited time to be
committing patches at the moment. It's in my to-apply queue, so don't
worry, it's not lost.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2010-11-04 13:27 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-10-22 17:51 [GIT PATCH] USB patches for .37-rc1 Greg KH
2010-10-22 17:57 ` [PATCH 132/141] USB: AM35x: Add musb support Greg Kroah-Hartman
2010-10-22 17:57 ` Greg Kroah-Hartman
2010-10-25 23:33 ` [GIT PATCH] USB patches for .37-rc1 Nguyen Dinh-R00091
2010-10-28 18:15 ` Greg KH
2010-10-28 18:30 ` Uwe Kleine-König
2010-10-29 7:37 ` [PATCH] USB: ehci/mxc: compile fix Uwe Kleine-König
2010-10-29 14:06 ` Alan Stern
2010-11-02 9:30 ` Uwe Kleine-König
2010-11-02 14:05 ` Nguyen Dinh-R00091
2010-11-04 10:28 ` Uwe Kleine-König
2010-11-04 13:19 ` Greg KH
2010-11-01 12:29 ` Sergei Shtylyov
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.