Hi,
On Wed, Jun 12, 2013 at 01:17:42PM -0700, Greg KH wrote:
> On Wed, Jun 12, 2013 at 07:12:23PM +0300, Felipe Balbi wrote:
> > Hi Greg,
> >
> > Here's my pull request for v3.11 merge window. It's rather
> > large. Let me know if you want any changes.
> >
> > cheers
> >
> > The following changes since commit e4aa937ec75df0eea0bee03bffa3303ad36c986b:
> >
> > Linux 3.10-rc3 (2013-05-26 16:00:47 -0700)
> >
> > are available in the git repository at:
> >
> > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git tags/usb-for-v3.11
> >
> > for you to fetch changes up to b4b1ceec0c3e87065787e7da4c8c3fd7549660b8:
> >
> > usb: dwc3: omap: Adds dwc3_omap_readl/writel wrappers (2013-06-12 18:11:51 +0300)
> >
> > ----------------------------------------------------------------
> > usb: patches for v3.11 merge window
> >
> > All function drivers are now converted to our new configfs-based
> > binding. Eventually this will help us getting rid of in-kernel
> > gadget drivers and only keep function drivers in the kernel.
> >
> > MUSB was taught that it needs to be built for host-only and
> > device-only modes too. We had this support long ago but it
> > involved a ridiculous amount of ifdefs. Now we have a much
> > cleaner approach.
> >
> > Samsung Exynos4 platform now implements HSIC support.
> >
> > We're introducing support for AB8540 and AB9540 PHYs.
> >
> > MUSB module reinsertion now works as expected, before we were
> > getting -EBUSY being returned by the resource checks done on
> > driver core.
> >
> > DWC3 now has minimum support for TI's AM437x series of SoCs.
> >
> > OMAP5 USB3 PHY learned one extra DPLL configuration values because
> > that PHY is reused in TI's DRA7xx devices.
> >
> > Users can now select a PHY without enabling the PHY layer first.
> >
> > We're introducing support for Faraday fotg210 UDCs.
> >
> > Last, but not least, the usual set of non-critical fixes and cleanups
> > ranging from usage of platform_{get,set}_drvdata to lock improvements.
> >
> > Signed-of-by: Felipe Balbi <balbi@xxxxxx>
> >
> > ----------------------------------------------------------------
> > Alexey Khoroshilov (1):
> > usb: gadget: r8a66597-udc: do not unlock unheld spinlock in r8a66597_sudmac_irq()
> >
> > Andrzej Pietrasiewicz (40):
> > usb: gadget: u_ether: convert into module
> > usb: gadget: rndis: convert into module
> > usb: gadget: u_ether: construct with default values and add setters/getters
> > usb: gadget: f_ncm: convert to new function interface with backward compatibility
> > usb: gadget: ncm: convert to new function interface
> > usb: gadget: f_ncm: remove compatibility layer
> > usb: gadget: f_ncm: use usb_gstrings_attach
> > usb: gadget: f_ncm: add configfs support
> > usb: gadget: add helpers for configfs support for USB Ethernet
> > usb: gadget: f_ecm: convert to new function interface with backward compatibility
> > usb: gadget: cdc2: convert to new interface of f_ecm
> > usb: gadget: f_ecm: use usb_gstrings_attach
> > usb: gadget: f_ecm: add configfs support
> > usb: gadget: f_obex: use usb_gstrings_attach
> > usb: gadget: nokia: convert to new interface of f_obex
> > usb: gadget: f_obex: remove compatibility layer
> > usb: gadget: phonet: move global dev variable to its user
> > usb: gadget: f_phonet: convert to new function interface with backward compatibility
> > usb: gadget: nokia: convert to new interface of f_phonet
> > usb: gadget: f_phonet: remove compatibility layer
> > usb: gadget: nokia: convert to new interface of f_ecm
> > usb: gadget: f_phonet: add configfs support
> > usb: gadget: u_ether: allow getting binary-form host address
> > usb: gadget: ether: convert to new interface of f_ecm
> > usb: gadget: f_eem: convert to new function interface with backward compatibility
> > usb: gadget: ether: convert to new interface of f_eem
> > usb: gadget: f_eem: remove compatibility layer
> > usb: gadget: f_eem: use usb_gstrings_attach
> > usb: gadget: f_eem: add configfs support
> > usb: gadget: multi: Remove unused include
> > usb: gadget: f_subset: convert to new function interface with backward compatibility
> > usb: gadget: ether: convert to new interface of f_subset
> > usb: gadget: f_subset: use usb_gstrings_attach
> > usb: gadget: f_subset: add configfs support
> > usb: gadget: f_rndis: convert to new function interface with backward compatibility
> > usb: gadget: ether: convert to new interface of f_rndis
> > usb: gadget: rndis: init & exit rndis at module load/unload
> > usb: gadget: f_rndis: use usb_gstrings_attach
> > usb: gadget: f_rndis: add configfs support
> > usb: gadget: f_mass_storage: fix default product name
> >
> > Daniel Mack (11):
> > usb: gadget: drop unused USB_GADGET_MUSB_HDRC
> > usb: musb: move function declarations to musb_{host,gadget}.h
> > usb: musb: factor some host-specific functions
> > usb: musb: gadget: remove hcd initialization
> > usb: musb: move musb_start to musb_virthub.c
> > usb: musb: factor out hcd initalization
> > usb: musb: add Kconfig options for HOST, GAGDET or DUAL_ROLE modes
> > usb: musb: add musb_host_setup() and musb_host_cleanup()
> > usb: musb: re-introduce musb->port_mode
> > usb: musb: use musb->port_mode
> > usb: musb: eliminate musb_to_hcd
> >
> > Dongjin Kim (1):
> > usb: phy: samsung: Add support HSIC on Exynos4X12
> >
> > Emil Goode (1):
> > usb: musb: use the new %pa format specifier for dma_addr_t
> >
> > Fabio Baltieri (7):
> > usb: musb: various cosmetic fixes on ux500 files
> > usb: phy: ab8500-usb: fix phy tuning value select logic
> > usb: phy: ab8500-usb: add platform_device_id table
> > usb: phy: ab8500-usb: move phy tuning values on separate functions
> > usb: phy: ab8500-usb: add flag bits to control driver features
> > usb: phy: ab8500-usb: add ab8540 support
> > usb: phy: ab8500-usb: add ab9540 support
> >
> > Felipe Balbi (4):
> > usb: musb: fix incorrect usage of resource pointer
> > usb: musb: remove 'ignore_disconnect' flag
> > Merge tag 'tegra-for-3.11-deps-for-usb' into next
> > usb: musb: host: fix build warning
> >
> > George Cherian (3):
> > usb: dwc3: omap: Adding am437x specific register map changes
> > usb: dwc3: omap: initialize the register offset values for omap5 and AM437x
> > usb: dwc3: omap: Adds dwc3_omap_readl/writel wrappers
> >
> > Jassi Brar (1):
> > USB: gadget: f_uac2: Fix broken prm to uac2 mapping
> >
> > Jingoo Han (1):
> > usb: gadget: use platform_{get,set}_drvdata()
> >
> > Kishon Vijay Abraham I (1):
> > usb: dwc3: omap: improve error handling of dwc3_omap_probe
> >
> > Laurent Pinchart (1):
> > usb: gadget: uvc: Remove unneeded endpoint descriptor fields initialization
> >
> > Mian Yousaf Kaukab (2):
> > usb: musb: enable ux500 host side dma support
> > usb: phy: ab8500-usb: add transceiver clock control
> >
> > Michael Grzeschik (1):
> > usb: gadget: uvc: Implement videobuf2 .wait_prepare and .wait_finish operations
> >
> > Roger Quadros (2):
> > usb: phy: make phy driver selection possible by controller drivers
> > usb: ehci-omap: select nop_usb_xceiv phy driver
> >
> > Ruchika Kharwar (1):
> > usb: phy: omap-usb3: updated dpll M,N values to support DRA7xx devices
> >
> > Sachin Kamat (3):
> > usb: gadget: mv_u3d_core: Remove redundant platform_set_drvdata()
> > usb: gadget: pxa27x_udc: Remove redundant platform_set_drvdata()
> > usb: phy: phy-nop: Remove redundant use of of_match_ptr
> >
> > Sakethram Bommisetti (1):
> > usb: phy: ab8500-usb: restart phy during probe
> >
> > Tomasz Figa (6):
> > usb: phy: samsung: Select common driver part implicitly
> > usb: phy: samsung: Use clk_get to get reference clock
> > usb: phy: samsung: Consolidate reference clock rate handling
> > usb: phy: samsung: Pass set_isolation callback through driver data
> > usb: phy: samsung: Pass enable/disable callbacks through driver data
> > usb: phy: samsung: Add support for USB 2.0 PHY on Exynos 4x12
> >
> > UCHINO Satoshi (1):
> > usb: gadget: f_mass_storage: add missing memory barrier for thread_wakeup_needed
> >
> > Venu Byravarasu (8):
> > ARM: tegra: finalize USB EHCI and PHY bindings
> > ARM: tegra: modify ULPI reset GPIO properties
> > ARM: tegra: update device trees for USB binding rework
> > usb: phy: tegra: Return correct error value provided by clk_get_sys
> > usb: phy: tegra: Get PHY mode using DT
> > usb: phy: tegra: get ULPI reset GPIO info using DT.
> > usb: phy: tegra: Add error handling & clean up.
> > usb: phy: registering Tegra USB PHY as platform driver
> >
> > Yijing Wang (1):
> > usb: dwc3: remove redundant D0 power state set
> >
> > Yuan-Hsin Chen (1):
> > usb: gadget: add Faraday fotg210_udc driver
> >
> > Documentation/ABI/testing/configfs-usb-gadget-eem | 14 +
> > .../ABI/testing/configfs-usb-gadget-phonet | 8 +
> > .../ABI/testing/configfs-usb-gadget-rndis | 14 +
> > .../ABI/testing/configfs-usb-gadget-subset | 14 +
> > .../bindings/usb/nvidia,tegra20-ehci.txt | 27 +-
> > .../bindings/usb/nvidia,tegra20-usb-phy.txt | 41 +-
> > arch/arm/boot/dts/tegra20-colibri-512.dtsi | 6 +-
> > arch/arm/boot/dts/tegra20-harmony.dts | 15 +-
> > arch/arm/boot/dts/tegra20-iris-512.dts | 9 +-
> > arch/arm/boot/dts/tegra20-paz00.dts | 15 +-
> > arch/arm/boot/dts/tegra20-seaboard.dts | 26 +-
> > arch/arm/boot/dts/tegra20-tamonten.dtsi | 4 +
> > arch/arm/boot/dts/tegra20-trimslice.dts | 25 +-
> > arch/arm/boot/dts/tegra20-ventana.dts | 15 +-
> > arch/arm/boot/dts/tegra20-whistler.dts | 28 +
> > arch/arm/boot/dts/tegra20.dtsi | 49 +-
> > drivers/usb/Makefile | 3 +-
> > drivers/usb/dwc3/dwc3-omap.c | 251 +++-
> > drivers/usb/dwc3/dwc3-pci.c | 1 -
> > drivers/usb/gadget/Kconfig | 114 +-
> > drivers/usb/gadget/Makefile | 16 +
> > drivers/usb/gadget/cdc2.c | 85 +-
> > drivers/usb/gadget/ether.c | 180 ++-
> > drivers/usb/gadget/f_ecm.c | 196 +++-
> > drivers/usb/gadget/f_eem.c | 195 +++-
> > drivers/usb/gadget/f_mass_storage.c | 6 +-
> > drivers/usb/gadget/f_ncm.c | 219 ++--
> > drivers/usb/gadget/f_obex.c | 75 +-
> > drivers/usb/gadget/f_phonet.c | 177 ++-
> > drivers/usb/gadget/f_rndis.c | 245 +++-
> > drivers/usb/gadget/f_subset.c | 180 ++-
> > drivers/usb/gadget/f_uac2.c | 20 +-
> > drivers/usb/gadget/f_uvc.c | 13 +-
> > drivers/usb/gadget/fotg210-udc.c | 1219 ++++++++++++++++++++
> > drivers/usb/gadget/fotg210.h | 253 ++++
> > drivers/usb/gadget/fsl_qe_udc.c | 4 +-
> > drivers/usb/gadget/fusb300_udc.c | 4 +-
> > drivers/usb/gadget/g_ffs.c | 18 +-
> > drivers/usb/gadget/m66592-udc.c | 4 +-
> > drivers/usb/gadget/multi.c | 18 +-
> > drivers/usb/gadget/mv_u3d_core.c | 5 +-
> > drivers/usb/gadget/ncm.c | 58 +-
> > drivers/usb/gadget/nokia.c | 235 ++--
> > drivers/usb/gadget/pxa27x_udc.c | 1 -
> > drivers/usb/gadget/r8a66597-udc.c | 8 +-
> > drivers/usb/gadget/rndis.c | 18 +
> > drivers/usb/gadget/rndis.h | 4 +-
> > drivers/usb/gadget/u_ecm.h | 36 +
> > drivers/usb/gadget/u_eem.h | 36 +
> > drivers/usb/gadget/u_ether.c | 232 +++-
> > drivers/usb/gadget/u_ether.h | 166 ++-
> > drivers/usb/gadget/u_ether_configfs.h | 164 +++
> > drivers/usb/gadget/u_gether.h | 36 +
> > drivers/usb/gadget/u_ncm.h | 36 +
> > drivers/usb/gadget/u_phonet.h | 14 +-
> > drivers/usb/gadget/u_rndis.h | 41 +
> > drivers/usb/gadget/uvc_queue.c | 16 +
> > drivers/usb/host/Kconfig | 5 +-
> > drivers/usb/host/ehci-tegra.c | 105 +-
> > drivers/usb/musb/Kconfig | 29 +
> > drivers/usb/musb/Makefile | 4 +-
> > drivers/usb/musb/blackfin.c | 18 +-
> > drivers/usb/musb/da8xx.c | 18 +-
> > drivers/usb/musb/davinci.c | 18 +-
> > drivers/usb/musb/musb_core.c | 137 +--
> > drivers/usb/musb/musb_core.h | 27 +-
> > drivers/usb/musb/musb_gadget.c | 10 -
> > drivers/usb/musb/musb_gadget.h | 38 +-
> > drivers/usb/musb/musb_host.c | 102 +-
> > drivers/usb/musb/musb_host.h | 57 +-
> > drivers/usb/musb/musb_virthub.c | 54 +-
> > drivers/usb/musb/omap2430.c | 20 +-
> > drivers/usb/musb/tusb6010.c | 18 +-
> > drivers/usb/musb/ux500.c | 18 +-
> > drivers/usb/musb/ux500_dma.c | 6 +-
> > drivers/usb/phy/Kconfig | 33 +-
> > drivers/usb/phy/phy-ab8500-usb.c | 846 ++++++++++++--
> > drivers/usb/phy/phy-nop.c | 2 +-
> > drivers/usb/phy/phy-omap-usb3.c | 7 +-
> > drivers/usb/phy/phy-samsung-usb.c | 159 +--
> > drivers/usb/phy/phy-samsung-usb.h | 24 +-
> > drivers/usb/phy/phy-samsung-usb2.c | 62 +-
> > drivers/usb/phy/phy-samsung-usb3.c | 23 +-
> > drivers/usb/phy/phy-tegra-usb.c | 318 +++--
> > include/linux/usb/tegra_usb_phy.h | 13 +-
> > 85 files changed, 5828 insertions(+), 1255 deletions(-)
> > create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-eem
> > create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-phonet
> > create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-rndis
> > create mode 100644 Documentation/ABI/testing/configfs-usb-gadget-subset
> > create mode 100644 drivers/usb/gadget/fotg210-udc.c
> > create mode 100644 drivers/usb/gadget/fotg210.h
> > create mode 100644 drivers/usb/gadget/u_ecm.h
> > create mode 100644 drivers/usb/gadget/u_eem.h
> > create mode 100644 drivers/usb/gadget/u_ether_configfs.h
> > create mode 100644 drivers/usb/gadget/u_gether.h
> > create mode 100644 drivers/usb/gadget/u_ncm.h
> > create mode 100644 drivers/usb/gadget/u_rndis.h
>
> My diffstat looks a little bit different, but that's probably because of
> the merge point.
>
> But, I get a build error with your tree pulled in, at the link point in
> time:
>
> ERROR: "usb_add_phy" [drivers/usb/phy/phy-samsung-usb3.ko] undefined!
> ERROR: "usb_remove_phy" [drivers/usb/phy/phy-samsung-usb3.ko] undefined!
> ERROR: "usb_add_phy" [drivers/usb/phy/phy-samsung-usb2.ko] undefined!
> ERROR: "usb_remove_phy" [drivers/usb/phy/phy-samsung-usb2.ko] undefined!
> ERROR: "usb_add_phy" [drivers/usb/phy/phy-rcar-usb.ko] undefined!
> ERROR: "usb_remove_phy" [drivers/usb/phy/phy-rcar-usb.ko] undefined!
> ERROR: "usb_remove_phy" [drivers/usb/phy/phy-omap-usb3.ko] undefined!
> ERROR: "usb_add_phy_dev" [drivers/usb/phy/phy-omap-usb3.ko] undefined!
> ERROR: "usb_add_phy_dev" [drivers/usb/phy/phy-nop.ko] undefined!
> ERROR: "usb_remove_phy" [drivers/usb/phy/phy-nop.ko] undefined!
> ERROR: "usb_add_phy_dev" [drivers/usb/phy/phy-isp1301.ko] undefined!
> ERROR: "usb_remove_phy" [drivers/usb/phy/phy-isp1301.ko] undefined!
> ERROR: "usb_add_phy" [drivers/usb/phy/phy-gpio-vbus-usb.ko] undefined!
> ERROR: "usb_remove_phy" [drivers/usb/phy/phy-gpio-vbus-usb.ko] undefined!
> ERROR: "usb_get_phy" [drivers/usb/musb/ux500.ko] undefined!
> ERROR: "usb_put_phy" [drivers/usb/musb/ux500.ko] undefined!
> ERROR: "usb_put_phy" [drivers/usb/gadget/pxa27x_udc.ko] undefined!
> ERROR: "usb_get_phy" [drivers/usb/gadget/pxa27x_udc.ko] undefined!
> ERROR: "devm_usb_get_phy" [drivers/usb/gadget/mv_udc.ko] undefined!
> ERROR: "devm_usb_get_phy" [drivers/usb/dwc3/dwc3.ko] undefined!
> ERROR: "devm_usb_get_phy_by_phandle" [drivers/usb/dwc3/dwc3.ko] undefined!
> ERROR: "usb_get_phy" [drivers/usb/chipidea/ci_hdrc.ko] undefined!
> ERROR: "usb_put_phy" [drivers/usb/chipidea/ci_hdrc.ko] undefined!
> ERROR: "usb_get_phy" [drivers/power/isp1704_charger.ko] undefined!
> ERROR: "usb_put_phy" [drivers/power/isp1704_charger.ko] undefined!
>
> Any ideas?
hmm... I think it was Roger's patches changing the way PHY layer is
enabled, do you mind if I drop that for now ? I would have to rebase,
but I guess it's a necessary evil at this point.
--
balbi
Attachment:
signature.asc
Description: Digital signature
