Merge tag 'usb-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (07c4dd34) · Commits · e / devices / android_kernel_teracube_emerald

Documentation/ABI/testing/sysfs-bus-usb

+40 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,28 @@ Description:
		The file will read "hotplug", "wired" and "not used" if the
		information is available, and "unknown" otherwise.

		What: /sys/bus/usb/devices/.../(hub interface)/portX/quirks
		Date: May 2018
		Contact: Nicolas Boichat <drinkcat@chromium.org>
		Description:
		In some cases, we care about time-to-active for devices
		connected on a specific port (e.g. non-standard USB port like
		pogo pins), where the device to be connected is known in
		advance, and behaves well according to the specification.
		This attribute is a bit-field that controls the behavior of
		a specific port:
		- Bit 0 of this field selects the "old" enumeration scheme,
		as it is considerably faster (it only causes one USB reset
		instead of 2).
		The old enumeration scheme can also be selected globally
		using /sys/module/usbcore/parameters/old_scheme_first, but
		it is often not desirable as the new scheme was introduced to
		increase compatibility with more devices.
		- Bit 1 reduces TRSTRCY to the 10 ms that are required by the
		USB 2.0 specification, instead of the 50 ms that are normally
		used to help make enumeration work better on some high speed
		devices.

		What: /sys/bus/usb/devices/.../(hub interface)/portX/over_current_count
		Date: February 2018
		Contact: Richard Leitner <richard.leitner@skidata.com>
		@@ -236,3 +258,21 @@ Description:
		Supported values are 0 - 15.
		More information on how besl values map to microseconds can be found in
		USB 2.0 ECN Errata for Link Power Management, section 4.10)

		What: /sys/bus/usb/devices/.../rx_lanes
		Date: March 2018
		Contact: Mathias Nyman <mathias.nyman@linux.intel.com>
		Description:
		Number of rx lanes the device is using.
		USB 3.2 adds Dual-lane support, 2 rx and 2 tx lanes over Type-C.
		Inter-Chip SSIC devices support asymmetric lanes up to 4 lanes per
		direction. Devices before USB 3.2 are single lane (rx_lanes = 1)

		What: /sys/bus/usb/devices/.../tx_lanes
		Date: March 2018
		Contact: Mathias Nyman <mathias.nyman@linux.intel.com>
		Description:
		Number of tx lanes the device is using.
		USB 3.2 adds Dual-lane support, 2 rx and 2 tx -lanes over Type-C.
		Inter-Chip SSIC devices support asymmetric lanes up to 4 lanes per
		direction. Devices before USB 3.2 are single lane (tx_lanes = 1)

Documentation/ABI/testing/sysfs-class-power

+455 −0

