Skip to contentSkip to conversation

phy: for v4.2 merge window

GIT PULL New Kishon Vijay Abraham I 2 participants 17 messages Jun 2, 2015 – Jun 3, 2015

Subsystems (8)
lore
Share & tools
lore
#0 lore raw

Hi Greg,

Here's the PHY pull request for 4.2 merge window. Please find below the list of changes that goes in this pull request.

There was a merge conflict in Makefile and Kconfig while trying to merge with your usb-next branch. It's because one of the PHY drivers (TUSB1210) went via balbi's tree due to it's dependecy with USB_ULPI_BUS and it conflicts with BRCMSTB_SATA. The resolution should have both TUSB1210 and BRCMSTB_SATA present.

Let me know If I have to change something.

Cheers
Kishon

The following changes since commit 2decb2682f80759f631c8332f9a2a34a02150a03:

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (2015-04-27 14:05:19 -0700)

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/kishon/linux-phy.git tags/phy-for-v4.2

for you to fetch changes up to 692fbb89fa0b8028f402e33eb912474e11b5f435:

phy: twl4030-usb: add ABI documentation (2015-06-01 16:08:24 +0530)

----------------------------------------------------------------
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

----------------------------------------------------------------
Arun Ramamurthy (3):
phy: core: Add devm_of_phy_get_by_index to phy-core
usb: ehci-platform: Use devm_of_phy_get_by_index
usb: ohci-platform: Use devm_of_phy_get_by_index

Axel Lin (1):
phy: core: Check requested PHY status in _of_phy_get()

Brian Norris (2):
Documentation: devicetree: add Broadcom SATA PHY binding
phy: add Broadcom SATA3 PHY driver for Broadcom STB SoCs

Dmitry Torokhov (1):
phy: phy-core: allow specifying supply at port level

Felipe Balbi (2):
phy: miphy28lp: fix sparse warnings
phy: miphy365x: fix sparse warnings

NeilBrown (4):
phy: twl4030-usb: make runtime pm more reliable.
phy: twl4030-usb: remove pointless 'suspended' test in 'suspend' callback.
phy: twl4030-usb: remove incorrect pm_runtime_get_sync() in probe function.
phy: twl4030-usb: add ABI documentation

Yoshihiro Shimoda (1):
phy: rcar-gen2: Add support for R-Car E2

 .../ABI/testing/sysfs-platform-twl4030-usb         |    8 +
 .../bindings/phy/brcm,brcmstb-sata-phy.txt         |   40 ++++
 .../devicetree/bindings/phy/rcar-gen2-phy.txt      |    1 +
 Documentation/phy.txt                              |    7 +-
 drivers/phy/Kconfig                                |    9 +
 drivers/phy/Makefile                               |    1 +
 drivers/phy/phy-brcmstb-sata.c                     |  216 ++++++++++++++++++++
 drivers/phy/phy-core.c                             |   67 ++++--
 drivers/phy/phy-miphy28lp.c                        |    9 +-
 drivers/phy/phy-miphy365x.c                        |    9 +-
 drivers/phy/phy-rcar-gen2.c                        |    6 +-
 drivers/phy/phy-twl4030-usb.c                      |   34 +--
 drivers/usb/host/ehci-platform.c                   |   69 +++----
 drivers/usb/host/ohci-platform.c                   |   69 +++----
 include/linux/phy/phy.h                            |    9 +
 15 files changed, 415 insertions(+), 139 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-platform-twl4030-usb
 create mode 100644 Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt
 create mode 100644 drivers/phy/phy-brcmstb-sata.c
Signature · 1 line
1.7.9.5
#1 lore raw

PATCH 1/14 phy: core: Add devm_of_phy_get_by_index to phy-core

From: Arun Ramamurthy <[email protected]>

Some generic drivers, such as ehci, may use multiple phys and for such drivers referencing phy(s) by name(s) does not make sense. Instead of inventing new naming schemes and using custom code to iterate through them, such drivers are better of using nameless phy bindings and using this newly introduced API to iterate through them.

---
 Documentation/phy.txt   |    7 ++++++-
 drivers/phy/phy-core.c  |   32 ++++++++++++++++++++++++++++++++
 include/linux/phy/phy.h |    9 +++++++++
 3 files changed, 47 insertions(+), 1 deletion(-)
