On Tue, Apr 11, 2017 at 11:13:55AM +0300, Felipe Balbi wrote:
>
> Hi Greg,
>
> here's my pull request for v4.12 merge window. Changes have been tested
> for Intel Edison where applicable. They have also been soaking for
> linux-next for a while. Let me know if you want anything to be changed.
>
> There will be a conflict on
> drivers/usb/gadget/udc/{Kconfig,amd5536udc.c} which I solved like this:
>
> diff --cc drivers/usb/gadget/udc/Kconfig
> index c6cc9d3270ac,c90a4a223916..1c14c283cc47
> --- a/drivers/usb/gadget/udc/Kconfig
> +++ b/drivers/usb/gadget/udc/Kconfig
> @@@ -277,7 -293,8 +293,8 @@@ source "drivers/usb/gadget/udc/bdc/Kcon
>
> config USB_AMD5536UDC
> tristate "AMD5536 UDC"
> - depends on PCI
> + depends on USB_PCI
> + select USB_SNP_CORE
> help
> The AMD5536 UDC is part of the AMD Geode CS5536, an x86 southbridge.
> It is a USB Highspeed DMA capable USB device controller. Beside ep0
> diff --cc drivers/usb/gadget/udc/amd5536udc.c
> index 270876b438ab,91d0f1a4dac1..4ecd2f20ea48
> --- a/drivers/usb/gadget/udc/amd5536udc.c
> +++ b/drivers/usb/gadget/udc/amd5536udc.c
> @@@ -618,17 -579,12 +579,12 @@@ static void udc_free_dma_chain(struct u
> DBG(dev, "free chain req = %p\n", req);
>
> /* do not free first desc., will be done by free for request */
> - td_last = req->td_data;
> - td = phys_to_virt(td_last->next);
> -
> for (i = 1; i < req->chain_len; i++) {
> - dma_pool_free(dev->data_requests, td,
> - (dma_addr_t)td_last->next);
> - td_last = td;
> - td = phys_to_virt(td_last->next);
> + td = phys_to_virt(addr);
> + addr_next = (dma_addr_t)td->next;
> - pci_pool_free(dev->data_requests, td, addr);
> ++ dma_pool_free(dev->data_requests, td, addr);
> + addr = addr_next;
> }
> -
> - return ret_val;
> }
>
> /* Frees request packet, called by gadget driver */
>
> Resulting tree still compiles fine, but I can't test. amd5536udc.c :-s
Thanks, I duplicated this merge, and pushed everything out now,
hopefully I got it right :)
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