Original line number	Diff line number	Diff line
		===== General Properties =====

		What: /sys/class/power_supply/<supply_name>/manufacturer
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the name of the device manufacturer.

		Access: Read
		Valid values: Represented as string

		What: /sys/class/power_supply/<supply_name>/model_name
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the name of the device model.

		Access: Read
		Valid values: Represented as string

		What: /sys/class/power_supply/<supply_name>/serial_number
		Date: January 2008
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the serial number of the device.

		Access: Read
		Valid values: Represented as string

		What: /sys/class/power_supply/<supply_name>/type
		Date: May 2010
		Contact: linux-pm@vger.kernel.org
		Description:
		Describes the main type of the supply.

		Access: Read
		Valid values: "Battery", "UPS", "Mains", "USB"

		===== Battery Properties =====

		What: /sys/class/power_supply/<supply_name>/capacity
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Fine grain representation of battery capacity.
		Access: Read
		Valid values: 0 - 100 (percent)

		What: /sys/class/power_supply/<supply_name>/capacity_alert_max
		Date: July 2012
		Contact: linux-pm@vger.kernel.org
		Description:
		Maximum battery capacity trip-wire value where the supply will
		notify user-space of the event. This is normally used for the
		battery discharging scenario where user-space needs to know the
		battery has dropped to an upper level so it can take
		appropriate action (e.g. warning user that battery level is
		low).

		Access: Read, Write
		Valid values: 0 - 100 (percent)

		What: /sys/class/power_supply/<supply_name>/capacity_alert_min
		Date: July 2012
		Contact: linux-pm@vger.kernel.org
		Description:
		Minimum battery capacity trip-wire value where the supply will
		notify user-space of the event. This is normally used for the
		battery discharging scenario where user-space needs to know the
		battery has dropped to a lower level so it can take
		appropriate action (e.g. warning user that battery level is
		critically low).

		Access: Read, Write
		Valid values: 0 - 100 (percent)

		What: /sys/class/power_supply/<supply_name>/capacity_level
		Date: June 2009
		Contact: linux-pm@vger.kernel.org
		Description:
		Coarse representation of battery capacity.

		Access: Read
		Valid values: "Unknown", "Critical", "Low", "Normal", "High",
		"Full"

		What: /sys/class/power_supply/<supply_name>/current_avg
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports an average IBAT current reading for the battery, over a
		fixed period. Normally devices will provide a fixed interval in
		which they average readings to smooth out the reported value.

		Access: Read
		Valid values: Represented in microamps

		What: /sys/class/power_supply/<supply_name>/current_max
		Date: October 2010
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the maximum IBAT current allowed into the battery.

		Access: Read
		Valid values: Represented in microamps

		What: /sys/class/power_supply/<supply_name>/current_now
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports an instant, single IBAT current reading for the battery.
		This value is not averaged/smoothed.

		Access: Read
		Valid values: Represented in microamps

		What: /sys/class/power_supply/<supply_name>/charge_type
		Date: July 2009
		Contact: linux-pm@vger.kernel.org
		Description:
		Represents the type of charging currently being applied to the
		battery.

		Access: Read
		Valid values: "Unknown", "N/A", "Trickle", "Fast"

		What: /sys/class/power_supply/<supply_name>/charge_term_current
		Date: July 2014
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the charging current value which is used to determine
		when the battery is considered full and charging should end.

		Access: Read
		Valid values: Represented in microamps

		What: /sys/class/power_supply/<supply_name>/health
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the health of the battery or battery side of charger
		functionality.

		Access: Read
		Valid values: "Unknown", "Good", "Overheat", "Dead",
		"Over voltage", "Unspecified failure", "Cold",
		"Watchdog timer expire", "Safety timer expire"

		What: /sys/class/power_supply/<supply_name>/precharge_current
		Date: June 2017
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the charging current applied during pre-charging phase
		for a battery charge cycle.

		Access: Read
		Valid values: Represented in microamps

		What: /sys/class/power_supply/<supply_name>/present
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports whether a battery is present or not in the system.

		Access: Read
		Valid values:
		0: Absent
		1: Present

		What: /sys/class/power_supply/<supply_name>/status
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Represents the charging status of the battery. Normally this
		is read-only reporting although for some supplies this can be
		used to enable/disable charging to the battery.

		Access: Read, Write
		Valid values: "Unknown", "Charging", "Discharging",
		"Not charging", "Full"

		What: /sys/class/power_supply/<supply_name>/technology
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Describes the battery technology supported by the supply.

		Access: Read
		Valid values: "Unknown", "NiMH", "Li-ion", "Li-poly", "LiFe",
		"NiCd", "LiMn"

		What: /sys/class/power_supply/<supply_name>/temp
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the current TBAT battery temperature reading.

		Access: Read
		Valid values: Represented in 1/10 Degrees Celsius

		What: /sys/class/power_supply/<supply_name>/temp_alert_max
		Date: July 2012
		Contact: linux-pm@vger.kernel.org
		Description:
		Maximum TBAT temperature trip-wire value where the supply will
		notify user-space of the event. This is normally used for the
		battery charging scenario where user-space needs to know the
		battery temperature has crossed an upper threshold so it can
		take appropriate action (e.g. warning user that battery level is
		critically high, and charging has stopped).

		Access: Read
		Valid values: Represented in 1/10 Degrees Celsius

		What: /sys/class/power_supply/<supply_name>/temp_alert_min
		Date: July 2012
		Contact: linux-pm@vger.kernel.org
		Description:
		Minimum TBAT temperature trip-wire value where the supply will
		notify user-space of the event. This is normally used for the
		battery charging scenario where user-space needs to know the
		battery temperature has crossed a lower threshold so it can take
		appropriate action (e.g. warning user that battery level is
		high, and charging current has been reduced accordingly to
		remedy the situation).

		Access: Read
		Valid values: Represented in 1/10 Degrees Celsius

		What: /sys/class/power_supply/<supply_name>/temp_max
		Date: July 2014
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the maximum allowed TBAT battery temperature for
		charging.

		Access: Read
		Valid values: Represented in 1/10 Degrees Celsius

		What: /sys/class/power_supply/<supply_name>/temp_min
		Date: July 2014
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the minimum allowed TBAT battery temperature for
		charging.

		Access: Read
		Valid values: Represented in 1/10 Degrees Celsius

		What: /sys/class/power_supply/<supply_name>/voltage_avg,
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports an average VBAT voltage reading for the battery, over a
		fixed period. Normally devices will provide a fixed interval in
		which they average readings to smooth out the reported value.

		Access: Read
		Valid values: Represented in microvolts

		What: /sys/class/power_supply/<supply_name>/voltage_max,
		Date: January 2008
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the maximum safe VBAT voltage permitted for the battery,
		during charging.

		Access: Read
		Valid values: Represented in microvolts

		What: /sys/class/power_supply/<supply_name>/voltage_min,
		Date: January 2008
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the minimum safe VBAT voltage permitted for the battery,
		during discharging.

		Access: Read
		Valid values: Represented in microvolts

		What: /sys/class/power_supply/<supply_name>/voltage_now,
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports an instant, single VBAT voltage reading for the battery.
		This value is not averaged/smoothed.

		Access: Read
		Valid values: Represented in microvolts

		===== USB Properties =====

		What: /sys/class/power_supply/<supply_name>/current_avg
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports an average IBUS current reading over a fixed period.
		Normally devices will provide a fixed interval in which they
		average readings to smooth out the reported value.

		Access: Read
		Valid values: Represented in microamps


		What: /sys/class/power_supply/<supply_name>/current_max
		Date: October 2010
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the maximum IBUS current the supply can support.

		Access: Read
		Valid values: Represented in microamps

		What: /sys/class/power_supply/<supply_name>/current_now
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the IBUS current supplied now. This value is generally
		read-only reporting, unless the 'online' state of the supply
		is set to be programmable, in which case this value can be set
		within the reported min/max range.

		Access: Read, Write
		Valid values: Represented in microamps

		What: /sys/class/power_supply/<supply_name>/input_current_limit
		Date: July 2014
		Contact: linux-pm@vger.kernel.org
		Description:
		Details the incoming IBUS current limit currently set in the
		supply. Normally this is configured based on the type of
		connection made (e.g. A configured SDP should output a maximum
		of 500mA so the input current limit is set to the same value).

		Access: Read, Write
		Valid values: Represented in microamps

		What: /sys/class/power_supply/<supply_name>/online,
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Indicates if VBUS is present for the supply. When the supply is
		online, and the supply allows it, then it's possible to switch
		between online states (e.g. Fixed -> Programmable for a PD_PPS
		USB supply so voltage and current can be controlled).

		Access: Read, Write
		Valid values:
		0: Offline
		1: Online Fixed - Fixed Voltage Supply
		2: Online Programmable - Programmable Voltage Supply

		What: /sys/class/power_supply/<supply_name>/temp
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the current supply temperature reading. This would
		normally be the internal temperature of the device itself (e.g
		TJUNC temperature of an IC)

		Access: Read
		Valid values: Represented in 1/10 Degrees Celsius

		What: /sys/class/power_supply/<supply_name>/temp_alert_max
		Date: July 2012
		Contact: linux-pm@vger.kernel.org
		Description:
		Maximum supply temperature trip-wire value where the supply will
		notify user-space of the event. This is normally used for the
		charging scenario where user-space needs to know the supply
		temperature has crossed an upper threshold so it can take
		appropriate action (e.g. warning user that the supply
		temperature is critically high, and charging has stopped to
		remedy the situation).

		Access: Read
		Valid values: Represented in 1/10 Degrees Celsius

		What: /sys/class/power_supply/<supply_name>/temp_alert_min
		Date: July 2012
		Contact: linux-pm@vger.kernel.org
		Description:
		Minimum supply temperature trip-wire value where the supply will
		notify user-space of the event. This is normally used for the
		charging scenario where user-space needs to know the supply
		temperature has crossed a lower threshold so it can take
		appropriate action (e.g. warning user that the supply
		temperature is high, and charging current has been reduced
		accordingly to remedy the situation).

		Access: Read
		Valid values: Represented in 1/10 Degrees Celsius

		What: /sys/class/power_supply/<supply_name>/temp_max
		Date: July 2014
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the maximum allowed supply temperature for operation.

		Access: Read
		Valid values: Represented in 1/10 Degrees Celsius

		What: /sys/class/power_supply/<supply_name>/temp_min
		Date: July 2014
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the mainimum allowed supply temperature for operation.

		Access: Read
		Valid values: Represented in 1/10 Degrees Celsius

		What: /sys/class/power_supply/<supply_name>/usb_type
		Date: March 2018
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports what type of USB connection is currently active for
		the supply, for example it can show if USB-PD capable source
		is attached.

		Access: Read-Only
		Valid values: "Unknown", "SDP", "DCP", "CDP", "ACA", "C", "PD",
		"PD_DRP", "PD_PPS", "BrickID"

		What: /sys/class/power_supply/<supply_name>/voltage_max
		Date: January 2008
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the maximum VBUS voltage the supply can support.

		Access: Read
		Valid values: Represented in microvolts

		What: /sys/class/power_supply/<supply_name>/voltage_min
		Date: January 2008
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the minimum VBUS voltage the supply can support.

		Access: Read
		Valid values: Represented in microvolts

		What: /sys/class/power_supply/<supply_name>/voltage_now
		Date: May 2007
		Contact: linux-pm@vger.kernel.org
		Description:
		Reports the VBUS voltage supplied now. This value is generally
		read-only reporting, unless the 'online' state of the supply
		is set to be programmable, in which case this value can be set
		within the reported min/max range.

		Access: Read, Write
		Valid values: Represented in microvolts

		===== Device Specific Properties =====

		What: /sys/class/power/ds2760-battery.*/charge_now
		Date: May 2010
		KernelVersion: 2.6.35

