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

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

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

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

 into usb-next

Kishon writes:

phy: for 4.5

*) new PHY driver for hi6220 usb and rcar gen3 usb2
*) deprecate phy-omap-control driver. phy-omap-control driver was added
   when there was no proper infrastructure for doing control module
   initialization. The phy-omap-control driver is not an 'actual' PHY
   driver and it was just a hack to do PHY related control module
   initialization. Now with SYSCON framework in the kernel, control
   module setttings can be done using APIs provided by syscon.
*) usbphy-internal pll creates the needed 480MHz and is also a
   supply-clock back to the core clock-controller in Rockchip SoCs.
   This is now modeled as a real clock.
*) calibrate mt65xx usb3 PHY for better eye diagram and receiver
   sensitivity.
*) Miscellaneous cleanups.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parents f7dbd84f 9955a783

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

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


Required properties:

- compatible: should be one or more of

     "brcm,bcm7425-sata-phy"

     "brcm,bcm7445-sata-phy"

     "brcm,phy-sata3"

- address-cells: should be 1

Documentation/devicetree/bindings/phy/phy-hi6220-usb.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
Hisilicon hi6220 usb PHY

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



Required properties:

- compatible: should be "hisilicon,hi6220-usb-phy"

- #phy-cells: must be 0

- hisilicon,peripheral-syscon: phandle of syscon used to control phy.

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



Example:

	usb_phy: usbphy {

		compatible = "hisilicon,hi6220-usb-phy";

		#phy-cells = <0>;

		phy-supply = <&fixed_5v_hub>;

		hisilicon,peripheral-syscon = <&sys_ctrl>;

	};

Documentation/devicetree/bindings/phy/rcar-gen3-phy-usb2.txt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
* Renesas R-Car generation 3 USB 2.0 PHY



This file provides information on what the device node for the R-Car generation

3 USB 2.0 PHY contains.



Required properties:

- compatible: "renesas,usb2-phy-r8a7795" if the device is a part of an R8A7795

	      SoC.

- reg: offset and length of the partial USB 2.0 Host register block.

- reg-names: must be "usb2_host".

- clocks: clock phandle and specifier pair(s).

- #phy-cells: see phy-bindings.txt in the same directory, must be <0>.



Optional properties:

To use a USB channel where USB 2.0 Host and HSUSB (USB 2.0 Peripheral) are

combined, the device tree node should set HSUSB properties to reg and reg-names

properties. This is because HSUSB has registers to select USB 2.0 host or

peripheral at that channel:

- reg: offset and length of the partial HSUSB register block.

- reg-names: must be "hsusb".

- interrupts: interrupt specifier for the PHY.



Example (R-Car H3):



	usb-phy@ee080200 {

		compatible = "renesas,usb2-phy-r8a7795";

		reg = <0 0xee080200 0 0x700>, <0 0xe6590100 0 0x100>;

		reg-names = "usb2_host", "hsusb";

		interrupts = <GIC_SPI 108 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&mstp7_clks R8A7795_CLK_EHCI0>,

			 <&mstp7_clks R8A7795_CLK_HSUSB>;

	};



	usb-phy@ee0a0200 {

		compatible = "renesas,usb2-phy-r8a7795";

		reg = <0 0xee0a0200 0 0x700>;

		reg-names = "usb2_host";

		clocks = <&mstp7_clks R8A7795_CLK_EHCI0>;

	};

Documentation/devicetree/bindings/phy/rockchip-usb-phy.txt

+5 −1
Original line number Diff line number Diff line 
ROCKCHIP USB2 PHY



Required properties:

 - compatible: rockchip,rk3288-usb-phy

 - compatible: matching the soc type, one of

     "rockchip,rk3066a-usb-phy"

     "rockchip,rk3188-usb-phy"

     "rockchip,rk3288-usb-phy"

 - rockchip,grf : phandle to the syscon managing the "general

   register files"

 - #address-cells: should be 1
@@ -21,6 +24,7 @@ required properties: 
Optional Properties:

- clocks : phandle + clock specifier for the phy clocks

- clock-names: string, clock name, must be "phyclk"

- #clock-cells: for users of the phy-pll, should be 0



Example:

Documentation/devicetree/bindings/phy/sun4i-usb-phy.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
  * allwinner,sun7i-a20-usb-phy

  * allwinner,sun8i-a23-usb-phy

  * allwinner,sun8i-a33-usb-phy

  * allwinner,sun8i-h3-usb-phy

- reg : a list of offset + length pairs

- reg-names :

  * "phy_ctrl"