Skip to content
Snippets Groups Projects
Commit 63b06656 authored by Bruno Martins's avatar Bruno Martins
Browse files

Merge tag 'LA.VENDOR.13.2.0.r1-16100-KAILUA.0' of...

Merge tag 'LA.VENDOR.13.2.0.r1-16100-KAILUA.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/usb into HEAD

LA.VENDOR.13.2.0.r1-16100-KAILUA.0

* tag 'LA.VENDOR.13.2.0.r1-16100-KAILUA.0' of https://git.codelinaro.org/clo/la/platform/vendor/qcom-opensource/usb:
  USB: HAL: Add USB audio device bus reset recovery
  init.qcom.usb.rc: Extend UVC resolutions
  usb: Enable USB configurations for kona
  usb: Set ro property to determine usb parent node
  init.qti.usb.debug: Enable readl/writel ftraces of dwc3
  init.qcom.usb.rc: Add uvc declarations under a trigger in rc
  USB: HAL: Add AUDIO_ACCESSORY as one of the supported modes
  USB: HAL: handling readFile failure on device path
  init.qcom.usb: Set USB composition for monaco
  USB: Solving path traversal issue in USB HAL AppendNodeMapper
  UsbGadgetHal: Add null check in getCurrentUsbFunctions()
  usb: Enable USB configurations for monaco
  usb: Enable USB configurations for bengal
  init.qti.debug.sh: Add support to enable ftraces for xhci on usb
  init.qti.usb.debug.sh: Enable DWC3 core runtime resume/suspend ftrace
  Add minimal USB init RC for QMAA
  init.qcom.usb.rc: Move the usb init sequence from post-fs to post-fs-data
  UsbGadget: Change PID from 0x4ee7 to 0x4e11 for ADB only composition
  init.qti.usb.debug: add kprobe event for usb gadget configfs function
  USBGadgetHAL: Read supported compositions from file
  init.qcom.usb.sh: Include MSM Chip ID as part of product string
  init.qcom.usb.sh: Pass blank MSM serial number for virtual Android
  init.qcom.usb: Set default composition to 90DB for kalama
  USB HAL: Bind UDC to ConfigFS when re-added
  init.qcom.usb.rc: set UDC configuration for charger mode
  USB: set vendor.usb.controller value
  USB: Use software path for USB QDSS data transfer on kalama
  USB: Enable USBGadget HAL for kalama
  USB: Set sys.usb.mtp.batchcancel for targets using mtp over ffs

 Conflicts:
	etc/init.qcom.usb.rc
	etc/init.qcom.usb.sh
	etc/init.qti.usb.debug.sh
	hal/Usb.cpp
	hal/usb_compositions.conf
	vendor_product.mk

Change-Id: I29a42dcf58e0fa834bbb4881002b21d477055ae9
parents c3a8bb46 ebc15a88
Branches XOS-11.0
No related tags found
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment