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

Commit 21bdb3b0 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

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

 into usb-next

Kishon writes:

phy: for 4.13

 *) Group phy drivers into vendor specific directories
 *) Add USB3 PHY driver for Renesas R-Car Gen3
 *) Add USB2 PHY driver for Meson GXL and GXM SoCs
 *) Add USB DRD PHY driver for Broadcom Northstar2
 *) Add USB PHY driver for CPCAP PMIC USB
 *) Make phy-meson8b-usb2 driver support USB PHY on Meson8
 *) Make phy-tusb1210 driver support TUSB1211
 *) Make phy-rockchip-inno-usb2 driver support usb2-phy in rk3228 SoCs
 *) Make phy-brcm-sata driver support for stingray SATA phy
 *) Make bcm-ns-usb3 as a MDIO driver
 *) Make rockchip-inno-usb2 support two host ports
 *) Implement ->set_mode() callback in phy-tusb1210
 *) Minor fixes in phy drivers

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parents 3134bc9c af850e14

Documentation/devicetree/bindings/phy/bcm-ns-usb3-phy.txt

+19 −8
Original line number Diff line number Diff line
@@ -3,9 +3,10 @@ Driver for Broadcom Northstar USB 3.0 PHY 
Required properties:



- compatible: one of: "brcm,ns-ax-usb3-phy", "brcm,ns-bx-usb3-phy".

- reg: register mappings for DMP (Device Management Plugin) and ChipCommon B

       MMI.

- reg-names: "dmp" and "ccb-mii"

- reg: address of MDIO bus device

- usb3-dmp-syscon: phandle to syscon with DMP (Device Management Plugin)

		   registers

- #phy-cells: must be 0



Initialization of USB 3.0 PHY depends on Northstar version. There are currently

three known series: Ax, Bx and Cx.
@@ -15,9 +16,19 @@ Known B1: BCM4707 rev 6 
Known C0: BCM47094 rev 0



Example:

	usb3-phy {

	mdio: mdio@0 {

		reg = <0x0>;

		#size-cells = <1>;

		#address-cells = <0>;



		usb3-phy@10 {

			compatible = "brcm,ns-ax-usb3-phy";

		reg = <0x18105000 0x1000>, <0x18003000 0x1000>;

		reg-names = "dmp", "ccb-mii";

			reg = <0x10>;

			usb3-dmp-syscon = <&usb3_dmp>;

			#phy-cells = <0>;

		};

	};



	usb3_dmp: syscon@18105000 {

		reg = <0x18105000 0x1000>;

	};

Documentation/devicetree/bindings/phy/brcm,ns2-drd-phy.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
BROADCOM NORTHSTAR2 USB2 (DUAL ROLE DEVICE) PHY



Required properties:

 - compatible: brcm,ns2-drd-phy

 - reg: offset and length of the NS2 PHY related registers.

 - reg-names

   The below registers must be provided.

   icfg - for DRD ICFG configurations

   rst-ctrl - for DRD IDM reset

   crmu-ctrl - for CRMU core vdd, PHY and PHY PLL reset

   usb2-strap - for port over current polarity reversal

 - #phy-cells: Must be 0. No args required.

 - vbus-gpios: vbus gpio binding

 - id-gpios: id gpio binding



Refer to phy/phy-bindings.txt for the generic PHY binding properties



Example:

	usbdrd_phy: phy@66000960 {

			#phy-cells = <0>;

			compatible = "brcm,ns2-drd-phy";

			reg = <0x66000960 0x24>,

			      <0x67012800 0x4>,

			      <0x6501d148 0x4>,

			      <0x664d0700 0x4>;

			reg-names = "icfg", "rst-ctrl",

				    "crmu-ctrl", "usb2-strap";

			id-gpios = <&gpio_g 30 0>;

			vbus-gpios = <&gpio_g 31 0>;

	};

Documentation/devicetree/bindings/phy/brcm-sata-phy.txt

+4 −3
Original line number Diff line number Diff line
@@ -7,12 +7,13 @@ Required properties: 
     "brcm,iproc-ns2-sata-phy"

     "brcm,iproc-nsp-sata-phy"

     "brcm,phy-sata3"

     "brcm,iproc-sr-sata-phy"

- address-cells: should be 1

- size-cells: should be 0

- reg: register ranges for the PHY PCB interface

- reg-names: should be "phy" and "phy-ctrl"

     The "phy-ctrl" registers are only required for

     "brcm,iproc-ns2-sata-phy".

     "brcm,iproc-ns2-sata-phy" and "brcm,iproc-sr-sata-phy".



Sub-nodes:

  Each port's PHY should be represented as a sub-node.
@@ -23,8 +24,8 @@ Sub-nodes required properties: 


Sub-nodes optional properties:

- brcm,enable-ssc: use spread spectrum clocking (SSC) on this port

     This property is not applicable for "brcm,iproc-ns2-sata-phy" and

     "brcm,iproc-nsp-sata-phy".

     This property is not applicable for "brcm,iproc-ns2-sata-phy",

     "brcm,iproc-nsp-sata-phy" and "brcm,iproc-sr-sata-phy".



Example:

	sata-phy@f0458100 {

Documentation/devicetree/bindings/phy/meson-gxl-usb2-phy.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
* Amlogic Meson GXL and GXM USB2 PHY binding



Required properties:

- compatible:	Should be "amlogic,meson-gxl-usb2-phy"

- reg:		The base address and length of the registers

- #phys-cells:	must be 0 (see phy-bindings.txt in this directory)



Optional properties:

- phy-supply:	see phy-bindings.txt in this directory





Example:

	usb2_phy0: phy@78000 {

		compatible = "amlogic,meson-gxl-usb2-phy";

		#phy-cells = <0>;

		reg = <0x0 0x78000 0x0 0x20>;

	};

Documentation/devicetree/bindings/phy/meson8b-usb2-phy.txt

+2 −1
Original line number Diff line number Diff line 
* Amlogic Meson8b and GXBB USB2 PHY

* Amlogic Meson8, Meson8b and GXBB USB2 PHY



Required properties:

- compatible:	Depending on the platform this should be one of:

	"amlogic,meson8-usb2-phy"

	"amlogic,meson8b-usb2-phy"

	"amlogic,meson-gxbb-usb2-phy"

- reg:		The base address and length of the registers