Documentation/devicetree/bindings/phy/phy-mtk-xsphy.txt

0 → 100644

+109 −0

Original line number	Diff line number	Diff line
		MediaTek XS-PHY binding
		--------------------------

		The XS-PHY controller supports physical layer functionality for USB3.1
		GEN2 controller on MediaTek SoCs.

		Required properties (controller (parent) node):
		- compatible : should be "mediatek,<soc-model>-xsphy", "mediatek,xsphy",
		soc-model is the name of SoC, such as mt3611 etc;
		when using "mediatek,xsphy" compatible string, you need SoC specific
		ones in addition, one of:
		- "mediatek,mt3611-xsphy"

		- #address-cells, #size-cells : should use the same values as the root node
		- ranges: must be present

		Optional properties (controller (parent) node):
		- reg : offset and length of register shared by multiple U3 ports,
		exclude port's private register, if only U2 ports provided,
		shouldn't use the property.
		- mediatek,src-ref-clk-mhz : u32, frequency of reference clock for slew rate
		calibrate
		- mediatek,src-coef : u32, coefficient for slew rate calibrate, depends on
		SoC process

		Required nodes : a sub-node is required for each port the controller
		provides. Address range information including the usual
		'reg' property is used inside these nodes to describe
		the controller's topology.

		Required properties (port (child) node):
		- reg : address and length of the register set for the port.
		- clocks : a list of phandle + clock-specifier pairs, one for each
		entry in clock-names
		- clock-names : must contain
		"ref": 48M reference clock for HighSpeed analog phy; and 26M
		reference clock for SuperSpeedPlus analog phy, sometimes is
		24M, 25M or 27M, depended on platform.
		- #phy-cells : should be 1
		cell after port phandle is phy type from:
		- PHY_TYPE_USB2
		- PHY_TYPE_USB3

		The following optional properties are only for debug or HQA test
		Optional properties (PHY_TYPE_USB2 port (child) node):
		- mediatek,eye-src : u32, the value of slew rate calibrate
		- mediatek,eye-vrt : u32, the selection of VRT reference voltage
		- mediatek,eye-term : u32, the selection of HS_TX TERM reference voltage
		- mediatek,efuse-intr : u32, the selection of Internal Resistor

		Optional properties (PHY_TYPE_USB3 port (child) node):
		- mediatek,efuse-intr : u32, the selection of Internal Resistor
		- mediatek,efuse-tx-imp : u32, the selection of TX Impedance
		- mediatek,efuse-rx-imp : u32, the selection of RX Impedance

		Banks layout of xsphy
		-------------------------------------------------------------
		port offset bank
		u2 port0 0x0000 MISC
		0x0100 FMREG
		0x0300 U2PHY_COM
		u2 port1 0x1000 MISC
		0x1100 FMREG
		0x1300 U2PHY_COM
		u2 port2 0x2000 MISC
		...
		u31 common 0x3000 DIG_GLB
		0x3100 PHYA_GLB
		u31 port0 0x3400 DIG_LN_TOP
		0x3500 DIG_LN_TX0
		0x3600 DIG_LN_RX0
		0x3700 DIG_LN_DAIF
		0x3800 PHYA_LN
		u31 port1 0x3a00 DIG_LN_TOP
		0x3b00 DIG_LN_TX0
		0x3c00 DIG_LN_RX0
		0x3d00 DIG_LN_DAIF
		0x3e00 PHYA_LN
		...

		DIG_GLB & PHYA_GLB are shared by U31 ports.

		Example:

		u3phy: usb-phy@11c40000 {
		compatible = "mediatek,mt3611-xsphy", "mediatek,xsphy";
		reg = <0 0x11c43000 0 0x0200>;
		mediatek,src-ref-clk-mhz = <26>;
		mediatek,src-coef = <17>;
		#address-cells = <2>;
		#size-cells = <2>;
		ranges;

		u2port0: usb-phy@11c40000 {
		reg = <0 0x11c40000 0 0x0400>;
		clocks = <&clk48m>;
		clock-names = "ref";
		mediatek,eye-src = <4>;
		#phy-cells = <1>;
		};

		u3port0: usb-phy@11c43000 {
		reg = <0 0x11c43400 0 0x0500>;
		clocks = <&clk26m>;
		clock-names = "ref";
		mediatek,efuse-intr = <28>;
		#phy-cells = <1>;
		};
		};

Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,8 @@ Required properties:
		"qcom,ipq8074-qmp-pcie-phy" for PCIe phy on IPQ8074
		"qcom,msm8996-qmp-pcie-phy" for 14nm PCIe phy on msm8996,
		"qcom,msm8996-qmp-usb3-phy" for 14nm USB3 phy on msm8996,
		"qcom,qmp-v3-usb3-phy" for USB3 QMP V3 phy.
		"qcom,sdm845-qmp-usb3-phy" for USB3 QMP V3 phy on sdm845,
		"qcom,sdm845-qmp-usb3-uni-phy" for USB3 QMP V3 UNI phy on sdm845.

		- reg: offset and length of register set for PHY's common serdes block.

