Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5c4ecdc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb into next 

Pull USB driver updates from Greg KH:
 "Here is the big USB driver pull request for 3.16-rc1.

  Nothing huge here, but lots of little things in the USB core, and in
  lots of drivers.  Hopefully the USB power management will be work
  better now that it has been reworked to do per-port power control
  dynamically.  There's also a raft of gadget driver updates and fixes,
  CONFIG_USB_DEBUG is finally gone now that everything has been
  converted over to the dynamic debug inteface, the last hold-out
  drivers were cleaned up and the config option removed.  There were
  also other minor things all through the drivers/usb/ tree, the
  shortlog shows this pretty well.

  All have been in linux-next, including the very last patch, which came
  from linux-next to fix a build issue on some platforms"

* tag 'usb-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (314 commits)
  usb: hub_handle_remote_wakeup() only exists for CONFIG_PM=y
  USB: orinoco_usb: remove CONFIG_USB_DEBUG support
  USB: media: lirc: igorplugusb: remove CONFIG_USB_DEBUG support
  USB: media: streamzap: remove CONFIG_USB_DEBUG
  USB: media: redrat3: remove CONFIG_USB_DEBUG usage
  USB: media: redrat3: remove unneeded tracing macro
  usb: qcserial: add additional Sierra Wireless QMI devices
  usb: host: max3421-hcd: Use module_spi_driver
  usb: host: max3421-hcd: Allow platform-data to specify Vbus polarity
  usb: host: max3421-hcd: fix "spi_rd8" uses dynamic stack allocation warning
  usb: host: max3421-hcd: Fix missing unlock in max3421_urb_enqueue()
  usb: qcserial: add Netgear AirCard 341U
  Documentation: dt-bindings: update xhci-platform DT binding for R-Car H2 and M2
  usb: host: xhci-plat: add xhci_plat_start()
  usb: host: max3421-hcd: Fix potential NULL urb dereference
  Revert "usb: gadget: net2280: Add support for PLX USB338X"
  USB: usbip: remove CONFIG_USB_DEBUG reference
  USB: remove CONFIG_USB_DEBUG from defconfig files
  usb: resume child device when port is powered on
  usb: hub_handle_remote_wakeup() depends on CONFIG_PM_RUNTIME=y
  ...
parents 49eb7b07 4a95b1fc

Documentation/ABI/testing/configfs-usb-gadget

+45 −0
Original line number Diff line number Diff line
@@ -62,6 +62,40 @@ KernelVersion: 3.11 
Description:

		This group contains functions available to this USB gadget.



What:		/config/usb-gadget/gadget/functions/<func>.<inst>/interface.<n>

Date:		May 2014

KernelVersion:	3.16

Description:

		This group contains "Feature Descriptors" specific for one

		gadget's USB interface or one interface group described

		by an IAD.



		The attributes:



		compatible_id		- 8-byte string for "Compatible ID"

		sub_compatible_id	- 8-byte string for "Sub Compatible ID"



What:		/config/usb-gadget/gadget/functions/<func>.<inst>/interface.<n>/<property>

Date:		May 2014

KernelVersion:	3.16

Description:

		This group contains "Extended Property Descriptors" specific for one

		gadget's USB interface or one interface group described

		by an IAD.



		The attributes:



		type		- value 1..7 for interpreting the data

				1: unicode string

				2: unicode string with environment variable

				3: binary

				4: little-endian 32-bit

				5: big-endian 32-bit

				6: unicode string with a symbolic link

				7: multiple unicode strings

		data		- blob of data to be interpreted depending on

				type



What:		/config/usb-gadget/gadget/strings

Date:		Jun 2013

KernelVersion:	3.11
@@ -79,3 +113,14 @@ Description: 
		product		- gadget's product description

		manufacturer	- gadget's manufacturer description



What:		/config/usb-gadget/gadget/os_desc

Date:		May 2014

KernelVersion:	3.16

Description:

		This group contains "OS String" extension handling attributes.



		use		- flag turning "OS Desctiptors" support on/off

		b_vendor_code	- one-byte value used for custom per-device and

				per-interface requests

		qw_sign		- an identifier to be reported as "OS String"

				proper

Documentation/ABI/testing/sysfs-platform-chipidea-usb-otg

0 → 100644
+56 −0
Original line number Diff line number Diff line 
What:		/sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_req

Date:		Feb 2014

Contact:	Li Jun <b47624@freescale.com>

Description:

		Can be set and read.

		Set a_bus_req(A-device bus request) input to be 1 if

		the application running on the A-device wants to use the bus,

		and to be 0 when the application no longer wants to use

		the bus(or wants to work as peripheral). a_bus_req can also

		be set to 1 by kernel in response to remote wakeup signaling

		from the B-device, the A-device should decide to resume the bus.



		Valid values are "1" and "0".



		Reading: returns 1 if the application running on the A-device

		is using the bus as host role, otherwise 0.



