Hi,
On Tue, Aug 13, 2013 at 02:48:42PM -0500, Felipe Balbi wrote:
> On Tue, Aug 13, 2013 at 02:41:25PM -0500, Felipe Balbi wrote:
> > Hi Greg,
> >
> > Here's my pull request for v3.12 merge window. I know there are a bunch
> > of patches pending in the mailing list but I won't have time to fully
> > review them before merging so I decided that it's best to delay a merge
> > window than it is to cause a bunch of regressions.
> >
> > Oh yeah, the patches under arch/arm got Acked by Tony Lindgren.
> >
> > Let me know if you want any changes to the pull request.
>
> just now I saw the build failure Stephen reported. Please don't merge
> this in yet, I'll put a patch on top to fix the build failure.
now fixed, here's the pull updated pull request:
The following changes since commit 5ae90d8e467e625e447000cb4335c4db973b1095:
Linux 3.11-rc3 (2013-07-28 20:53:33 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/usb-for-v3.12
for you to fetch changes up to 8b841cb217fac676498de3dfe8fabe38b39cba4e:
usb: phy: am335x: include linux/err.h (2013-08-13 14:59:13 -0500)
----------------------------------------------------------------
usb: patches for v3.12 merge window
All patches here have been pending on linux-usb
and sitting in linux-next for a while now.
The biggest things in this tag are:
DWC3 learned proper usage of threaded IRQ
handlers and now we spend very little time
in hardirq context.
MUSB now has proper support for BeagleBone and
Beaglebone Black.
Tegra's USB support also got quite a bit of love
and is learning to use PHY layer and generic DT
attributes.
Other than that, the usual pack of cleanups and
non-critical fixes follow.
Signed-of-by: Felipe Balbi <balbi@xxxxxx>
----------------------------------------------------------------
Alexey Khoroshilov (1):
usb: gadget: amd5536udc: unconditionally use GFP_ATOMIC in udc_queue()
Boris BREZILLON (3):
usb: gadget: atmel_usba: prepare clk before calling enable
usb: gadget: at91_udc: add missing clk_put on fclk and iclk
usb: gadget: at91_udc: add usb_clk for transition to common clk framework
Fabio Estevam (1):
usb: phy: phy-mxs-usb: Check the return value from stmp_reset_block()
Felipe Balbi (28):
usb: dwc3: make glue layers selectable
usb: gadget: remove imx_udc
usb: dwc3: gadget: don't request IRQs in atomic
usb: dwc3: switch to GPL v2 only
usb: phy: protect against NULL phy pointers
usb: common: introduce of_usb_get_maximum_speed()
usb: dwc3: let non-DT platforms pass tx-fifo-resize flag;
usb: dwc3: make maximum-speed a per-instance attribute
usb: dwc3: core: switch to snps,dwc3
usb: dwc3: gadget: drop dwc3 manual phy control
usb: dwc3: omap: switch over to devm_ioremap_resource()
usb: dwc3: core: switch over to devm_ioremap_resource()
usb: dwc3: gadget: move debugging print around
usb: dwc3: gadget: move direction setting up
usb: dwc3: gadget: add a debugging print when initializing endpoints
usb: dwc3: core: don't redefine DWC3_DCFG_LPM_CAP
usb: dwc3: gadget: don't enable LPM early
usb: dwc3: core: introduce and use macros for Event Size register
usb: dwc3: gadget: get rid of IRQF_ONESHOT
usb: dwc3: gadget: rename dwc3_process_event_buf
usb: dwc3: gadget: introduce dwc3_process_event_buf
usb: gadget: udc-core: move sysfs_notify() to a workqueue
usb: dwc3: ep0: only change to ADDRESS if set_config() succeeds
usb: dwc3: ep0: don't change to configured state too early
usb: of: fix build breakage caused by recent patches
usb: dwc3: use dev_get_platdata()
Merge branch 'nop-phy-rename' into next
usb: musb: dsps: make it depend on OF_IRQ
Greg Kroah-Hartman (1):
usb: musb: get rid of unused proc_dir_entry
Huang Rui (2):
usb: dwc3: clean up redundant parameter comment
usb: dwc3: fix typo in comment of dwc3_ep
Ivan T. Ivanov (1):
usb: dwc3: core: modify IO memory resource after deferred probe completes
Jingoo Han (13):
usb: gadget: use dev_get_platdata()
usb: phy: use dev_get_platdata()
usb: musb: use dev_get_platdata()
usb: renesas: use dev_get_platdata()
usb: dwc3: pci: add CONFIG_PM_SLEEP to suspend/resume functions
usb: gadget: goku_udc: use NULL instead of 0
usb: gadget: fusb300_udc: Staticize fusb300_rdcxf()
usb: gadget: f_mass_storage: use NULL instead of 0
usb: gadget: rndis: Staticize rndis_init()/rndis_exit()
usb: gadget: u_uac1: add __user annotation
usb: gadget: f_uac1: Staticize local functions
usb: phy: mv-u3d: Staticize mv_u3d_phy_shutdown()
usb: phy: mv-usb: remove incorrect __exit_p annotation
Kumar Gala (1):
usb: dwc3: core: clarify usb-phy array binding
Kuninori Morimoto (1):
usb: renesas_usbhs: tidyup original usbhsx_for_each_xxx macro
Laurent Pinchart (1):
usb: gadget: uvc: Fix error handling in uvc_queue_buffer()
Mikko Perttunen (6):
arm: dts: tegra20: Rename USB UTMI parameters according to new definitions
usb: phy: tegra: Read UTMIP parameters from device tree
usb: tegra: Use regulators instead of GPIOs for USB PHY VBUS
usb: tegra: Add vbus-supply property for host mode PHYs
arm: tegra: Remove obsolete nvidia,vbus-gpio properties
usb: tegra: Fix typo in tegra20-usb-phy documentation
Roger Quadros (3):
usb: phy: make PHY driver selection possible by controller drivers
usb: ehci-omap: select NOP_USB_XCEIV PHY driver
usb: phy: omap-usb3: Improve DPLL parameter lookup code
Ruchika Kharwar (1):
usb: dwc3: adapt to use dr_mode device tree helper
Sebastian Andrzej Siewior (21):
usb: musb: replace ifndef with ifdef for CONFIG_MUSB_PIO_ONLY
usb: musb: musbhsdma: drop the controller check in dma_controller_destroy()
usb: musb: dma: merge ->start/stop into create/destroy
usb: musb: provide empty dma_controller_create() in PIO mode
usb: musb: remove a few is_dma_capable() in init/exit code
usb: musb: core: call dma_controller_destroy() in the err path
usb: musb: unmap reqs in musb_gadget_queue()'s error case
usb: musb: dsps: init / shutdown the phy
usb: musb: remove ti81xx pieces from musb
usb: musb: do not change dev's dma_mask
usb: musb: dsps: rename ti81xx_driver_data to am33xx_driver_data
usb: musb: dsps: remove EOI access
usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv
usb: phy: phy-generic: export init functions
usb: phy: Add AM335x PHY driver
usb: musb: dsps: remove the hardcoded phy pieces
usb: musb: dsps: use proper child nodes
usb: musb dma: add cppi41 dma driver
usb: musb: Use is_cppi_enabled() and tusb_dma_omap() instead of the ifdef
usb: musb: cppi41: Enable in device-TX mode
usb: phy: am335x: include linux/err.h
Tomasz Figa (1):
usb: gadget: s3c-hsotg: Allow driver instantiation using device tree
Tuomas Tynkkynen (16):
usb: phy: tegra: Remove unnecessary 'dev' field
usb: host: tegra: Remove leftover code
usb: tegra: host: Remove references to plat data
ARM: tegra: Remove USB platform data
usb: phy: tegra: Register as an USB PHY.
usb: host: tegra: Locate a PHY via standard API
usb: phy: tegra: Remove custom PHY locating APIs
usb: phy: tegra: Use DT helpers for phy_type
usb: phy: tegra: Use DT helpers for dr_mode
usb: phy: tegra: Use switch instead of if-else
usb: host: add has_tdi_phy_lpm capability bit
usb: phy: tegra: Fix wrong PHY parameters
usb: phy: tegra: Tegra30 support
Documentation: New DT parameters for tegra30-usb-phy
usb: phy: tegra: Program new PHY parameters
usb: host: tegra: Tegra30 support
Wolfram Sang (1):
usb: phy: don't check resource with devm_ioremap_resource
Documentation/devicetree/bindings/usb/dwc3.txt | 8 +-
Documentation/devicetree/bindings/usb/generic.txt | 24 +
.../bindings/usb/nvidia,tegra20-usb-phy.txt | 17 +-
.../devicetree/bindings/usb/samsung-hsotg.txt | 40 +
arch/arm/boot/dts/am335x-bone.dts | 16 +
arch/arm/boot/dts/am335x-evm.dts | 28 +
arch/arm/boot/dts/am335x-evmsk.dts | 16 +
arch/arm/boot/dts/am33xx.dtsi | 158 +-
arch/arm/boot/dts/omap5.dtsi | 2 +-
arch/arm/boot/dts/tegra20-seaboard.dts | 1 -
arch/arm/boot/dts/tegra20-trimslice.dts | 1 -
arch/arm/boot/dts/tegra20-whistler.dts | 2 -
arch/arm/boot/dts/tegra20.dtsi | 28 +-
arch/arm/mach-omap2/board-omap3beagle.c | 4 +-
arch/arm/mach-omap2/board-omap3evm.c | 4 +-
arch/arm/mach-omap2/board-omap3pandora.c | 2 +-
arch/arm/mach-omap2/usb-host.c | 10 +-
arch/arm/mach-tegra/tegra.c | 38 +-
drivers/dma/Kconfig | 8 +
drivers/dma/Makefile | 1 +
drivers/dma/cppi41.c | 1048 +++++++++++++
drivers/usb/Makefile | 2 +-
drivers/usb/chipidea/host.c | 1 +
drivers/usb/dwc3/Kconfig | 32 +
drivers/usb/dwc3/Makefile | 13 +-
drivers/usb/dwc3/core.c | 193 ++-
drivers/usb/dwc3/core.h | 53 +-
drivers/usb/dwc3/debug.h | 34 +-
drivers/usb/dwc3/debugfs.c | 34 +-
drivers/usb/dwc3/dwc3-exynos.c | 22 +-
drivers/usb/dwc3/dwc3-omap.c | 44 +-
drivers/usb/dwc3/dwc3-pci.c | 54 +-
drivers/usb/dwc3/ep0.c | 49 +-
drivers/usb/dwc3/gadget.c | 257 ++--
drivers/usb/dwc3/gadget.h | 34 +-
drivers/usb/dwc3/host.c | 34 +-
drivers/usb/dwc3/io.h | 34 +-
drivers/usb/dwc3/platform_data.h | 27 +
drivers/usb/gadget/Kconfig | 17 -
drivers/usb/gadget/Makefile | 1 -
drivers/usb/gadget/amd5536udc.c | 4 +-
drivers/usb/gadget/at91_udc.c | 25 +-
drivers/usb/gadget/at91_udc.h | 2 +-
drivers/usb/gadget/atmel_usba_udc.c | 30 +-
drivers/usb/gadget/bcm63xx_udc.c | 2 +-
drivers/usb/gadget/f_mass_storage.c | 6 +-
drivers/usb/gadget/f_uac1.c | 4 +-
drivers/usb/gadget/fsl_mxc_udc.c | 4 +-
drivers/usb/gadget/fsl_udc_core.c | 6 +-
drivers/usb/gadget/fusb300_udc.c | 2 +-
drivers/usb/gadget/goku_udc.c | 2 +-
drivers/usb/gadget/hid.c | 2 +-
drivers/usb/gadget/imx_udc.c | 1544 --------------------
drivers/usb/gadget/imx_udc.h | 351 -----
drivers/usb/gadget/m66592-udc.c | 4 +-
drivers/usb/gadget/mv_u3d_core.c | 12 +-
drivers/usb/gadget/mv_udc_core.c | 4 +-
drivers/usb/gadget/omap_udc.c | 2 +-
drivers/usb/gadget/pxa25x_udc.c | 2 +-
drivers/usb/gadget/pxa27x_udc.c | 2 +-
drivers/usb/gadget/r8a66597-udc.c | 2 +-
drivers/usb/gadget/rndis.c | 4 +-
drivers/usb/gadget/s3c-hsotg.c | 14 +-
drivers/usb/gadget/s3c-hsudc.c | 4 +-
drivers/usb/gadget/s3c2410_udc.c | 2 +-
drivers/usb/gadget/u_uac1.c | 2 +-
drivers/usb/gadget/udc-core.c | 12 +-
drivers/usb/gadget/uvc_queue.c | 6 +-
drivers/usb/host/Kconfig | 5 +-
drivers/usb/host/ehci-hub.c | 14 +-
drivers/usb/host/ehci-tegra.c | 95 +-
drivers/usb/host/ehci.h | 1 +
drivers/usb/musb/Kconfig | 9 +
drivers/usb/musb/Makefile | 4 +
drivers/usb/musb/am35x.c | 16 +-
drivers/usb/musb/blackfin.c | 4 +-
drivers/usb/musb/cppi_dma.c | 18 +-
drivers/usb/musb/da8xx.c | 4 +-
drivers/usb/musb/davinci.c | 4 +-
drivers/usb/musb/musb_am335x.c | 55 +
drivers/usb/musb/musb_core.c | 30 +-
drivers/usb/musb/musb_core.h | 8 -
drivers/usb/musb/musb_cppi41.c | 555 +++++++
drivers/usb/musb/musb_dma.h | 21 +-
drivers/usb/musb/musb_dsps.c | 382 ++---
drivers/usb/musb/musb_gadget.c | 87 +-
drivers/usb/musb/musbhsdma.c | 17 +-
drivers/usb/musb/omap2430.c | 8 +-
drivers/usb/musb/tusb6010.c | 4 +-
drivers/usb/musb/tusb6010_omap.c | 24 -
drivers/usb/musb/ux500.c | 2 +-
drivers/usb/musb/ux500_dma.c | 21 +-
drivers/usb/phy/Kconfig | 48 +-
drivers/usb/phy/Makefile | 4 +-
drivers/usb/phy/am35x-phy-control.h | 21 +
drivers/usb/phy/phy-am335x-control.c | 137 ++
drivers/usb/phy/phy-am335x.c | 99 ++
drivers/usb/phy/phy-fsl-usb.c | 6 +-
drivers/usb/phy/{phy-nop.c => phy-generic.c} | 167 ++-
drivers/usb/phy/phy-generic.h | 20 +
drivers/usb/phy/phy-gpio-vbus-usb.c | 10 +-
drivers/usb/phy/phy-msm-usb.c | 4 +-
drivers/usb/phy/phy-mv-u3d-usb.c | 4 +-
drivers/usb/phy/phy-mv-usb.c | 6 +-
drivers/usb/phy/phy-mxs-usb.c | 13 +-
drivers/usb/phy/phy-omap-control.c | 3 +-
drivers/usb/phy/phy-omap-usb3.c | 87 +-
drivers/usb/phy/phy-rcar-usb.c | 9 +-
drivers/usb/phy/phy-samsung-usb2.c | 2 +-
drivers/usb/phy/phy-samsung-usb3.c | 2 +-
drivers/usb/phy/phy-tegra-usb.c | 460 ++++--
drivers/usb/phy/phy-twl4030-usb.c | 2 +-
drivers/usb/phy/phy-twl6030-usb.c | 2 +-
drivers/usb/renesas_usbhs/common.c | 4 +-
drivers/usb/renesas_usbhs/mod_gadget.c | 6 +-
drivers/usb/renesas_usbhs/mod_host.c | 6 +-
drivers/usb/renesas_usbhs/pipe.h | 6 +-
drivers/usb/usb-common.c | 49 +-
include/linux/platform_data/tegra_usb.h | 32 -
include/linux/usb/gadget.h | 4 +
include/linux/usb/of.h | 10 +-
include/linux/usb/phy.h | 18 +-
include/linux/usb/tegra_usb_phy.h | 40 +-
.../usb/{nop-usb-xceiv.h => usb_phy_gen_xceiv.h} | 4 +-
124 files changed, 3609 insertions(+), 3511 deletions(-)
create mode 100644 Documentation/devicetree/bindings/usb/generic.txt
create mode 100644 Documentation/devicetree/bindings/usb/samsung-hsotg.txt
create mode 100644 drivers/dma/cppi41.c
create mode 100644 drivers/usb/dwc3/platform_data.h
delete mode 100644 drivers/usb/gadget/imx_udc.c
delete mode 100644 drivers/usb/gadget/imx_udc.h
create mode 100644 drivers/usb/musb/musb_am335x.c
create mode 100644 drivers/usb/musb/musb_cppi41.c
create mode 100644 drivers/usb/phy/am35x-phy-control.h
create mode 100644 drivers/usb/phy/phy-am335x-control.c
create mode 100644 drivers/usb/phy/phy-am335x.c
rename drivers/usb/phy/{phy-nop.c => phy-generic.c} (66%)
create mode 100644 drivers/usb/phy/phy-generic.h
delete mode 100644 include/linux/platform_data/tegra_usb.h
rename include/linux/usb/{nop-usb-xceiv.h => usb_phy_gen_xceiv.h} (81%)
--
balbi
Attachment:
signature.asc
Description: Digital signature