Documentation/devicetree/bindings/phy/qcom-qusb2-phy.txt

+22 −1

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ QUSB2 controller supports LS/FS/HS usb connectivity on Qualcomm chipsets.
		Required properties:
		- compatible: compatible list, contains
		"qcom,msm8996-qusb2-phy" for 14nm PHY on msm8996,
		"qcom,qusb2-v2-phy" for QUSB2 V2 PHY.
		"qcom,sdm845-qusb2-phy" for 10nm PHY on sdm845.

		- reg: offset and length of the PHY register set.
		- #phy-cells: must be 0.
		@@ -27,6 +27,27 @@ Optional properties:
		tuning parameter value for qusb2 phy.

		- qcom,tcsr-syscon: Phandle to TCSR syscon register region.
		- qcom,imp-res-offset-value: It is a 6 bit value that specifies offset to be
		added to PHY refgen RESCODE via IMP_CTRL1 register. It is a PHY
		tuning parameter that may vary for different boards of same SOC.
		This property is applicable to only QUSB2 v2 PHY (sdm845).
		- qcom,hstx-trim-value: It is a 4 bit value that specifies tuning for HSTX
		output current.
		Possible range is - 15mA to 24mA (stepsize of 600 uA).
		See dt-bindings/phy/phy-qcom-qusb2.h for applicable values.
		This property is applicable to only QUSB2 v2 PHY (sdm845).
		Default value is 22.2mA for sdm845.
		- qcom,preemphasis-level: It is a 2 bit value that specifies pre-emphasis level.
		Possible range is 0 to 15% (stepsize of 5%).
		See dt-bindings/phy/phy-qcom-qusb2.h for applicable values.
		This property is applicable to only QUSB2 v2 PHY (sdm845).
		Default value is 10% for sdm845.
		- qcom,preemphasis-width: It is a 1 bit value that specifies how long the HSTX
		pre-emphasis (specified using qcom,preemphasis-level) must be in
		effect. Duration could be half-bit of full-bit.
		See dt-bindings/phy/phy-qcom-qusb2.h for applicable values.
		This property is applicable to only QUSB2 v2 PHY (sdm845).
		Default value is full-bit width for sdm845.

		Example:
		hsusb_phy: phy@7411000 {