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

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

Merge tag 'phy-for-v4.2' of... 

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

 into usb-next

Kishon writes:

phy: for 4.2 merge window

*) new Broadcom SATA3 PHY driver for Broadcom STB SoCs
*) new phy API to get PHY by index which is used in EHCI and
   OHCI controller drivers
*) support specifying supply at port level used for multi-port PHYs
*) sparse warning fixes in miphy PHYs
*) fix pm_runtime issues in twl4030 driver

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
parents f5042022 692fbb89

Documentation/ABI/testing/sysfs-platform-twl4030-usb

0 → 100644
+8 −0
Original line number Diff line number Diff line 
What: /sys/bus/platform/devices/*twl4030-usb/vbus

Description:

	Read-only status reporting if VBUS (approx 5V)

	is being supplied by the USB bus.



	Possible values: "on", "off".



	Changes are notified via select/poll.

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

0 → 100644
+40 −0
Original line number Diff line number Diff line 
* Broadcom SATA3 PHY for STB



Required properties:

- compatible: should be one or more of

     "brcm,bcm7445-sata-phy"

     "brcm,phy-sata3"

- address-cells: should be 1

- size-cells: should be 0

- reg: register range for the PHY PCB interface

- reg-names: should be "phy"



Sub-nodes:

  Each port's PHY should be represented as a sub-node.



Sub-nodes required properties:

- reg: the PHY number

- phy-cells: generic PHY binding; must be 0

Optional:

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





Example:



	sata-phy@f0458100 {

		compatible = "brcm,bcm7445-sata-phy", "brcm,phy-sata3";

		reg = <0xf0458100 0x1e00>, <0xf045804c 0x10>;

		reg-names = "phy";

		#address-cells = <1>;

		#size-cells = <0>;



		sata-phy@0 {

			reg = <0>;

			#phy-cells = <0>;

		};



		sata-phy@1 {

			reg = <1>;

			#phy-cells = <0>;

		};

	};

Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ This file provides information on what the device node for the R-Car generation 
Required properties:

- compatible: "renesas,usb-phy-r8a7790" if the device is a part of R8A7790 SoC.

	      "renesas,usb-phy-r8a7791" if the device is a part of R8A7791 SoC.

	      "renesas,usb-phy-r8a7794" if the device is a part of R8A7794 SoC.

- reg: offset and length of the register block.

- #address-cells: number of address cells for the USB channel subnodes, must

		  be <1>.

Documentation/phy.txt

+6 −1
Original line number Diff line number Diff line
@@ -76,6 +76,8 @@ struct phy *phy_get(struct device *dev, const char *string); 
struct phy *phy_optional_get(struct device *dev, const char *string);

struct phy *devm_phy_get(struct device *dev, const char *string);

struct phy *devm_phy_optional_get(struct device *dev, const char *string);

struct phy *devm_of_phy_get_by_index(struct device *dev, struct device_node *np,

				     int index);



phy_get, phy_optional_get, devm_phy_get and devm_phy_optional_get can

be used to get the PHY. In the case of dt boot, the string arguments
@@ -86,7 +88,10 @@ successful PHY get. On driver detach, release function is invoked on 
the the devres data and devres data is freed. phy_optional_get and

devm_phy_optional_get should be used when the phy is optional. These

two functions will never return -ENODEV, but instead returns NULL when

the phy cannot be found.

the phy cannot be found.Some generic drivers, such as ehci, may use multiple

phys and for such drivers referencing phy(s) by name(s) does not make sense. In

this case, devm_of_phy_get_by_index can be used to get a phy reference based on

the index.



It should be noted that NULL is a valid phy reference. All phy

consumer calls on the NULL phy become NOPs. That is the release calls,

drivers/phy/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -316,4 +316,13 @@ config PHY_TUSB1210 
	help

	  Support for TI TUSB1210 USB ULPI PHY.



config PHY_BRCMSTB_SATA

	tristate "Broadcom STB SATA PHY driver"

	depends on ARCH_BRCMSTB

	depends on OF

	select GENERIC_PHY

	help

	  Enable this to support the SATA3 PHY on 28nm Broadcom STB SoCs.

	  Likely useful only with CONFIG_SATA_BRCMSTB enabled.



endmenu