What:		/sys/bus/platform/devices/ci_hdrc.0/inputs/a_bus_drop

Date:		Feb 2014

Contact:	Li Jun <b47624@freescale.com>

Description:

		Can be set and read

		The a_bus_drop(A-device bus drop) input is 1 when the

		application running on the A-device wants to power down

		the bus, and is 0 otherwise, When a_bus_drop is 1, then

		the a_bus_req shall be 0.



		Valid values are "1" and "0".



		Reading: returns 1 if the bus is off(vbus is turned off) by

			 A-device, otherwise 0.



What:		/sys/bus/platform/devices/ci_hdrc.0/inputs/b_bus_req

Date:		Feb 2014

Contact:	Li Jun <b47624@freescale.com>

Description:

		Can be set and read.

		The b_bus_req(B-device bus request) input is 1 during the time

		that the application running on the B-device wants to use the

		bus as host, and is 0 when the application no longer wants to

		work as host and decides to switch back to be peripheral.



		Valid values are "1" and "0".



		Reading: returns if the application running on the B device

		is using the bus as host role, otherwise 0.



What:		/sys/bus/platform/devices/ci_hdrc.0/inputs/a_clr_err

Date:		Feb 2014

Contact:	Li Jun <b47624@freescale.com>

Description:

		Only can be set.

		The a_clr_err(A-device Vbus error clear) input is used to clear

		vbus error, then A-device will power down the bus.



		Valid value is "1"

Documentation/DocBook/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ DOCBOOKS := z8530book.xml device-drivers.xml \ 
	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \

	    80211.xml debugobjects.xml sh.xml regulator.xml \

	    alsa-driver-api.xml writing-an-alsa-driver.xml \

	    tracepoint.xml drm.xml media_api.xml w1.xml

	    tracepoint.xml drm.xml media_api.xml w1.xml \

	    writing_musb_glue_layer.xml



include Documentation/DocBook/media/Makefile

Documentation/DocBook/writing_musb_glue_layer.tmpl

0 → 100644
+873 −0

File added.

Preview size limit exceeded, changes collapsed.

Documentation/devicetree/bindings/phy/samsung-phy.txt

+47 −0
Original line number Diff line number Diff line
@@ -114,3 +114,50 @@ Example: 
		compatible = "samsung,exynos-sataphy-i2c";

		reg = <0x38>;

	};



Samsung Exynos5 SoC series USB DRD PHY controller

--------------------------------------------------



Required properties:

- compatible : Should be set to one of the following supported values:

	- "samsung,exynos5250-usbdrd-phy" - for exynos5250 SoC,

	- "samsung,exynos5420-usbdrd-phy" - for exynos5420 SoC.

- reg : Register offset and length of USB DRD PHY register set;

- clocks: Clock IDs array as required by the controller

- clock-names: names of clocks correseponding to IDs in the clock property;

	       Required clocks:

	- phy: main PHY clock (same as USB DRD controller i.e. DWC3 IP clock),

	       used for register access.

	- ref: PHY's reference clock (usually crystal clock), used for

	       PHY operations, associated by phy name. It is used to

	       determine bit values for clock settings register.

	       For Exynos5420 this is given as 'sclk_usbphy30' in CMU.

- samsung,pmu-syscon: phandle for PMU system controller interface, used to

		      control pmu registers for power isolation.

- #phy-cells : from the generic PHY bindings, must be 1;



For "samsung,exynos5250-usbdrd-phy" and "samsung,exynos5420-usbdrd-phy"

compatible PHYs, the second cell in the PHY specifier identifies the

PHY id, which is interpreted as follows:

  0 - UTMI+ type phy,

  1 - PIPE3 type phy,



Example:

	usbdrd_phy: usbphy@12100000 {

		compatible = "samsung,exynos5250-usbdrd-phy";

		reg = <0x12100000 0x100>;

		clocks = <&clock 286>, <&clock 1>;

		clock-names = "phy", "ref";

		samsung,pmu-syscon = <&pmu_system_controller>;

		#phy-cells = <1>;

	};



- aliases: For SoCs like Exynos5420 having multiple USB 3.0 DRD PHY controllers,

	   'usbdrd_phy' nodes should have numbered alias in the aliases node,

	   in the form of usbdrdphyN, N = 0, 1... (depending on number of

	   controllers).

Example:

	aliases {

		usbdrdphy0 = &usb3_phy0;

		usbdrdphy1 = &usb3_phy1;

	};