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

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

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

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

  The usual set of gadget driver updates, phy driver updates, xhci
  updates, and typec additions. Also included in here are a lot of small
  cleanups and fixes and driver updates where needed.

  All of these have been in linux-next for a while with no reported
  issues"

* tag 'usb-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (167 commits)
  wusb: Remove unnecessary static function ckhdid_printf
  usb: core: make default autosuspend delay configurable
  usb: core: Fix typo in description of "authorized_default"
  usb: chipidea: Refactor USB PHY selection and keep a single PHY
  usb: chipidea: Grab the (legacy) USB PHY by phandle first
  usb: chipidea: imx: set power polarity
  dt-bindings: usb: ci-hdrc-usb2: add property power-active-high
  usb: chipidea: imx: remove unused header files
  usb: chipidea: tegra: Fix missed ci_hdrc_remove_device()
  usb: core: add option of only authorizing internal devices
  usb: typec: tps6598x: handle block writes separately with plain-I2C adapters
  usb: xhci: Fix for Enabling USB ROLE SWITCH QUIRK on INTEL_SUNRISEPOINT_LP_XHCI
  usb: xhci: fix build warning - missing prototype
  usb: xhci: dbc: Fixing typo error.
  usb: xhci: remove unused member 'parent' in xhci_regset struct
  xhci: tegra: Prevent error pointer dereference
  USB: serial: option: add Telit ME910 ECM composition
  usb: core: Replace hardcoded check with inline function from usb.h
  usb: core: skip interfaces disabled in devicetree
  usb: typec: mux: remove redundant check on variable match
  ...
parents 67e79a6d 1c7cf3d5

Documentation/ABI/testing/sysfs-bus-usb

+1 −1
Original line number Original line Diff line number Diff line
@@ -186,7 +186,7 @@ Contact: Lan Tianyu <tianyu.lan@intel.com> 
Description:

Description:

		Some platforms provide usb port connect types through ACPI.

		Some platforms provide usb port connect types through ACPI.

		This attribute is to expose these information to user space.

		This attribute is to expose these information to user space.

		The file will read "hotplug", "wired" and "not used" if the

		The file will read "hotplug", "hardwired" and "not used" if the

		information is available, and "unknown" otherwise.

		information is available, and "unknown" otherwise.





What:		/sys/bus/usb/devices/.../(hub interface)/portX/location

What:		/sys/bus/usb/devices/.../(hub interface)/portX/location

Documentation/admin-guide/kernel-parameters.txt

+2 −1
Original line number Original line Diff line number Diff line
@@ -4718,7 +4718,8 @@ 
	usbcore.authorized_default=

	usbcore.authorized_default=

			[USB] Default USB device authorization:

			[USB] Default USB device authorization:

			(default -1 = authorized except for wireless USB,

			(default -1 = authorized except for wireless USB,

			0 = not authorized, 1 = authorized)

			0 = not authorized, 1 = authorized, 2 = authorized

			if device connected to internal port)





	usbcore.autosuspend=

	usbcore.autosuspend=

			[USB] The autosuspend time delay (in seconds) used

			[USB] The autosuspend time delay (in seconds) used

Documentation/devicetree/bindings/arm/atmel-sysregs.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -147,6 +147,7 @@ required properties: 
- compatible: Should be "atmel,<chip>-sfr", "syscon" or

- compatible: Should be "atmel,<chip>-sfr", "syscon" or

	"atmel,<chip>-sfrbu", "syscon"

	"atmel,<chip>-sfrbu", "syscon"

  <chip> can be "sama5d3", "sama5d4" or "sama5d2".

  <chip> can be "sama5d3", "sama5d4" or "sama5d2".

  It also can be "microchip,sam9x60-sfr", "syscon".

- reg: Should contain registers location and length

- reg: Should contain registers location and length





	sfr@f0038000 {

	sfr@f0038000 {

Documentation/devicetree/bindings/display/bridge/cdns,dsi.txt

+0 −21
Original line number Original line Diff line number Diff line
@@ -31,28 +31,7 @@ Required subnodes: 
- one subnode per DSI device connected on the DSI bus. Each DSI device should

- one subnode per DSI device connected on the DSI bus. Each DSI device should

  contain a reg property encoding its virtual channel.

  contain a reg property encoding its virtual channel.





Cadence DPHY

============



Cadence DPHY block.



Required properties:

- compatible: should be set to "cdns,dphy".

- reg: physical base address and length of the DPHY registers.

- clocks: DPHY reference clocks.

- clock-names: must contain "psm" and "pll_ref".

- #phy-cells: must be set to 0.





Example:

Example:

	dphy0: dphy@fd0e0000{

		compatible = "cdns,dphy";

		reg = <0x0 0xfd0e0000 0x0 0x1000>;

		clocks = <&psm_clk>, <&pll_ref_clk>;

		clock-names = "psm", "pll_ref";

		#phy-cells = <0>;

	};



	dsi0: dsi@fd0c0000 {

	dsi0: dsi@fd0c0000 {

		compatible = "cdns,dsi";

		compatible = "cdns,dsi";

		reg = <0x0 0xfd0c0000 0x0 0x1000>;

		reg = <0x0 0xfd0c0000 0x0 0x1000>;

Documentation/devicetree/bindings/phy/cdns,dphy.txt

0 → 100644
+20 −0
Original line number Original line Diff line number Diff line 
Cadence DPHY

============



Cadence DPHY block.



Required properties:

- compatible: should be set to "cdns,dphy".

- reg: physical base address and length of the DPHY registers.

- clocks: DPHY reference clocks.

- clock-names: must contain "psm" and "pll_ref".

- #phy-cells: must be set to 0.



Example:

	dphy0: dphy@fd0e0000{

		compatible = "cdns,dphy";

		reg = <0x0 0xfd0e0000 0x0 0x1000>;

		clocks = <&psm_clk>, <&pll_ref_clk>;

		clock-names = "psm", "pll_ref";

		#phy-cells = <0>;

	};