Documentation/phy.txt +6 -1
index 371361c..b388c5a 100644
@@ -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/phy-core.c +32 -0
index 3791838..964a84d 100644
@@ -623,6 +623,38 @@ struct phy *devm_of_phy_get(struct device *dev, struct device_node *np,
 EXPORT_SYMBOL_GPL(devm_of_phy_get);
 
 /**
+ * devm_of_phy_get_by_index() - lookup and obtain a reference to a phy by index.
+ * @dev: device that requests this phy
+ * @np: node containing the phy
+ * @index: index of the phy
+ *
+ * Gets the phy using _of_phy_get(), and associates a device with it using
+ * devres. On driver detach, release function is invoked on the devres data,
+ * then, devres data is freed.
+ *
+ */
+struct phy *devm_of_phy_get_by_index(struct device *dev, struct device_node *np,
+				     int index)
+{
+	struct phy **ptr, *phy;
+
+	ptr = devres_alloc(devm_phy_release, sizeof(*ptr), GFP_KERNEL);
+	if (!ptr)
+		return ERR_PTR(-ENOMEM);
+
+	phy = _of_phy_get(np, index);
+	if (!IS_ERR(phy)) {
+		*ptr = phy;
+		devres_add(dev, ptr);
+	} else {
+		devres_free(ptr);
+	}
+
+	return phy;
+}
+EXPORT_SYMBOL_GPL(devm_of_phy_get_by_index);
+
+/**
  * phy_create() - create a new phy
  * @dev: device that is creating the new phy
  * @node: device node of the phy
include/linux/phy/phy.h +9 -0
index a0197fa..8cf05e3 100644
@@ -133,6 +133,8 @@ 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(struct device *dev, struct device_node *np,
 			    const char *con_id);
+struct phy *devm_of_phy_get_by_index(struct device *dev, struct device_node *np,
+				     int index);
 void phy_put(struct phy *phy);
 void devm_phy_put(struct device *dev, struct phy *phy);
 struct phy *of_phy_get(struct device_node *np, const char *con_id);
@@ -261,6 +263,13 @@ static inline struct phy *devm_of_phy_get(struct device *dev,
 	return ERR_PTR(-ENOSYS);
 }
 
+static inline struct phy *devm_of_phy_get_by_index(struct device *dev,
+						   struct device_node *np,
+						   int index)
+{
+	return ERR_PTR(-ENOSYS);
+}
+
 static inline void phy_put(struct phy *phy)
 {
 }
Signature · 1 line
1.7.9.5
#2 lore raw

PATCH 2/14 usb: ehci-platform: Use devm_of_phy_get_by_index

In reply to Kishon Vijay Abraham I

From: Arun Ramamurthy <[email protected]>

Getting phys by index instead of phy names so that we do not have to create a naming scheme when multiple phys are present

---
 drivers/usb/host/ehci-platform.c |   69 +++++++++++++-------------------------
 1 file changed, 24 insertions(+), 45 deletions(-)
drivers/usb/host/ehci-platform.c +24 -45
index d8a75a5..145bf19 100644
@@ -88,15 +88,13 @@ static int ehci_platform_power_on(struct platform_device *dev)
 	}
 
 	for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {
-		if (priv->phys[phy_num]) {
-			ret = phy_init(priv->phys[phy_num]);
-			if (ret)
-				goto err_exit_phy;
-			ret = phy_power_on(priv->phys[phy_num]);
-			if (ret) {
-				phy_exit(priv->phys[phy_num]);
-				goto err_exit_phy;
-			}
+		ret = phy_init(priv->phys[phy_num]);
+		if (ret)
+			goto err_exit_phy;
+		ret = phy_power_on(priv->phys[phy_num]);
+		if (ret) {
+			phy_exit(priv->phys[phy_num]);
+			goto err_exit_phy;
 		}
 	}
 
@@ -104,10 +102,8 @@ static int ehci_platform_power_on(struct platform_device *dev)
 
 err_exit_phy:
 	while (--phy_num >= 0) {
-		if (priv->phys[phy_num]) {
-			phy_power_off(priv->phys[phy_num]);
-			phy_exit(priv->phys[phy_num]);
-		}
+		phy_power_off(priv->phys[phy_num]);
+		phy_exit(priv->phys[phy_num]);
 	}
 err_disable_clks:
 	while (--clk >= 0)
@@ -123,10 +119,8 @@ static void ehci_platform_power_off(struct platform_device *dev)
 	int clk, phy_num;
 
 	for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {
-		if (priv->phys[phy_num]) {
-			phy_power_off(priv->phys[phy_num]);
-			phy_exit(priv->phys[phy_num]);
-		}
+		phy_power_off(priv->phys[phy_num]);
+		phy_exit(priv->phys[phy_num]);
 	}
 
 	for (clk = EHCI_MAX_CLKS - 1; clk >= 0; clk--)
@@ -154,7 +148,6 @@ static int ehci_platform_probe(struct platform_device *dev)
 	struct usb_ehci_pdata *pdata = dev_get_platdata(&dev->dev);
 	struct ehci_platform_priv *priv;
 	struct ehci_hcd *ehci;
-	const char *phy_name;
 	int err, irq, phy_num, clk = 0;
 
 	if (usb_disabled())
@@ -204,36 +197,22 @@ static int ehci_platform_probe(struct platform_device *dev)
 
 		priv->num_phys = of_count_phandle_with_args(dev->dev.of_node,
 				"phys", "#phy-cells");
-		priv->num_phys = priv->num_phys > 0 ? priv->num_phys : 1;
 
-		priv->phys = devm_kcalloc(&dev->dev, priv->num_phys,
-				sizeof(struct phy *), GFP_KERNEL);
-		if (!priv->phys)
-			return -ENOMEM;
+		if (priv->num_phys > 0) {
+			priv->phys = devm_kcalloc(&dev->dev, priv->num_phys,
+					    sizeof(struct phy *), GFP_KERNEL);
+			if (!priv->phys)
+				return -ENOMEM;
+		} else
+			priv->num_phys = 0;
 
 		for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {
-				err = of_property_read_string_index(
-						dev->dev.of_node,
-						"phy-names", phy_num,
-						&phy_name);
-
-				if (err < 0) {
-					if (priv->num_phys > 1) {
-						dev_err(&dev->dev, "phy-names not provided");
-						goto err_put_hcd;
-					} else
-						phy_name = "usb";
-				}
-
-				priv->phys[phy_num] = devm_phy_get(&dev->dev,
-						phy_name);
-				if (IS_ERR(priv->phys[phy_num])) {
-					err = PTR_ERR(priv->phys[phy_num]);
-					if ((priv->num_phys > 1) ||
-					    (err == -EPROBE_DEFER))
-						goto err_put_hcd;
-					priv->phys[phy_num] = NULL;
-				}
+			priv->phys[phy_num] = devm_of_phy_get_by_index(
+					&dev->dev, dev->dev.of_node, phy_num);
+			if (IS_ERR(priv->phys[phy_num])) {
+				err = PTR_ERR(priv->phys[phy_num]);
+					goto err_put_hcd;
+			}
 		}
 
 		for (clk = 0; clk < EHCI_MAX_CLKS; clk++) {
Signature · 1 line
1.7.9.5
#3 lore raw

PATCH 3/14 usb: ohci-platform: Use devm_of_phy_get_by_index

In reply to Kishon Vijay Abraham I

From: Arun Ramamurthy <[email protected]>

Getting phys by index instead of phy names so that we do not have to create a naming scheme when multiple phys are present

---
 drivers/usb/host/ohci-platform.c |   69 +++++++++++++-------------------------
 1 file changed, 24 insertions(+), 45 deletions(-)
drivers/usb/host/ohci-platform.c +24 -45
index 185ceee..c2669f18 100644
@@ -57,15 +57,13 @@ static int ohci_platform_power_on(struct platform_device *dev)
 	}
 
 	for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {
-		if (priv->phys[phy_num]) {
-			ret = phy_init(priv->phys[phy_num]);
-			if (ret)
-				goto err_exit_phy;
-			ret = phy_power_on(priv->phys[phy_num]);
-			if (ret) {
-				phy_exit(priv->phys[phy_num]);
-				goto err_exit_phy;
-			}
+		ret = phy_init(priv->phys[phy_num]);
+		if (ret)
+			goto err_exit_phy;
+		ret = phy_power_on(priv->phys[phy_num]);
+		if (ret) {
+			phy_exit(priv->phys[phy_num]);
+			goto err_exit_phy;
 		}
 	}
 
@@ -73,10 +71,8 @@ static int ohci_platform_power_on(struct platform_device *dev)
 
 err_exit_phy:
 	while (--phy_num >= 0) {
-		if (priv->phys[phy_num]) {
-			phy_power_off(priv->phys[phy_num]);
-			phy_exit(priv->phys[phy_num]);
-		}
+		phy_power_off(priv->phys[phy_num]);
+		phy_exit(priv->phys[phy_num]);
 	}
 err_disable_clks:
 	while (--clk >= 0)
@@ -92,10 +88,8 @@ static void ohci_platform_power_off(struct platform_device *dev)
 	int clk, phy_num;
 
 	for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {
-		if (priv->phys[phy_num]) {
-			phy_power_off(priv->phys[phy_num]);
-			phy_exit(priv->phys[phy_num]);
-		}
+		phy_power_off(priv->phys[phy_num]);
+		phy_exit(priv->phys[phy_num]);
 	}
 
 	for (clk = OHCI_MAX_CLKS - 1; clk >= 0; clk--)
@@ -123,7 +117,6 @@ static int ohci_platform_probe(struct platform_device *dev)
 	struct usb_ohci_pdata *pdata = dev_get_platdata(&dev->dev);
 	struct ohci_platform_priv *priv;
 	struct ohci_hcd *ohci;
-	const char *phy_name;
 	int err, irq, phy_num, clk = 0;
 
 	if (usb_disabled())
@@ -174,36 +167,22 @@ static int ohci_platform_probe(struct platform_device *dev)
 
 		priv->num_phys = of_count_phandle_with_args(dev->dev.of_node,
 				"phys", "#phy-cells");
-		priv->num_phys = priv->num_phys > 0 ? priv->num_phys : 1;
 
-		priv->phys = devm_kcalloc(&dev->dev, priv->num_phys,
-				sizeof(struct phy *), GFP_KERNEL);
-		if (!priv->phys)
-			return -ENOMEM;
+		if (priv->num_phys > 0) {
+			priv->phys = devm_kcalloc(&dev->dev, priv->num_phys,
+					    sizeof(struct phy *), GFP_KERNEL);
+			if (!priv->phys)
+				return -ENOMEM;
+		} else
+			priv->num_phys = 0;
 
 		for (phy_num = 0; phy_num < priv->num_phys; phy_num++) {
-				err = of_property_read_string_index(
-						dev->dev.of_node,
-						"phy-names", phy_num,
-						&phy_name);
-
-				if (err < 0) {
-					if (priv->num_phys > 1) {
-						dev_err(&dev->dev, "phy-names not provided");
-						goto err_put_hcd;
-					} else
-						phy_name = "usb";
-				}
-
-				priv->phys[phy_num] = devm_phy_get(&dev->dev,
-						phy_name);
-				if (IS_ERR(priv->phys[phy_num])) {
-					err = PTR_ERR(priv->phys[phy_num]);
-					if ((priv->num_phys > 1) ||
-					    (err == -EPROBE_DEFER))
-						goto err_put_hcd;
-					priv->phys[phy_num] = NULL;
-				}
+			priv->phys[phy_num] = devm_of_phy_get_by_index(
+					&dev->dev, dev->dev.of_node, phy_num);
+			if (IS_ERR(priv->phys[phy_num])) {
+				err = PTR_ERR(priv->phys[phy_num]);
+				goto err_put_hcd;
+			}
 		}
 
 		for (clk = 0; clk < OHCI_MAX_CLKS; clk++) {
Signature · 1 line
1.7.9.5
#4 lore raw

PATCH 4/14 phy: phy-core: allow specifying supply at port level

In reply to Kishon Vijay Abraham I

From: Dmitry Torokhov <[email protected]>

Multi-port phys may have per port power supplies. Let's change phy core to look for supply at the port level when multiple ports are specified. To keep compatibility with the existing device tree board descriptions for single-port phys we will continue looking up the power supply at the parent node level

---
 drivers/phy/phy-core.c |   23 ++++++++++-------------
 1 file changed, 10 insertions(+), 13 deletions(-)
drivers/phy/phy-core.c +10 -13
index 964a84d..5f729bb 100644
@@ -683,16 +683,6 @@ struct phy *phy_create(struct device *dev, struct device_node *node,
 		goto free_phy;
 	}
 
-	/* phy-supply */
-	phy->pwr = regulator_get_optional(dev, "phy");
-	if (IS_ERR(phy->pwr)) {
-		if (PTR_ERR(phy->pwr) == -EPROBE_DEFER) {
-			ret = -EPROBE_DEFER;
-			goto free_ida;
-		}
-		phy->pwr = NULL;
-	}
-
 	device_initialize(&phy->dev);
 	mutex_init(&phy->mutex);
 
@@ -706,6 +696,16 @@ struct phy *phy_create(struct device *dev, struct device_node *node,
 	if (ret)
 		goto put_dev;
 
+	/* phy-supply */
+	phy->pwr = regulator_get_optional(&phy->dev, "phy");
+	if (IS_ERR(phy->pwr)) {
+		ret = PTR_ERR(phy->pwr);
+		if (ret == -EPROBE_DEFER)
+			goto put_dev;
+
+		phy->pwr = NULL;
+	}
+
 	ret = device_add(&phy->dev);
 	if (ret)
 		goto put_dev;
@@ -721,9 +721,6 @@ put_dev:
 	put_device(&phy->dev);  /* calls phy_release() which frees resources */
 	return ERR_PTR(ret);
 
-free_ida:
-	ida_simple_remove(&phy_ida, phy->id);
-
 free_phy:
 	kfree(phy);
 	return ERR_PTR(ret);
Signature · 1 line
1.7.9.5
#5 lore raw

PATCH 5/14 phy: miphy28lp: fix sparse warnings

In reply to Kishon Vijay Abraham I

From: Felipe Balbi <[email protected]>

Add missing __iomem annotation to the base address so Sparse doesn't complain.

---
 drivers/phy/phy-miphy28lp.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/phy-miphy28lp.c +2 -2
index c4cc11d..58d5339 100644
@@ -367,7 +367,7 @@ static struct miphy28lp_pll_gen pcie_pll_gen[] = {
 
 static inline void miphy28lp_set_reset(struct miphy28lp_phy *miphy_phy)
 {
-	void *base = miphy_phy->base;
+	void __iomem *base = miphy_phy->base;
 	u8 val;
 
 	/* Putting Macro in reset */
@@ -391,7 +391,7 @@ static inline void miphy28lp_set_reset(struct miphy28lp_phy *miphy_phy)
 static inline void miphy28lp_pll_calibration(struct miphy28lp_phy *miphy_phy,
 		struct pll_ratio *pll_ratio)
 {
-	void *base = miphy_phy->base;
+	void __iomem *base = miphy_phy->base;
 	u8 val;
 
 	/* Applying PLL Settings */
Signature · 1 line
1.7.9.5
#6 lore raw

PATCH 6/14 phy: miphy365x: fix sparse warnings

In reply to Kishon Vijay Abraham I

From: Felipe Balbi <[email protected]>

Add missing 'static' modifier so sparse
won't complain anymore.

---
 drivers/phy/phy-miphy365x.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/phy/phy-miphy365x.c +2 -2
index 019c2d7..ba6993d 100644
@@ -441,8 +441,8 @@ static int miphy365x_init(struct phy *phy)
 	return ret;
 }
 
-int miphy365x_get_addr(struct device *dev, struct miphy365x_phy *miphy_phy,
-		       int index)
+static int miphy365x_get_addr(struct device *dev,
+		struct miphy365x_phy *miphy_phy, int index)
 {
 	struct device_node *phynode = miphy_phy->phy->dev.of_node;
 	const char *name;
Signature · 1 line
1.7.9.5
#7 lore raw

PATCH 7/14 phy: core: Check requested PHY status in _of_phy_get()

In reply to Kishon Vijay Abraham I

From: Axel Lin <[email protected]>

This is a common checking in various drivers, so move the checking to _of_phy_get().

---
 drivers/phy/phy-core.c      |   12 ++++++++++--
 drivers/phy/phy-miphy28lp.c |    5 -----
 drivers/phy/phy-miphy365x.c |    5 -----
 drivers/phy/phy-rcar-gen2.c |    5 -----
 4 files changed, 10 insertions(+), 17 deletions(-)
drivers/phy/phy-core.c +10 -2
index 5f729bb..7d535db 100644
@@ -367,13 +367,21 @@ static struct phy *_of_phy_get(struct device_node *np, int index)
 	phy_provider = of_phy_provider_lookup(args.np);
 	if (IS_ERR(phy_provider) || !try_module_get(phy_provider->owner)) {
 		phy = ERR_PTR(-EPROBE_DEFER);
-		goto err0;
+		goto out_unlock;
+	}
+
+	if (!of_device_is_available(args.np)) {
+		dev_warn(phy_provider->dev, "Requested PHY is disabled\n");
+		phy = ERR_PTR(-ENODEV);
+		goto out_put_module;
 	}
 
 	phy = phy_provider->of_xlate(phy_provider->dev, &args);
+
+out_put_module:
 	module_put(phy_provider->owner);
 
-err0:
+out_unlock:
 	mutex_unlock(&phy_provider_mutex);
 	of_node_put(args.np);
 
drivers/phy/phy-miphy28lp.c +0 -5
index 58d5339..5e257ef 100644
@@ -1107,11 +1107,6 @@ static struct phy *miphy28lp_xlate(struct device *dev,
 	struct device_node *phynode = args->np;
 	int ret, index = 0;
 
-	if (!of_device_is_available(phynode)) {
-		dev_warn(dev, "Requested PHY is disabled\n");
-		return ERR_PTR(-ENODEV);
-	}
-
 	if (args->args_count != 1) {
 		dev_err(dev, "Invalid number of cells in 'phy' property\n");
 		return ERR_PTR(-EINVAL);
drivers/phy/phy-miphy365x.c +0 -5
index ba6993d..0ff354d 100644
@@ -476,11 +476,6 @@ static struct phy *miphy365x_xlate(struct device *dev,
 	struct device_node *phynode = args->np;
 	int ret, index;
 
-	if (!of_device_is_available(phynode)) {
-		dev_warn(dev, "Requested PHY is disabled\n");
-		return ERR_PTR(-ENODEV);
-	}
-
 	if (args->args_count != 1) {
 		dev_err(dev, "Invalid number of cells in 'phy' property\n");
 		return ERR_PTR(-EINVAL);
drivers/phy/phy-rcar-gen2.c +0 -5
index 778276a..f47bfd8 100644
@@ -206,11 +206,6 @@ static struct phy *rcar_gen2_phy_xlate(struct device *dev,
 	struct device_node *np = args->np;
 	int i;
 
-	if (!of_device_is_available(np)) {
-		dev_warn(dev, "Requested PHY is disabled\n");
-		return ERR_PTR(-ENODEV);
-	}
-
 	drv = dev_get_drvdata(dev);
 	if (!drv)
 		return ERR_PTR(-EINVAL);
Signature · 1 line
1.7.9.5
#8 lore raw

PATCH 8/14 phy: rcar-gen2: Add support for R-Car E2

In reply to Kishon Vijay Abraham I

From: Yoshihiro Shimoda <[email protected]>

This patch adds a compatible string to support for R-Car E2.

---
 .../devicetree/bindings/phy/rcar-gen2-phy.txt      |    1 +
 drivers/phy/phy-rcar-gen2.c                        |    1 +
 2 files changed, 2 insertions(+)
Documentation/devicetree/bindings/phy/rcar-gen2-phy.txt +1 -0
index 00fc52a..d564ba4 100644
@@ -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>.
drivers/phy/phy-rcar-gen2.c +1 -0
index f47bfd8..0050301 100644
@@ -195,6 +195,7 @@ static struct phy_ops rcar_gen2_phy_ops = {
 static const struct of_device_id rcar_gen2_phy_match_table[] = {
 	{ .compatible = "renesas,usb-phy-r8a7790" },
 	{ .compatible = "renesas,usb-phy-r8a7791" },
+	{ .compatible = "renesas,usb-phy-r8a7794" },
 	{ }
 };
 MODULE_DEVICE_TABLE(of, rcar_gen2_phy_match_table);
Signature · 1 line
1.7.9.5
#9 lore raw

PATCH 9/14 Documentation: devicetree: add Broadcom SATA PHY binding

In reply to Kishon Vijay Abraham I

From: Brian Norris <[email protected]>

For 28nm STB chips, based on BCM7445.

---
 .../bindings/phy/brcm,brcmstb-sata-phy.txt         |   40 ++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt
Documentation/devicetree/bindings/phy/brcm,brcmstb-sata-phy.txt new file +40 -0
new file mode 100644
index 0000000..7f81ef9
@@ -0,0 +1,40 @@
+* 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>;
+		};
+	};
Signature · 1 line
1.7.9.5
#10 lore raw

PATCH 10/14 phy: add Broadcom SATA3 PHY driver for Broadcom STB SoCs

In reply to Kishon Vijay Abraham I

From: Brian Norris <[email protected]>

Supports up to two ports which can each be powered on/off and configured independently.

---
 drivers/phy/Kconfig            |    9 ++
 drivers/phy/Makefile           |    1 +
 drivers/phy/phy-brcmstb-sata.c |  216 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 226 insertions(+)
 create mode 100644 drivers/phy/phy-brcmstb-sata.c
drivers/phy/Kconfig +9 -0
index a53bd5b..36788b6 100644
@@ -309,4 +309,13 @@ config PHY_QCOM_UFS
 	help
 	  Support for UFS PHY on QCOM chipsets.
 
+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
drivers/phy/Makefile +1 -0
index f126251..c61f3fd 100644
@@ -40,3 +40,4 @@ obj-$(CONFIG_PHY_STIH41X_USB)		+= phy-stih41x-usb.o
 obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs.o
 obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs-qmp-20nm.o
 obj-$(CONFIG_PHY_QCOM_UFS) 	+= phy-qcom-ufs-qmp-14nm.o
+obj-$(CONFIG_PHY_BRCMSTB_SATA)		+= phy-brcmstb-sata.o
drivers/phy/phy-brcmstb-sata.c new file +216 -0

216 lines not on this page · raw message

Signature · 1 line
1.7.9.5
#11 lore raw

PATCH 11/14 phy: twl4030-usb: make runtime pm more reliable.

In reply to Kishon Vijay Abraham I

From: NeilBrown <[email protected]>

A construct like:

        if (pm_runtime_suspended(twl->dev))
               pm_runtime_get_sync(twl->dev);

is against the spirit of the runtime_pm interface as it makes the internal refcounting useless.

In this case it is also racy, particularly as 'put_autosuspend' is used to drop a reference.
When that happens a timer is started and the device is runtime-suspended after the timeout.
If the above code runs in this window, the device will not be found to be suspended so no pm_runtime reference is taken. When the timer expires the device will be suspended, which is against the intention of the code.

So be more direct is taking and dropping references. If twl->linkstat is VBUS_VALID or ID_GROUND, then hold a pm_runtime reference, otherwise don't.
Define "cable_present()" to test for this condition.

---
 drivers/phy/phy-twl4030-usb.c |   29 ++++++++++++++++++++---------
 1 file changed, 20 insertions(+), 9 deletions(-)
drivers/phy/phy-twl4030-usb.c +20 -9
index bc42d6a..3078f80 100644
@@ -144,6 +144,16 @@
 #define PMBR1				0x0D
 #define GPIO_USB_4PIN_ULPI_2430C	(3 << 0)
 
+/*
+ * If VBUS is valid or ID is ground, then we know a
+ * cable is present and we need to be runtime-enabled
+ */
+static inline bool cable_present(enum omap_musb_vbus_id_status stat)
+{
+	return stat == OMAP_MUSB_VBUS_VALID ||
+		stat == OMAP_MUSB_ID_GROUND;
+}
+
 struct twl4030_usb {
 	struct usb_phy		phy;
 	struct device		*dev;
@@ -536,8 +546,10 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
 
 	mutex_lock(&twl->lock);
 	if (status >= 0 && status != twl->linkstat) {
+		status_changed =
+			cable_present(twl->linkstat) !=
+			cable_present(status);
 		twl->linkstat = status;
-		status_changed = true;
 	}
 	mutex_unlock(&twl->lock);
 
@@ -553,15 +565,11 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
 		 * USB_LINK_VBUS state.  musb_hdrc won't care until it
 		 * starts to handle softconnect right.
 		 */
-		if ((status == OMAP_MUSB_VBUS_VALID) ||
-		    (status == OMAP_MUSB_ID_GROUND)) {
-			if (pm_runtime_suspended(twl->dev))
-				pm_runtime_get_sync(twl->dev);
+		if (cable_present(status)) {
+			pm_runtime_get_sync(twl->dev);
 		} else {
-			if (pm_runtime_active(twl->dev)) {
-				pm_runtime_mark_last_busy(twl->dev);
-				pm_runtime_put_autosuspend(twl->dev);
-			}
+			pm_runtime_mark_last_busy(twl->dev);
+			pm_runtime_put_autosuspend(twl->dev);
 		}
 		omap_musb_mailbox(status);
 	}
@@ -767,6 +775,9 @@ static int twl4030_usb_remove(struct platform_device *pdev)
 
 	/* disable complete OTG block */
 	twl4030_usb_clear_bits(twl, POWER_CTRL, POWER_CTRL_OTG_ENAB);
+
+	if (cable_present(twl->linkstat))
+		pm_runtime_put_noidle(twl->dev);
 	pm_runtime_mark_last_busy(twl->dev);
 	pm_runtime_put(twl->dev);
 
Signature · 1 line
1.7.9.5
#12 lore raw

PATCH 12/14 phy: twl4030-usb: remove pointless 'suspended' test in 'suspend' callback.

In reply to Kishon Vijay Abraham I

From: NeilBrown <[email protected]>

When the runtime_suspend callback is running, 'runtime_status' is always RPM_SUSPENDING, so pm_runtime_suspended() will always fail.
Similarly while the runtime_resume callback is running 'runtime_status' is RPM_RESUMING, so pm_runtime_active() will always fail.

So remove these two pointless tests.

---
 drivers/phy/phy-twl4030-usb.c |    4 ----
 1 file changed, 4 deletions(-)
drivers/phy/phy-twl4030-usb.c +0 -4
index 3078f80..590c2b1 100644
@@ -396,8 +396,6 @@ static int twl4030_usb_runtime_suspend(struct device *dev)
 	struct twl4030_usb *twl = dev_get_drvdata(dev);
 
 	dev_dbg(twl->dev, "%s\n", __func__);
-	if (pm_runtime_suspended(dev))
-		return 0;
 
 	__twl4030_phy_power(twl, 0);
 	regulator_disable(twl->usb1v5);
@@ -413,8 +411,6 @@ static int twl4030_usb_runtime_resume(struct device *dev)
 	int res;
 
 	dev_dbg(twl->dev, "%s\n", __func__);
-	if (pm_runtime_active(dev))
-		return 0;
 
 	res = regulator_enable(twl->usb3v1);
 	if (res)
Signature · 1 line
1.7.9.5
#13 lore raw

PATCH 13/14 phy: twl4030-usb: remove incorrect pm_runtime_get_sync() in probe function.

In reply to Kishon Vijay Abraham I

From: NeilBrown <[email protected]>

The USB phy should initialize with power-off, and will be powered on by the USB system when a cable connection is detected.

Having this pm_runtime_get_sync() during probe causes the phy to *always* be powered on.
Removing it returns to sensible power management.

Fixes 96be39ab34b77c6f6f5cd6ae03aac6c6449ee5c4
---
 drivers/phy/phy-twl4030-usb.c |    1 -
 1 file changed, 1 deletion(-)
drivers/phy/phy-twl4030-usb.c +0 -1
index 590c2b1..3a707dd 100644
@@ -715,7 +715,6 @@ static int twl4030_usb_probe(struct platform_device *pdev)
 	pm_runtime_use_autosuspend(&pdev->dev);
 	pm_runtime_set_autosuspend_delay(&pdev->dev, 2000);
 	pm_runtime_enable(&pdev->dev);
-	pm_runtime_get_sync(&pdev->dev);
 
 	/* Our job is to use irqs and status from the power module
 	 * to keep the transceiver disabled when nothing's connected.
Signature · 1 line
1.7.9.5
#14 lore raw

PATCH 14/14 phy: twl4030-usb: add ABI documentation

In reply to Kishon Vijay Abraham I

From: NeilBrown <[email protected]>

This driver device one local attribute: vbus.
Describe that in Documentation/ABI/testing/sysfs-platform/twl4030-usb.

---
 .../ABI/testing/sysfs-platform-twl4030-usb         |    8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 Documentation/ABI/testing/sysfs-platform-twl4030-usb
Documentation/ABI/testing/sysfs-platform-twl4030-usb new file +8 -0
new file mode 100644
index 0000000..512c51b
@@ -0,0 +1,8 @@
+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.
Signature · 1 line
1.7.9.5
maintainer
#15 lore raw
In reply to Kishon Vijay Abraham I
Quoted 5 lines · Kishon Vijay Abraham I

Hi Greg,

Here's the PHY pull request for 4.2 merge window. Please find below the list of changes that goes in this pull request.

Quoted 7 lines

There was a merge conflict in Makefile and Kconfig while trying to merge with your usb-next branch. It's because one of the PHY drivers (TUSB1210) went via balbi's tree due to it's dependecy with USB_ULPI_BUS and it conflicts with BRCMSTB_SATA. The resolution should have both TUSB1210 and BRCMSTB_SATA present.

Let me know If I have to change something.

Nope, that should be fine. I've pulled and pushed out the tree now, please verify I did the merge correctly.

thanks,

greg k-h

#16 lore raw

Hi Greg,

Quoted 12 lines · Greg KH
Quoted 11 lines · Kishon Vijay Abraham I

Hi Greg,

Here's the PHY pull request for 4.2 merge window. Please find below the list of changes that goes in this pull request.

There was a merge conflict in Makefile and Kconfig while trying to merge with your usb-next branch. It's because one of the PHY drivers (TUSB1210) went via balbi's tree due to it's dependecy with USB_ULPI_BUS and it conflicts with BRCMSTB_SATA. The resolution should have both TUSB1210 and BRCMSTB_SATA present.

Quoted 4 lines
Quoted 1 line

Let me know If I have to change something.

Nope, that should be fine. I've pulled and pushed out the tree now, please verify I did the merge correctly.

The merge was correct.

Thanks
Kishon