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

Commit 2c093cdb authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'phy-for-4.18' of...

Merge tag 'phy-for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy

 into usb-next

Kishon writes:

phy: for 4.18

 *) Add PHY driver for the ATH79 USB PHY
 *) Add USB3 PHY driver for Mediatek XS-PHY
 *) Add QUSB/QMP V3 USB3 PHY Support for Qualcomm's SDM845
 *) Add runtime PM support for mapphone PHY driver
 *) Allow phy_pm_runtime_xxx API calls to accept NULL
 *) Other minor cleanups and fixes

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parents 58c38116 c1eb8f83
Loading
Loading
Loading
Loading
+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>;
	};
};
+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.

+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 {
+8 −0
Original line number Diff line number Diff line
@@ -2331,6 +2331,14 @@ S: Maintained
F:	drivers/gpio/gpio-ath79.c
F:	Documentation/devicetree/bindings/gpio/gpio-ath79.txt

ATHEROS 71XX/9XXX USB PHY DRIVER
M:	Alban Bedel <albeu@free.fr>
W:	https://github.com/AlbanBedel/linux
T:	git git://github.com/AlbanBedel/linux
S:	Maintained
F:	drivers/phy/qualcomm/phy-ath79-usb.c
F:	Documentation/devicetree/bindings/phy/phy-ath79-usb.txt

ATHEROS ATH GENERIC UTILITIES
M:	"Luis R. Rodriguez" <mcgrof@do-not-panic.com>
L:	linux-wireless@vger.kernel.org
+9 −0
Original line number Diff line number Diff line
@@ -12,3 +12,12 @@ config PHY_MTK_TPHY
	  different banks layout, the T-PHY with shared banks between
	  multi-ports is first version, otherwise is second veriosn,
	  so you can easily distinguish them by banks layout.

config PHY_MTK_XSPHY
    tristate "MediaTek XS-PHY Driver"
    depends on ARCH_MEDIATEK && OF
    select GENERIC_PHY
    help
	  Enable this to support the SuperSpeedPlus XS-PHY transceiver for
	  USB3.1 GEN2 controllers on MediaTek chips. The driver supports
	  multiple USB2.0, USB3.1 GEN2 ports.
Loading