Hi,
On Mon, Dec 12, 2011 at 04:32:11PM -0800, Greg KH wrote:
> On Mon, Dec 12, 2011 at 04:27:06PM -0800, Kuninori Morimoto wrote:
> >
> > Hi Greg, Felipe
> >
> > > On Mon, Dec 12, 2011 at 12:59:30PM +0200, Felipe Balbi wrote:
> > > > Hi Greg,
> > > >
> > > > Here are the pending gadget patches for the next merge window. All have
> > > > been pending for quite a long time and they should all be fine.
> > > >
> > > > There is a small conflict on mod_host.c and the resolution is to remove
> > > > the pipe_info line.
> > > >
> > > > The following changes since commit dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50:
> > > >
> > > > Linux 3.2-rc5 (2011-12-09 15:09:32 -0800)
> > > >
> > > > are available in the git repository at:
> > > > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git for-next/gadget
> > >
> > > With this tree, I get the following build error:
> > >
> > > CC [M] drivers/usb/renesas_usbhs/mod_host.o
> > > drivers/usb/renesas_usbhs/mod_host.c: In function ‘usbhsh_irq_common’:
> > > drivers/usb/renesas_usbhs/mod_host.c:1401:10: error: ‘HCD_FLAG_SAW_IRQ’ undeclared (first use in this function)
> > > drivers/usb/renesas_usbhs/mod_host.c:1401:10: note: each undeclared identifier is reported only once for each function it appears in
> > > make[3]: *** [drivers/usb/renesas_usbhs/mod_host.o] Error 1
> > > make[2]: *** [drivers/usb/renesas_usbhs] Error 2
> > > make[1]: *** [drivers/usb] Error 2
> > > make: *** [drivers] Error 2
> > >
> > > So I can't take it.
> > >
> > > Please be more careful.
> >
> > I didn't know that HCD_FLAG_SAW_IRQ was removed in Greg's tree.
> > Then, please revert below commit from felipe's tree.
> > it is no longer needed
> > I hope it solve this issue
> >
> > --------------------
> > commit b7d9a738ac1065fe24a8a36519d5a29013361ff1
> > Author: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
> > Date: Thu Dec 8 18:26:53 2011 -0800
> >
> > usb: renesas_usbhs: care HCD_FLAG_SAW_IRQ bit on mod_host
> > --------------------
>
> Felipe, care to redo this branch so that this never happens at any place
> in the build?
Sure, I just dropped that patch. New pull request below if you need it:
The following changes since commit dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50:
Linux 3.2-rc5 (2011-12-09 15:09:32 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git for-next/gadget
Kuninori Morimoto (39):
usb: gadget: renesas_usbhs: remove usbhs_sys_hispeed_ctrl()
usb: gadget: renesas_usbhs: remove usbhs_sys_usb_ctrl()
usb: gadget: renesas_usbhs: tidyup usbhs_sys_clock_ctrl() was local function
usb: gadget: renesas_usbhs: tidyup mod_host request variable name
usb: gadget: renesas_usbhs: tidyup the unit of detection_delay
usb: gadget: renesas_usbhs: add platform power control function
usb: gadget: renesas_usbhs: unified callback function
usb: gadget: renesas_usbhs: drop dependency for mod_gadget
usb: gadget: renesas_usbhs: cleanup complicated ureq alloc/free
usb: gadget: renesas_usbhs: usbhsh_ureq_alloc/free() care urb->hcpriv
usb: gadget: renesas_usbhs: modify function name of usbhs_set_device_xx()
usb: gadget: renesas_usbhs: cleanup usbhs_endpoint_disable()
usb: gadget: renesas_usbhs: usbhs_set_device_config() care upphub/hubport
usb: gadget: renesas_usbhs: remove usbhsh_request list
usb: gadget: renesas_usbhs: check device0 status when alloc
usb: gadget: renesas_usbhs: adds spin lock area on mod_host
usb: gadget: renesas_usbhs: cleanup usbhsh_endpoint_xxx()
usb: gadget: renesas_usbhs: parameter cleanup for usbhsh_xx_queue_push()
usb: gadget: renesas_usbhs: parameter cleanup for usbhsh_endpoint_xx()
usb: gadget: renesas_usbhs: parameter cleanup for usbhsh_device_xx()
usb: renesas_usbhs: remove superfluous usbhs_lock from recip handler
usb: renesas_usbhs: add usbhs_pipe_is_stall()
usb: renesas_usbhs: add basic USB_REQ_SET_FEATURE support
usb: renesas_usbhs: add basic USB_REQ_GET_STATUS support
usb: renesas_usbhs: send packet in necessary timing.
usb: renesas_usbhs: call usbhsg_queue_pop() when pipe disable.
usb: renesas_usbhs: add test-mode support
usb: renesas_usbhs: remove the_controller_link
usb: renesas_usbhs: add lost error value when enqueue
usb: renesas_usbhs: pop packet when urb dequeued
usb: renesas_usbhs: modify device attach method
usb: renesas_usbhs: add usbhsh_endpoint_detach_all() for error case
usb: renesas_usbhs: add usbhs_pipe_attach() method
usb: renesas_usbhs: care pipe sequence
usb: renesas_usbhs: disable attch irq after device attached
usb: renesas_usbhs: add usbhsh_is_running()
usb: renesas_usbhs: care usb_hcd_giveback_urb() status
usb: renesas_usbhs: add force packet remove method
usb: renesas_usbhs: show error reason on usbhsh_urb_enqueu()
Marc Kleine-Budde (2):
USB: ci13xxx_udc: make suspend and resume in gadget driver optional
USB: ci13xxx_udc: handle controllers with less than 16 EPs
Michal Nazarewicz (2):
usb: gadget: replace usb_gadget::is_dualspeed with max_speed
usb: gadget: rename usb_gadget_driver::speed to max_speed
Neil Zhang (5):
usb: gadget: mv_udc: add otg relative code
usb: gadget: mv_udc: disable ISR when stopped
usb: gadget: mv_udc: refine the clock relative code
usb: gadget: mv_udc: refine suspend/resume function
usb: gadget: mv_udc: replace some debug info
Thomas Meyer (1):
usb: gadget: Use kcalloc instead of kzalloc to allocate array
Yuping Luo (1):
usb: gadget: mass_storage: support multi-luns with different logic block size
Documentation/feature-removal-schedule.txt | 14 +
drivers/usb/dwc3/gadget.c | 2 +-
drivers/usb/gadget/Kconfig | 1 -
drivers/usb/gadget/amd5536udc.c | 4 +-
drivers/usb/gadget/at91_udc.c | 2 +-
drivers/usb/gadget/atmel_usba_udc.c | 2 +-
drivers/usb/gadget/ci13xxx_udc.c | 36 +-
drivers/usb/gadget/ci13xxx_udc.h | 2 +-
drivers/usb/gadget/composite.c | 8 +-
drivers/usb/gadget/dbgp.c | 2 +-
drivers/usb/gadget/dummy_hcd.c | 15 +-
drivers/usb/gadget/epautoconf.c | 6 +-
drivers/usb/gadget/f_fs.c | 2 +-
drivers/usb/gadget/f_mass_storage.c | 60 +-
drivers/usb/gadget/file_storage.c | 64 ++-
drivers/usb/gadget/fsl_qe_udc.c | 4 +-
drivers/usb/gadget/fsl_udc_core.c | 4 +-
drivers/usb/gadget/fusb300_udc.c | 4 +-
drivers/usb/gadget/goku_udc.c | 3 +-
drivers/usb/gadget/imx_udc.c | 2 +-
drivers/usb/gadget/inode.c | 6 +-
drivers/usb/gadget/langwell_udc.c | 2 +-
drivers/usb/gadget/m66592-udc.c | 4 +-
drivers/usb/gadget/mv_udc.h | 5 +-
drivers/usb/gadget/mv_udc_core.c | 141 +++--
drivers/usb/gadget/net2272.c | 4 +-
drivers/usb/gadget/net2280.c | 4 +-
drivers/usb/gadget/omap_udc.c | 3 +-
drivers/usb/gadget/pch_udc.c | 4 +-
drivers/usb/gadget/printer.c | 6 +-
drivers/usb/gadget/pxa25x_udc.c | 2 +-
drivers/usb/gadget/pxa27x_udc.c | 2 +-
drivers/usb/gadget/r8a66597-udc.c | 4 +-
drivers/usb/gadget/s3c-hsotg.c | 4 +-
drivers/usb/gadget/s3c-hsudc.c | 4 +-
drivers/usb/gadget/s3c2410_udc.c | 4 +-
drivers/usb/gadget/udc-core.c | 26 +-
drivers/usb/musb/musb_gadget.c | 4 +-
drivers/usb/renesas_usbhs/common.c | 39 +-
drivers/usb/renesas_usbhs/common.h | 9 +-
drivers/usb/renesas_usbhs/fifo.c | 9 +-
drivers/usb/renesas_usbhs/fifo.h | 3 +-
drivers/usb/renesas_usbhs/mod.c | 4 +-
drivers/usb/renesas_usbhs/mod_gadget.c | 193 +++++-
drivers/usb/renesas_usbhs/mod_host.c | 953 +++++++++++++++++-----------
drivers/usb/renesas_usbhs/pipe.c | 28 +-
drivers/usb/renesas_usbhs/pipe.h | 1 +
include/linux/usb/gadget.h | 14 +-
include/linux/usb/renesas_usbhs.h | 10 +-
49 files changed, 1134 insertions(+), 595 deletions(-)
--
balbi
Attachment:
signature.asc
Description: Digital signature
