phy: Add new Exynos USB 2.0 PHY driver

Previously the of_phy_get function took a struct device * and was declared static. It was impossible to call it from another driver and thus it was impossible to get phy defined for a given node. The old function was renamed to _of_phy_get and was left for internal use. of_phy_get function was added and it was exported. The function enables to get a phy for a given device tree node.

Signed-off-by Kamil Debski <[email protected]>

---
  drivers/phy/phy-core.c  |   45 ++++++++++++++++++++++++++++++++++++---------
  include/linux/phy/phy.h |    1 +
  2 files changed, 37 insertions(+), 9 deletions(-)

drivers/phy/phy-core.c +36 -9

index 03cf8fb..d6f8c34 100644
@@ -240,8 +240,8 @@ out:
  EXPORT_SYMBOL_GPL(phy_power_off);
 
  /**
- * of_phy_get() - lookup and obtain a reference to a phy by phandle
- * @dev: device that requests this phy
+ * _of_phy_get() - lookup and obtain a reference to a phy by phandle
+ * @np: device_node for which to get the phy
   * @index: the index of the phy
   *
   * Returns the phy associated with the given phandle value,

@@ -250,20 +250,17 @@ EXPORT_SYMBOL_GPL(phy_power_off);
   * not yet loaded. This function uses of_xlate call back function provided
   * while registering the phy_provider to find the phy instance.
   */
-static struct phy *of_phy_get(struct device *dev, int index)
+static struct phy *_of_phy_get(struct device_node *np, int index)
  {
  	int ret;
  	struct phy_provider *phy_provider;
  	struct phy *phy = NULL;
  	struct of_phandle_args args;
 
-	ret = of_parse_phandle_with_args(dev->of_node, "phys", "#phy-cells",
+	ret = of_parse_phandle_with_args(np, "phys", "#phy-cells",
  		index, &args);
-	if (ret) {
-		dev_dbg(dev, "failed to get phy in %s node\n",
-			dev->of_node->full_name);
+	if (ret)
  		return ERR_PTR(-ENODEV);
-	}
 
  	mutex_lock(&phy_provider_mutex);
  	phy_provider = of_phy_provider_lookup(args.np);

@@ -283,6 +280,36 @@ err0:
  }
 
  /**
+ * of_phy_get() - lookup and obtain a reference to a phy using a device_node.
+ * @np: device_node for which to get the phy
+ * @con_id: name of the phy from device's point of view
+ *
+ * Returns the phy driver, after getting a refcount to it; or
+ * -ENODEV if there is no such phy. The caller is responsible for
+ * calling phy_put() to release that count.
+ */
+struct phy *of_phy_get(struct device_node *np, const char *con_id)
+{
+	struct phy *phy = NULL;
+	int index = 0;
+
+	if (con_id)
+		index = of_property_match_string(np, "phy-names", con_id);
+
+	phy = _of_phy_get(np, index);
+	if (IS_ERR(phy))
+		return phy;
+
+	if (!try_module_get(phy->ops->owner))
+		return ERR_PTR(-EPROBE_DEFER);
+
+	get_device(&phy->dev);
+
+	return phy;
+}
+EXPORT_SYMBOL_GPL(of_phy_get);
+
+/**
   * phy_put() - release the PHY
   * @phy: the phy returned by phy_get()
   *

@@ -370,7 +397,7 @@ struct phy *phy_get(struct device *dev, const char *string)
  	if (dev->of_node) {
  		index = of_property_match_string(dev->of_node, "phy-names",
  			string);
-		phy = of_phy_get(dev, index);
+		phy = _of_phy_get(dev->of_node, index);
  		if (IS_ERR(phy)) {
  			dev_err(dev, "unable to find phy\n");
  			return phy;

include/linux/phy/phy.h +0 -0

index 6d72269..bcb6274 100644

Adding devm_of_phy_get will allow to get phys by supplying a pointer to the struct device_node instead of struct device.

Signed-off-by Kamil Debski <[email protected]>

---
  drivers/phy/phy-core.c  |   31 +++++++++++++++++++++++++++++++
  include/linux/phy/phy.h |    2 ++
  2 files changed, 33 insertions(+)

drivers/phy/phy-core.c +31 -0

index d6f8c34..0551cc3 100644
@@ -450,6 +450,37 @@ struct phy *devm_phy_get(struct device *dev, const char *string)
  EXPORT_SYMBOL_GPL(devm_phy_get);
 
  /**
+ * devm_of_phy_get() - lookup and obtain a reference to a phy.
+ * @dev: device that requests this phy
+ * @np: node containing the phy
+ * @con_id: name of the phy from device's point of view
+ *
+ * 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(struct device *dev, struct device_node *np,
+			    const char *con_id)
+{
+	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, con_id);
+	if (!IS_ERR(phy)) {
+		*ptr = phy;
+		devres_add(dev, ptr);
+	} else {
+		devres_free(ptr);
+	}
+
+	return phy;
+}
+EXPORT_SYMBOL_GPL(devm_of_phy_get);
+
+/**
   * phy_create() - create a new phy
   * @dev: device that is creating the new phy
   * @ops: function pointers for performing phy operations

include/linux/phy/phy.h +0 -0

index bcb6274..864914c 100644

include/linux/phy/phy.h +0 -0

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

Add a new driver for the Exynos USB 2.0 PHY. The new driver uses the generic PHY framework. The driver includes support for the Exynos 4x10 and 4x12 SoC families.

Signed-off-by Kamil Debski <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

---
  .../devicetree/bindings/phy/samsung-phy.txt        |   55 ++++
  drivers/phy/Kconfig                                |   29 ++
  drivers/phy/Makefile                               |    3 +
  drivers/phy/phy-exynos4210-usb2.c                  |  257 ++++++++++++++++
  drivers/phy/phy-exynos4212-usb2.c                  |  306 ++++++++++++++++++++
  drivers/phy/phy-samsung-usb2.c                     |  226 +++++++++++++++
  drivers/phy/phy-samsung-usb2.h                     |   67 +++++
  7 files changed, 943 insertions(+)

create mode 100644 drivers/phy/phy-exynos4210-usb2.c create mode 100644 drivers/phy/phy-exynos4212-usb2.c create mode 100644 drivers/phy/phy-samsung-usb2.c create mode 100644 drivers/phy/phy-samsung-usb2.h

drivers/phy/phy-samsung-usb2.h new file +36 -0

new file mode 100644
index 0000000..ab89f91
@@ -0,0 +1,67 @@
+/*
+ * Samsung SoC USB 1.1/2.0 PHY driver
+ *
+ * Copyright (C) 2013 Samsung Electronics Co., Ltd.
+ * Author: Kamil Debski <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _PHY_EXYNOS_USB2_H
+#define _PHY_EXYNOS_USB2_H
+
+#include <linux/clk.h>
+#include <linux/phy/phy.h>
+#include <linux/device.h>
+#include <linux/regmap.h>
+#include <linux/spinlock.h>
+
+#define KHZ 1000
+#define MHZ (KHZ * KHZ)
+
+struct samsung_usb2_phy_driver;
+struct samsung_usb2_phy_instance;
+struct samsung_usb2_phy_config;
+
+struct samsung_usb2_phy_instance {
+	const struct samsung_usb2_common_phy *cfg;
+	struct clk *clk;
+	struct phy *phy;
+	struct samsung_usb2_phy_driver *drv;
+	unsigned long rate;
+	u32 clk_reg_val;
+	bool enabled;
+};

From: Kishon Vijay Abraham I [mailto:[email protected]]
Sent: Monday, January 06, 2014 11:12 AM

Hi,

Quoted 2 lines · Kamil Debski

Add a new driver for the Exynos USB 2.0 PHY. The new driver uses the generic PHY framework. The driver includes support for the Exynos

4x10

Quoted 9 lines

and 4x12 SoC families.

Signed-off-by Kamil Debski <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

---
  .../devicetree/bindings/phy/samsung-phy.txt        |   55 ++++
  drivers/phy/Kconfig                                |   29 ++
  drivers/phy/Makefile                               |    3 +
  drivers/phy/phy-exynos4210-usb2.c                  |  257

++++++++++++++++

Quoted 1 line

  drivers/phy/phy-exynos4212-usb2.c                  |  306

++++++++++++++++++++

Quoted 1 line

  drivers/phy/phy-samsung-usb2.c                     |  226

+++++++++++++++

Quoted 7 lines

  drivers/phy/phy-samsung-usb2.h                     |   67 +++++
  7 files changed, 943 insertions(+)

create mode 100644 drivers/phy/phy-exynos4210-usb2.c create mode 100644 drivers/phy/phy-exynos4212-usb2.c create mode 100644 drivers/phy/phy-samsung-usb2.c create mode 100644 drivers/phy/phy-samsung-usb2.h

.
.
<snip>
.
.

Quoted 48 lines

(quoted diff) +0 -0

b/drivers/phy/phy-samsung-usb2.h new file mode 100644 index 0000000..ab89f91

drivers/phy/phy-samsung-usb2.h new file +42 -0

@@ -0,0 +1,67 @@
+/*
+ * Samsung SoC USB 1.1/2.0 PHY driver
+ *
+ * Copyright (C) 2013 Samsung Electronics Co., Ltd.
+ * Author: Kamil Debski <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _PHY_EXYNOS_USB2_H
+#define _PHY_EXYNOS_USB2_H
+
+#include <linux/clk.h>
+#include <linux/phy/phy.h>
+#include <linux/device.h>
+#include <linux/regmap.h>
+#include <linux/spinlock.h>
+
+#define KHZ 1000
+#define MHZ (KHZ * KHZ)
+
+struct samsung_usb2_phy_driver;
+struct samsung_usb2_phy_instance;
+struct samsung_usb2_phy_config;
+
+struct samsung_usb2_phy_instance {
+	const struct samsung_usb2_common_phy *cfg;
+	struct clk *clk;
+	struct phy *phy;
+	struct samsung_usb2_phy_driver *drv;
+	unsigned long rate;
+	u32 clk_reg_val;
+	bool enabled;
+};
+
+struct samsung_usb2_phy_driver {
+	const struct samsung_usb2_phy_config *cfg;
+	struct clk *clk;
+	struct device *dev;

drivers/phy/phy-samsung-usb2.h line 46

Quoted 5 lines

drivers/phy/phy-samsung-usb2.h new file +5 -0

+	void __iomem *reg_phy;
+	struct regmap *reg_pmu;
+	struct regmap *reg_sys;
+	spinlock_t lock;
+	struct samsung_usb2_phy_instance instances[0];

I think having instances as array here would allocate more space while allocating 'samsung_usb2_phy_driver' in 'samsung_usb2_phy_probe'.

Hi,

Quoted 84 lines

From: Kishon Vijay Abraham I [mailto:[email protected]]
Sent: Monday, January 06, 2014 11:12 AM

Hi,

Quoted 2 lines · Kamil Debski

Add a new driver for the Exynos USB 2.0 PHY. The new driver uses the generic PHY framework. The driver includes support for the Exynos

4x10

Quoted 9 lines

and 4x12 SoC families.

Signed-off-by Kamil Debski <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

---
  .../devicetree/bindings/phy/samsung-phy.txt        |   55 ++++
  drivers/phy/Kconfig                                |   29 ++
  drivers/phy/Makefile                               |    3 +
  drivers/phy/phy-exynos4210-usb2.c                  |  257

++++++++++++++++

Quoted 1 line

  drivers/phy/phy-exynos4212-usb2.c                  |  306

++++++++++++++++++++

Quoted 1 line

  drivers/phy/phy-samsung-usb2.c                     |  226

+++++++++++++++

Quoted 7 lines

  drivers/phy/phy-samsung-usb2.h                     |   67 +++++
  7 files changed, 943 insertions(+)

create mode 100644 drivers/phy/phy-exynos4210-usb2.c create mode 100644 drivers/phy/phy-exynos4212-usb2.c create mode 100644 drivers/phy/phy-samsung-usb2.c create mode 100644 drivers/phy/phy-samsung-usb2.h

.
.
<snip>
.
.

Quoted 48 lines

(quoted diff) +0 -0

b/drivers/phy/phy-samsung-usb2.h new file mode 100644 index 0000000..ab89f91

drivers/phy/phy-samsung-usb2.h new file +42 -0

@@ -0,0 +1,67 @@
+/*
+ * Samsung SoC USB 1.1/2.0 PHY driver
+ *
+ * Copyright (C) 2013 Samsung Electronics Co., Ltd.
+ * Author: Kamil Debski <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or
+modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef _PHY_EXYNOS_USB2_H
+#define _PHY_EXYNOS_USB2_H
+
+#include <linux/clk.h>
+#include <linux/phy/phy.h>
+#include <linux/device.h>
+#include <linux/regmap.h>
+#include <linux/spinlock.h>
+
+#define KHZ 1000
+#define MHZ (KHZ * KHZ)
+
+struct samsung_usb2_phy_driver;
+struct samsung_usb2_phy_instance;
+struct samsung_usb2_phy_config;
+
+struct samsung_usb2_phy_instance {
+	const struct samsung_usb2_common_phy *cfg;
+	struct clk *clk;
+	struct phy *phy;
+	struct samsung_usb2_phy_driver *drv;
+	unsigned long rate;
+	u32 clk_reg_val;
+	bool enabled;
+};
+
+struct samsung_usb2_phy_driver {
+	const struct samsung_usb2_phy_config *cfg;
+	struct clk *clk;
+	struct device *dev;

Quoted 9 lines

drivers/phy/phy-samsung-usb2.h line 46

Quoted 5 lines

drivers/phy/phy-samsung-usb2.h new file +5 -0

+	void __iomem *reg_phy;
+	struct regmap *reg_pmu;
+	struct regmap *reg_sys;
+	spinlock_t lock;
+	struct samsung_usb2_phy_instance instances[0];

I think having instances as array here would allocate more space while allocating 'samsung_usb2_phy_driver' in 'samsung_usb2_phy_probe'.

I am not sure if I understand you correctly here. Maybe I will explain what I intended to write. An array with size 0 at the end of a structure takes no space in the structure. The benefit of using it is that after the structure one can allocate a number of the array elements and address them easily. Another option would be placing pointer in the samsung_usb2_phy_instance and allocate memory separately, but this would involve two allocations and a pointer would be always present in the structure.

Best wishes,

Change the phy provider used from the old one using the USB phy framework to a new one using the Generic phy framework.

Signed-off-by Kamil Debski <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

---
 Documentation/devicetree/bindings/usb/usb-ehci.txt |   35 +++++++
 drivers/usb/host/ehci-exynos.c                     |   97 +++++++++++++-------
 2 files changed, 98 insertions(+), 34 deletions(-)

Documentation/devicetree/bindings/usb/usb-ehci.txt +24 -0

index fa18612..413f7cd 100644
@@ -14,6 +14,10 @@ If controller implementation operates with big endian descriptors,
 If both big endian registers and descriptors are used by the controller
 implementation, "big-endian" property can be specified instead of having
 both "big-endian-regs" and "big-endian-desc".
+  - port: if in the SoC there are EHCI phys, they should be listed here.
+One phy per port. Each port should have its reg entry with a consecutive
+number. Also it should contain phys and phy-names entries specifying the
+phy used by the port.
 
 Example (Sequoia 440EPx):
     ehci@e0000300 {

@@ -23,3 +27,34 @@ Example (Sequoia 440EPx):
           reg = <0 e0000300 90 0 e0000390 70>;
           big-endian;
    };
+
+Example (Exynos 4212):
+    ehci@12580000 {
+        compatible = "samsung,exynos4210-ehci";
+        reg = <0x12580000 0x20000>;
+        interrupts = <0 70 0>;
+        clocks = <&clock 304>, <&clock 305>;
+        clock-names = "usbhost", "otg";
+        status = "disabled";
+        #address-cells = <1>;
+        #size-cells = <0>;
+        port@0 {
+            reg = <0>;
+            phys = <&usb2phy 1>;
+            phy-names = "host";
+            status = "disabled";
+        };
+        port@1 {
+            reg = <1>;
+            phys = <&usb2phy 2>;

Documentation/devicetree/bindings/usb/usb-ehci.txt +1 -0

+

drivers/usb/host/ehci-exynos.c +5 -3

index d1d8c47..7c35501 100644
@@ -19,12 +19,12 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+#include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/usb/phy.h>
 #include <linux/usb/samsung_usb_phy.h>
 #include <linux/usb.h>
 #include <linux/usb/hcd.h>
-#include <linux/usb/otg.h>
 
 #include "ehci.h"
 

@@ -42,10 +42,10 @@
 static const char hcd_name[] = "ehci-exynos";
 static struct hc_driver __read_mostly exynos_ehci_hc_driver;
 
+#define PHY_NUMBER 3
 struct exynos_ehci_hcd {
        struct clk *clk;
-       struct usb_phy *phy;
-       struct usb_otg *otg;
+       struct phy *phy[PHY_NUMBER];
 };
 
 #define to_exynos_ehci(hcd) (struct exynos_ehci_hcd *)(hcd_to_ehci(hcd)->priv)

@@ -69,13 +69,43 @@ static void exynos_setup_vbus_gpio(struct platform_device *pdev)
                dev_err(dev, "can't request ehci vbus gpio %d", gpio);
 }
 
+static int exynos_phys_on(struct phy *p[])
+{

drivers/usb/host/ehci-exynos.c +47 -26

+
+       return ret;
+}
+
+static int exynos_phys_off(struct phy *p[])
+{
+       int i;
+       int ret = 0;
+
+       for (i = 0; ret == 0 && i < PHY_NUMBER; i++)
+               if (p[i])
+                       ret = phy_power_off(p[i]);
+
+       return ret;
+}
+
 static int exynos_ehci_probe(struct platform_device *pdev)
 {
        struct exynos_ehci_hcd *exynos_ehci;
        struct usb_hcd *hcd;
        struct ehci_hcd *ehci;
        struct resource *res;
-       struct usb_phy *phy;
+       struct phy *phy;
+       struct device_node *child;
+       int phy_number;
        int irq;
        int err;
 

@@ -102,14 +132,26 @@ static int exynos_ehci_probe(struct platform_device *pdev)
                                        "samsung,exynos5440-ehci"))
                goto skip_phy;
 
-       phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
-       if (IS_ERR(phy)) {
-               usb_put_hcd(hcd);
-               dev_warn(&pdev->dev, "no platform data or transceiver defined\n");
-               return -EPROBE_DEFER;
-       } else {
-               exynos_ehci->phy = phy;
-               exynos_ehci->otg = phy->otg;
+       for_each_available_child_of_node(pdev->dev.of_node, child) {
+               err = of_property_read_u32(child, "reg", &phy_number);
+               if (err) {
+                       dev_err(&pdev->dev, "Failed to parse device tree\n");
+                       of_node_put(child);
+                       return err;
+               }
+               if (phy_number >= PHY_NUMBER) {
+                       dev_err(&pdev->dev, "Failed to parse device tree - number out of range\n");
+                       of_node_put(child);
+                       return -EINVAL;
+               }
+               phy = devm_of_phy_get(&pdev->dev, child, 0);
+               of_node_put(child);
+               if (IS_ERR(phy)) {
+                       dev_err(&pdev->dev, "Failed to get phy number %d",
+                                                               phy_number);
+                       return PTR_ERR(phy);
+               }
+               exynos_ehci->phy[phy_number] = phy;
        }
 
 skip_phy:

@@ -149,11 +191,11 @@ skip_phy:
                goto fail_io;
        }
 
-       if (exynos_ehci->otg)
-               exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd->self);
-
-       if (exynos_ehci->phy)
-               usb_phy_init(exynos_ehci->phy);
+       err = exynos_phys_on(exynos_ehci->phy);
+       if (err) {
+               dev_err(&pdev->dev, "Failed to enabled phys\n");
+               goto fail_io;
+       }
 
        ehci = hcd_to_ehci(hcd);
        ehci->caps = hcd->regs;

@@ -173,8 +215,7 @@ skip_phy:
        return 0;
 
 fail_add_hcd:
-       if (exynos_ehci->phy)
-               usb_phy_shutdown(exynos_ehci->phy);
+       exynos_phys_off(exynos_ehci->phy);
 fail_io:
        clk_disable_unprepare(exynos_ehci->clk);
 fail_clk:

@@ -189,11 +230,7 @@ static int exynos_ehci_remove(struct platform_device *pdev)
 
        usb_remove_hcd(hcd);
 
-       if (exynos_ehci->otg)
-               exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd->self);
-
-       if (exynos_ehci->phy)
-               usb_phy_shutdown(exynos_ehci->phy);
+       exynos_phys_off(exynos_ehci->phy);
 
        clk_disable_unprepare(exynos_ehci->clk);
 

@@ -213,11 +250,7 @@ static int exynos_ehci_suspend(struct device *dev)
 
        rc = ehci_suspend(hcd, do_wakeup);
 
-       if (exynos_ehci->otg)
-               exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd->self);
-
-       if (exynos_ehci->phy)
-               usb_phy_shutdown(exynos_ehci->phy);
+       exynos_phys_off(exynos_ehci->phy);
 
        clk_disable_unprepare(exynos_ehci->clk);
 

@@ -231,11 +264,7 @@ static int exynos_ehci_resume(struct device *dev)
 
        clk_prepare_enable(exynos_ehci->clk);
 

1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Vivek Gautam [mailto:[email protected]]
Sent: Thursday, December 26, 2013 11:14 AM

Hi Kamil,

On Fri, Dec 20, 2013 at 6:54 PM, Kamil Debski <[email protected]> wrote:

Quoted 5 lines

Change the phy provider used from the old one using the USB phy framework to a new one using the Generic phy framework.

Signed-off-by Kamil Debski <[email protected]>

Signed-off-by Kyungmin Park <[email protected]>

Commit title:
s/ehci-s5p/ehci-exynos

Quoted 4 lines

---
 Documentation/devicetree/bindings/usb/usb-ehci.txt |   35 +++++++
 drivers/usb/host/ehci-exynos.c                     |   97

+++++++++++++-------

Quoted 11 lines

 2 files changed, 98 insertions(+), 34 deletions(-)

Documentation/devicetree/bindings/usb/usb-ehci.txt +0 -0

index fa18612..413f7cd 100644
@@ -14,6 +14,10 @@ If controller implementation operates with big

endian descriptors, If both big endian registers and descriptors are used by the controller implementation, "big-endian" property can be specified instead of having both "big-endian-regs" and "big-endian-

desc".

Quoted 1 line

+ - port: if in the SoC there are EHCI phys, they should be listed

here.

Documentation/devicetree/bindings/usb/usb-ehci.txt

Quoted 2 lines

Documentation/devicetree/bindings/usb/usb-ehci.txt +2 -0

+One phy per port. Each port should have its reg entry with a
+consecutive number. Also it should contain phys and phy-names

entries

Quoted 34 lines

Documentation/devicetree/bindings/usb/usb-ehci.txt +27 -0

+specifying the phy used by the port.
 
 Example (Sequoia 440EPx):
     ehci@e0000300 {

@@ -23,3 +27,34 @@ Example (Sequoia 440EPx):
           reg = <0 e0000300 90 0 e0000390 70>;
           big-endian;
    };
+
+Example (Exynos 4212):
+    ehci@12580000 {
+        compatible = "samsung,exynos4210-ehci";
+        reg = <0x12580000 0x20000>;
+        interrupts = <0 70 0>;
+        clocks = <&clock 304>, <&clock 305>;
+        clock-names = "usbhost", "otg";
+        status = "disabled";
+        #address-cells = <1>;
+        #size-cells = <0>;
+        port@0 {
+            reg = <0>;
+            phys = <&usb2phy 1>;
+            phy-names = "host";
+            status = "disabled";
+        };
+        port@1 {
+            reg = <1>;
+            phys = <&usb2phy 2>;
+            phy-names = "hsic0";
+            status = "disabled";
+        };
+        port@2 {
+            reg = <2>;
+            phys = <&usb2phy 3>;

Documentation/devicetree/bindings/usb/usb-ehci.txt Example (Sequoia 440EPx): · line 59

Quoted 4 lines

Documentation/devicetree/bindings/usb/usb-ehci.txt +4 -0

+            phy-names = "hsic1";
+            status = "disabled";
+        };
+    };

Should we place above documentation in "Documentation/devicetree/bindings/usb/exynos-usb.txt" ? or is it something that i am missing.

Quoted 30 lines

Documentation/devicetree/bindings/usb/usb-ehci.txt +1 -0

+

(quoted diff) +0 -0

b/drivers/usb/host/ehci-exynos.c index d1d8c47..7c35501 100644

drivers/usb/host/ehci-exynos.c +3 -2

@@ -19,12 +19,12 @@
 #include <linux/module.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
+#include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/usb/phy.h>
 #include <linux/usb/samsung_usb_phy.h>  #include <linux/usb.h>
 #include <linux/usb/hcd.h> -#include <linux/usb/otg.h>
 
 #include "ehci.h"
 

@@ -42,10 +42,10 @@
 static const char hcd_name[] = "ehci-exynos";  static struct
 hc_driver __read_mostly exynos_ehci_hc_driver;
 
+#define PHY_NUMBER 3
 struct exynos_ehci_hcd {
        struct clk *clk;
-       struct usb_phy *phy;
-       struct usb_otg *otg;
+       struct phy *phy[PHY_NUMBER];
 };
 
 #define to_exynos_ehci(hcd) (struct exynos_ehci_hcd

Quoted 1 line

*)(hcd_to_ehci(hcd)->priv) @@ -69,13 +69,43 @@ static void

exynos_setup_vbus_gpio(struct platform_device *pdev)

Quoted 1 line

dev_err(dev, "can't request ehci vbus gpio %d",

gpio);

Quoted 2 lines

}

drivers/usb/host/ehci-exynos.c static void exynos_setup_vbus_gpio(struct platform_device *pdev) · line 83

Quoted 11 lines

drivers/usb/host/ehci-exynos.c +11 -0

+static int exynos_phys_on(struct phy *p[]) {
+       int i;
+       int ret = 0;
+
+       for (i = 0; ret == 0 && i < PHY_NUMBER; i++)
+               if (p[i])
+                       ret = phy_power_on(p[i]);
+       if (ret)
+               for (i--; i > 0; i--)
+                       if (p[i])
+                               phy_power_off(p[i]);

So we are turning off, say, port0 phy in case port1 phy power_on fails; can't we still leave a usb2.0 phy(a normal host phy) 'on' in case the HSIC phy fails ?

drivers/usb/host/ehci-exynos.c static int exynos_ehci_probe(struct

Quoted 28 lines

drivers/usb/host/ehci-exynos.c +18 -1

+
+       return ret;
+}
+
+static int exynos_phys_off(struct phy *p[]) {
+       int i;
+       int ret = 0;
+
+       for (i = 0; ret == 0 && i < PHY_NUMBER; i++)
+               if (p[i])
+                       ret = phy_power_off(p[i]);
+
+       return ret;
+}
+
 static int exynos_ehci_probe(struct platform_device *pdev)  {
        struct exynos_ehci_hcd *exynos_ehci;
        struct usb_hcd *hcd;
        struct ehci_hcd *ehci;
        struct resource *res;
-       struct usb_phy *phy;
+       struct phy *phy;
+       struct device_node *child;
+       int phy_number;
        int irq;
        int err;

@@ -102,14 +132,26 @@ static int exynos_ehci_probe(struct

platform_device *pdev)

drivers/usb/host/ehci-exynos.c static int exynos_ehci_probe(struct platform_device *pdev)

Quoted 7 lines

drivers/usb/host/ehci-exynos.c +0 -4

                                        "samsung,exynos5440-ehci"))
                goto skip_phy;
 
-       phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2);
-       if (IS_ERR(phy)) {
-               usb_put_hcd(hcd);
-               dev_warn(&pdev->dev, "no platform data or transceiver

defined\n");

drivers/usb/host/ehci-exynos.c static int exynos_ehci_probe(struct platform_device *pdev)

Quoted 6 lines

drivers/usb/host/ehci-exynos.c +2 -4

-               return -EPROBE_DEFER;
-       } else {
-               exynos_ehci->phy = phy;
-               exynos_ehci->otg = phy->otg;
+       for_each_available_child_of_node(pdev->dev.of_node, child) {
+               err = of_property_read_u32(child, "reg",

&phy_number);

drivers/usb/host/ehci-exynos.c static int exynos_ehci_probe(struct · line 138

Quoted 2 lines

drivers/usb/host/ehci-exynos.c +2 -0

+               if (err) {
+                       dev_err(&pdev->dev, "Failed to parse device

tree\n");

drivers/usb/host/ehci-exynos.c static int exynos_ehci_probe(struct platform_device *pdev)

Quoted 5 lines

drivers/usb/host/ehci-exynos.c +5 -0

+                       of_node_put(child);
+                       return err;
+               }
+               if (phy_number >= PHY_NUMBER) {
+                       dev_err(&pdev->dev, "Failed to parse device

tree - number out of range\n");

drivers/usb/host/ehci-exynos.c static int exynos_ehci_probe(struct platform_device *pdev)

Quoted 7 lines

drivers/usb/host/ehci-exynos.c +7 -0

+                       of_node_put(child);
+                       return -EINVAL;
+               }
+               phy = devm_of_phy_get(&pdev->dev, child, 0);
+               of_node_put(child);
+               if (IS_ERR(phy)) {
+                       dev_err(&pdev->dev, "Failed to get phy number

%d",

drivers/usb/host/ehci-exynos.c static int exynos_ehci_probe(struct · line 151

Quoted 1 line

drivers/usb/host/ehci-exynos.c +1 -0

+

phy_number);

drivers/usb/host/ehci-exynos.c static int exynos_ehci_resume(struct device

Quoted 65 lines

drivers/usb/host/ehci-exynos.c +8 -5

+                       return PTR_ERR(phy);
+               }
+               exynos_ehci->phy[phy_number] = phy;
        }
 
 skip_phy:

@@ -149,11 +191,11 @@ skip_phy:
                goto fail_io;
        }
 
-       if (exynos_ehci->otg)
-               exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd-
 self);
-
-       if (exynos_ehci->phy)
-               usb_phy_init(exynos_ehci->phy);
+       err = exynos_phys_on(exynos_ehci->phy);
+       if (err) {
+               dev_err(&pdev->dev, "Failed to enabled phys\n");
+               goto fail_io;
+       }
 
        ehci = hcd_to_ehci(hcd);

        ehci->caps = hcd->regs;

drivers/usb/host/ehci-exynos.c +2 -7

@@ -173,8 +215,7 @@ skip_phy:
        return 0;
 
 fail_add_hcd:
-       if (exynos_ehci->phy)
-               usb_phy_shutdown(exynos_ehci->phy);
+       exynos_phys_off(exynos_ehci->phy);
 fail_io:
        clk_disable_unprepare(exynos_ehci->clk);
 fail_clk:

@@ -189,11 +230,7 @@ static int exynos_ehci_remove(struct
 platform_device *pdev)
 
        usb_remove_hcd(hcd);
 
-       if (exynos_ehci->otg)
-               exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd-
 self);
-
-       if (exynos_ehci->phy)
-               usb_phy_shutdown(exynos_ehci->phy);
+       exynos_phys_off(exynos_ehci->phy);
 

        clk_disable_unprepare(exynos_ehci->clk);

drivers/usb/host/ehci-exynos.c +1 -5

@@ -213,11 +250,7 @@ static int exynos_ehci_suspend(struct device
 *dev)
 
        rc = ehci_suspend(hcd, do_wakeup);
 
-       if (exynos_ehci->otg)
-               exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd-
 self);
-
-       if (exynos_ehci->phy)
-               usb_phy_shutdown(exynos_ehci->phy);
+       exynos_phys_off(exynos_ehci->phy);
 

        clk_disable_unprepare(exynos_ehci->clk);

drivers/usb/host/ehci-exynos.c +0 -0

@@ -231,11 +264,7 @@ static int exynos_ehci_resume(struct device

*dev)

Quoted 11 lines

drivers/usb/host/ehci-exynos.c +1 -5

        clk_prepare_enable(exynos_ehci->clk);
 
-       if (exynos_ehci->otg)
-               exynos_ehci->otg->set_host(exynos_ehci->otg, &hcd-
 self);
-
-       if (exynos_ehci->phy)
-               usb_phy_init(exynos_ehci->phy);
+       exynos_phys_on(exynos_ehci->phy);
 

Quoted 4 lines

drivers/usb/host/ehci-exynos.c +0 -0

        /* DMA burst Enable */
        writel(EHCI_INSNREG00_ENABLE_DMA_BURST,

EHCI_INSNREG00(hcd->regs));
--

Rest all looks good. :-)
I tested this patch along with other patches in the series on smdk5250.

Tested-by Vivek Gautam <[email protected]>

drivers/phy/phy-exynos5250-usb2.c +6 -0

 #define EXYNOS_5250_HOSTPHYCTRLX_REFCLKSEL_MASK                (0x3 << 23)
+#define EXYNOS_5250_HOSTPHYCTRLX_REFCLKSEL_DEFAULT     (0x2 << 23)
 #define EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_MASK                (0x7f << 16)
+#define EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_12          (0x24 << 16)
+#define EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_15          (0x1c << 16)
+#define EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_16          (0x1a << 16)
+#define EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_19_2                (0x15 << 16)
+#define EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_20          (0x14 << 16)
 #define EXYNOS_5250_HOSTPHYCTRLX_SIDDQ                 BIT(6)
 #define EXYNOS_5250_HOSTPHYCTRLX_FORCESLEEP            BIT(5)
 #define EXYNOS_5250_HOSTPHYCTRLX_FORCESUSPEND          BIT(4)

drivers/phy/phy-exynos5250-usb2.c +15 -5

 {
        struct samsung_usb2_phy_driver *drv = inst->drv;
        u32 ctrl0;
        u32 otg;
        u32 ehci;
        u32 ohci;
+       u32 hsic;
 
        switch (inst->cfg->id) {
        case EXYNOS5250_DEVICE:

@@ -234,6 +241,8 @@ static void exynos5250_phy_pwr(struct samsung_usb2_phy_instance *inst, bool on)
 
                break;
        case EXYNOS5250_HOST:
+       case EXYNOS5250_HSIC0:
+       case EXYNOS5250_HSIC1:
                /* Host registers configuration */
                ctrl0 = readl(drv->reg_phy + EXYNOS_5250_HOSTPHYCTRL0);
                /* The clock */

@@ -279,6 +288,18 @@ static void exynos5250_phy_pwr(struct samsung_usb2_phy_instance *inst, bool on)
                        EXYNOS_5250_USBOTGSYS_LINK_SW_RST_UOTG |
                        EXYNOS_5250_USBOTGSYS_PHYLINK_SW_RESET);
 
+               /* HSIC phy configuration */
+               hsic = (EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_12 |
+                               EXYNOS_5250_HOSTPHYCTRLX_REFCLKSEL_DEFAULT |
+                               EXYNOS_5250_HOSTPHYCTRLX_PHYSWRST);
+               writel(hsic, drv->reg_phy + EXYNOS_5250_HOSTPHYCTRL1);
+               writel(hsic, drv->reg_phy + EXYNOS_5250_HOSTPHYCTRL2);
+               udelay(10);
+               hsic &= ~EXYNOS_5250_HOSTPHYCTRLX_PHYSWRST;
+               writel(hsic, drv->reg_phy + EXYNOS_5250_HOSTPHYCTRL1);
+               writel(hsic, drv->reg_phy + EXYNOS_5250_HOSTPHYCTRL2);
+               udelay(80);
+
                /* Enable EHCI DMA burst */
                ehci = readl(drv->reg_phy + EXYNOS_5250_HOSTEHCICTRL);
                ehci |= EXYNOS_5250_HOSTEHCICTRL_ENAINCRXALIGN |

@@ -295,12 +316,7 @@ static void exynos5250_phy_pwr(struct samsung_usb2_phy_instance *inst, bool on)
 
                break;
        }
-}
-
-static int exynos5250_power_on(struct samsung_usb2_phy_instance *inst)
-{
        inst->enabled = 1;
-       exynos5250_phy_pwr(inst, 1);
        exynos5250_isol(inst, 0);
 
        return 0;

drivers/phy/phy-exynos5250-usb2.c +35 -2

 {
+       struct samsung_usb2_phy_driver *drv = inst->drv;
+       u32 ctrl0;
+       u32 otg;
+       u32 hsic;
+
        inst->enabled = 0;
        exynos5250_isol(inst, 1);
-       exynos5250_phy_pwr(inst, 0);
+
+       switch (inst->cfg->id) {
+       case EXYNOS5250_DEVICE:
+               otg = readl(drv->reg_phy + EXYNOS_5250_USBOTGSYS);
+               otg |= (EXYNOS_5250_USBOTGSYS_FORCE_SUSPEND |
+                       EXYNOS_5250_USBOTGSYS_SIDDQ_UOTG |
+                       EXYNOS_5250_USBOTGSYS_FORCE_SLEEP);
+               writel(otg, drv->reg_phy + EXYNOS_5250_USBOTGSYS);
+               break;
+       case EXYNOS5250_HOST:
+               ctrl0 = readl(drv->reg_phy + EXYNOS_5250_HOSTPHYCTRL0);
+               ctrl0 |= (EXYNOS_5250_HOSTPHYCTRL0_SIDDQ |
+                               EXYNOS_5250_HOSTPHYCTRL0_FORCESUSPEND |
+                               EXYNOS_5250_HOSTPHYCTRL0_FORCESLEEP |
+                               EXYNOS_5250_HOSTPHYCTRL0_PHYSWRST |
+                               EXYNOS_5250_HOSTPHYCTRL0_PHYSWRSTALL);
+               writel(ctrl0, drv->reg_phy + EXYNOS_5250_HOSTPHYCTRL0);
+               break;
+       case EXYNOS5250_HSIC0:
+       case EXYNOS5250_HSIC1:
+               hsic = (EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_12 |
+                               EXYNOS_5250_HOSTPHYCTRLX_REFCLKSEL_DEFAULT |
+                               EXYNOS_5250_HOSTPHYCTRLX_SIDDQ |
+                               EXYNOS_5250_HOSTPHYCTRLX_FORCESLEEP |
+                               EXYNOS_5250_HOSTPHYCTRLX_FORCESUSPEND
+                               );
+               writel(hsic, drv->reg_phy + EXYNOS_5250_HOSTPHYCTRL1);
+               writel(hsic, drv->reg_phy + EXYNOS_5250_HOSTPHYCTRL2);
+               break;
+       }
 
        return 0;
 }
--

1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

From: Vivek Gautam [mailto:[email protected]]
Sent: Thursday, December 26, 2013 11:32 AM

Hi Kamil,

Quoted 6 lines · Kamil Debski

Add support to PHY of USB2 of the Exynos 5250 SoC.

Signed-off-by Kamil Debski <[email protected]>

---
 arch/arm/boot/dts/exynos5250.dtsi |   33 ++++++++++++-------
 drivers/phy/phy-exynos5250-usb2.c |   64

+++++++++++++++++++++++++++++++++----

Quoted 43 lines

 2 files changed, 78 insertions(+), 19 deletions(-)

arch/arm/boot/dts/exynos5250.dtsi +5 -0

index 2f264ad..922e0ed 100644
@@ -163,6 +163,11 @@
                interrupts = <0 47 0>;
        };
 
+       sys_syscon: syscon@10040000 {
+               compatible = "samsung,exynos5250-sys", "syscon";
+               reg = <0x10050000 0x5000>;
+       };
+
        pmu_syscon: syscon@10040000 {
                compatible = "samsung,exynos5250-pmu", "syscon";
                reg = <0x10040000 0x5000>; @@ -505,6 +510,14 @@

                clocks = <&clock 285>;
                clock-names = "usbhost";

arch/arm/boot/dts/exynos5250.dtsi +10 -3

+               #address-cells = <1>;
+               #size-cells = <0>;
+               port@0 {
+                       reg = <0>;
+                       phys = <&usb2_phy 1>;
+                       phy-names = "host";
+                       status = "ok";
+               };
        };
 
        usb@12120000 {

@@ -516,19 +529,15 @@
                clock-names = "usbhost";
        };
 
-       usb2_phy: usbphy@12130000 {
-               compatible = "samsung,exynos5250-usb2phy";
+       usb2_phy: phy@12130000 {
+               compatible = "samsung,exynos5250-usb2-phy";
                reg = <0x12130000 0x100>;
-               clocks = <&clock 1>, <&clock 285>;

arch/arm/boot/dts/exynos5250.dtsi line 535

Quoted 10 lines

arch/arm/boot/dts/exynos5250.dtsi +1 -9

-               clock-names = "ext_xtal", "usbhost";
-               #address-cells = <1>;
-               #size-cells = <1>;
-               ranges;
-
-               usbphy-sys {
-                       reg = <0x10040704 0x8>,
-                             <0x10050230 0x4>;
-               };
+               clocks = <&clock 285>, <&clock 1>, <&clock 1>,

<&clock 1>,

arch/arm/boot/dts/exynos5250.dtsi line 536

Quoted 1 line

arch/arm/boot/dts/exynos5250.dtsi +1 -0

+

<&clock 1>;

arch/arm/boot/dts/exynos5250.dtsi line 537

Quoted 1 line

arch/arm/boot/dts/exynos5250.dtsi +1 -0

+               clock-names = "phy", "device", "host", "hsic0",

"hsic1";

Quoted 5 lines

arch/arm/boot/dts/exynos5250.dtsi +3 -0

+               #phy-cells = <1>;
+               samsung,sysreg-phandle = <&sys_syscon>;
+               samsung,pmureg-phandle = <&pmu_syscon>;
        };
 

drivers/phy/phy-exynos5250-usb2.c

Quoted 6 lines

arch/arm/boot/dts/exynos5250.dtsi +0 -0

        amba {

drivers/phy/phy-exynos5250-usb2.c +0 -0

index b9b3b98..337bf82 100644

Separate patches for dt and driver ?
I think you wanted to move these changes to :
[PATCH v5 7/9] phy: Add Exynos 5250 support to the Exynos USB 2.0 PHY driver

drivers/phy/phy-exynos5250-usb2.c line 58

Quoted 3 lines

drivers/phy/phy-exynos5250-usb2.c +0 -0

@@ -58,7 +58,13 @@
 #define EXYNOS_5250_HOSTPHYCTRL2                       0x20

Shouldn't we leave the naming as EXYNOS_5250_HSICPHYCTRL2 instead of EXYNOS_5250_HOSTPHYCTRL2 ? That will go in sync with the user-manual too.
and similar for EXYNOS_5250_HOSTPHYCTRL1 and below bit definitions too ?

drivers/phy/phy-exynos5250-usb2.c line 59

Quoted 2 lines

drivers/phy/phy-exynos5250-usb2.c +0 -0

 #define EXYNOS_5250_HOSTPHYCTRLX_REFCLKSEL_MASK                (0x3

<< 23)

drivers/phy/phy-exynos5250-usb2.c line 61

Quoted 2 lines

drivers/phy/phy-exynos5250-usb2.c +1 -0

+#define EXYNOS_5250_HOSTPHYCTRLX_REFCLKSEL_DEFAULT     (0x2 << 23)
 #define EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_MASK                (0x7f

<< 16)

drivers/phy/phy-exynos5250-usb2.c

Quoted 4 lines

drivers/phy/phy-exynos5250-usb2.c +4 -0

+#define EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_12          (0x24 << 16)
+#define EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_15          (0x1c << 16)
+#define EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_16          (0x1a << 16)
+#define EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_19_2                (0x15

<< 16)

drivers/phy/phy-exynos5250-usb2.c static void exynos5250_isol(struct

Quoted 5 lines

drivers/phy/phy-exynos5250-usb2.c +1 -0

+#define EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_20          (0x14 << 16)
 #define EXYNOS_5250_HOSTPHYCTRLX_SIDDQ                 BIT(6)
 #define EXYNOS_5250_HOSTPHYCTRLX_FORCESLEEP            BIT(5)
 #define EXYNOS_5250_HOSTPHYCTRLX_FORCESUSPEND          BIT(4)

@@ -191,13 +197,14 @@ static void exynos5250_isol(struct

samsung_usb2_phy_instance *inst, bool on)

drivers/phy/phy-exynos5250-usb2.c static void exynos5250_isol(struct · line 197

Quoted 1 line

drivers/phy/phy-exynos5250-usb2.c +0 -0

        regmap_update_bits(drv->reg_pmu, offset, mask, on ? 0 :

mask);

drivers/phy/phy-exynos5250-usb2.c static void exynos5250_isol(struct · line 202

Quoted 6 lines

drivers/phy/phy-exynos5250-usb2.c +2 -1

 }
 
-static void exynos5250_phy_pwr(struct samsung_usb2_phy_instance
 *inst, bool on)
+static int exynos5250_power_on(struct samsung_usb2_phy_instance
+*inst)

void ? we really don't have much to return in this function.

Quoted 12 lines

drivers/phy/phy-exynos5250-usb2.c +1 -0

 {
        struct samsung_usb2_phy_driver *drv = inst->drv;
        u32 ctrl0;
        u32 otg;
        u32 ehci;
        u32 ohci;
+       u32 hsic;
 
        switch (inst->cfg->id) {
        case EXYNOS5250_DEVICE:

drivers/phy/phy-exynos5250-usb2.c static void exynos5250_phy_pwr(struct · line 248

Quoted 8 lines

drivers/phy/phy-exynos5250-usb2.c +2 -0

@@ -234,6 +241,8 @@ static void exynos5250_phy_pwr(struct
 samsung_usb2_phy_instance *inst, bool on)
 
                break;
        case EXYNOS5250_HOST:
+       case EXYNOS5250_HSIC0:
+       case EXYNOS5250_HSIC1:
                /* Host registers configuration */
                ctrl0 = readl(drv->reg_phy +

EXYNOS_5250_HOSTPHYCTRL0);

drivers/phy/phy-exynos5250-usb2.c static void exynos5250_phy_pwr(struct

Quoted 2 lines

                /* The clock */

drivers/phy/phy-exynos5250-usb2.c +0 -0

@@ -279,6 +288,18 @@ static void exynos5250_phy_pwr(struct

samsung_usb2_phy_instance *inst, bool on)

drivers/phy/phy-exynos5250-usb2.c static void exynos5250_phy_pwr(struct samsung_usb2_phy_instance *inst, bool on) · line 302

Quoted 6 lines

drivers/phy/phy-exynos5250-usb2.c +3 -0

                        EXYNOS_5250_USBOTGSYS_LINK_SW_RST_UOTG |
                        EXYNOS_5250_USBOTGSYS_PHYLINK_SW_RESET);
 
+               /* HSIC phy configuration */
+               hsic = (EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_12 |
+

EXYNOS_5250_HOSTPHYCTRLX_REFCLKSEL_DEFAULT |

drivers/phy/phy-exynos5250-usb2.c static void exynos5250_phy_pwr(struct · line 295

Quoted 2 lines

drivers/phy/phy-exynos5250-usb2.c +2 -0

+                               EXYNOS_5250_HOSTPHYCTRLX_PHYSWRST);
+               writel(hsic, drv->reg_phy +

EXYNOS_5250_HOSTPHYCTRL1);

drivers/phy/phy-exynos5250-usb2.c static void exynos5250_phy_pwr(struct · line 296

Quoted 1 line

drivers/phy/phy-exynos5250-usb2.c +1 -0

+               writel(hsic, drv->reg_phy +

EXYNOS_5250_HOSTPHYCTRL2);

drivers/phy/phy-exynos5250-usb2.c static void exynos5250_phy_pwr(struct samsung_usb2_phy_instance *inst, bool on)

Quoted 3 lines

drivers/phy/phy-exynos5250-usb2.c +3 -0

+               udelay(10);
+               hsic &= ~EXYNOS_5250_HOSTPHYCTRLX_PHYSWRST;
+               writel(hsic, drv->reg_phy +

EXYNOS_5250_HOSTPHYCTRL1);

drivers/phy/phy-exynos5250-usb2.c static void exynos5250_phy_pwr(struct · line 300

Quoted 1 line

drivers/phy/phy-exynos5250-usb2.c +1 -0

+               writel(hsic, drv->reg_phy +

EXYNOS_5250_HOSTPHYCTRL2);

drivers/phy/phy-exynos5250-usb2.c static void exynos5250_phy_pwr(struct samsung_usb2_phy_instance *inst, bool on)

Quoted 4 lines

drivers/phy/phy-exynos5250-usb2.c +2 -0

+               udelay(80);
+
                /* Enable EHCI DMA burst */
                ehci = readl(drv->reg_phy +

EXYNOS_5250_HOSTEHCICTRL);

Quoted 16 lines

drivers/phy/phy-exynos5250-usb2.c +0 -1

                ehci |= EXYNOS_5250_HOSTEHCICTRL_ENAINCRXALIGN | @@
-295,12 +316,7 @@ static void exynos5250_phy_pwr(struct

samsung_usb2_phy_instance *inst, bool on)

                break;
        }

drivers/phy/phy-exynos5250-usb2.c +0 -3

-}
-
-static int exynos5250_power_on(struct samsung_usb2_phy_instance

*inst) -{
        inst->enabled = 1;

drivers/phy/phy-exynos5250-usb2.c +0 -1

-       exynos5250_phy_pwr(inst, 1);
        exynos5250_isol(inst, 0);
 
        return 0;

drivers/phy/phy-exynos5250-usb2.c static int exynos5250_power_on(struct · line 327

Quoted 4 lines

drivers/phy/phy-exynos5250-usb2.c +0 -0

@@ -308,9 +324,43 @@ static int exynos5250_power_on(struct
 samsung_usb2_phy_instance *inst)
 
 static int exynos5250_power_off(struct samsung_usb2_phy_instance
 *inst)

ditto

Quoted 10 lines

drivers/phy/phy-exynos5250-usb2.c +6 -1

 {
+       struct samsung_usb2_phy_driver *drv = inst->drv;
+       u32 ctrl0;
+       u32 otg;
+       u32 hsic;
+
        inst->enabled = 0;
        exynos5250_isol(inst, 1);
-       exynos5250_phy_pwr(inst, 0);
+

drivers/phy/phy-exynos5250-usb2.c static int exynos5250_power_on(struct samsung_usb2_phy_instance *inst)

Quoted 10 lines

drivers/phy/phy-exynos5250-usb2.c +10 -0

+       switch (inst->cfg->id) {
+       case EXYNOS5250_DEVICE:
+               otg = readl(drv->reg_phy + EXYNOS_5250_USBOTGSYS);
+               otg |= (EXYNOS_5250_USBOTGSYS_FORCE_SUSPEND |
+                       EXYNOS_5250_USBOTGSYS_SIDDQ_UOTG |
+                       EXYNOS_5250_USBOTGSYS_FORCE_SLEEP);
+               writel(otg, drv->reg_phy + EXYNOS_5250_USBOTGSYS);
+               break;
+       case EXYNOS5250_HOST:
+               ctrl0 = readl(drv->reg_phy +

EXYNOS_5250_HOSTPHYCTRL0);

drivers/phy/phy-exynos5250-usb2.c static int exynos5250_power_on(struct · line 348

Quoted 2 lines

drivers/phy/phy-exynos5250-usb2.c +2 -0

+               ctrl0 |= (EXYNOS_5250_HOSTPHYCTRL0_SIDDQ |
+                               EXYNOS_5250_HOSTPHYCTRL0_FORCESUSPEND

|

drivers/phy/phy-exynos5250-usb2.c static int exynos5250_power_on(struct samsung_usb2_phy_instance *inst)

Quoted 3 lines

drivers/phy/phy-exynos5250-usb2.c +3 -0

+                               EXYNOS_5250_HOSTPHYCTRL0_FORCESLEEP |
+                               EXYNOS_5250_HOSTPHYCTRL0_PHYSWRST |
+

EXYNOS_5250_HOSTPHYCTRL0_PHYSWRSTALL);

drivers/phy/phy-exynos5250-usb2.c static int exynos5250_power_on(struct · line 352

Quoted 1 line

drivers/phy/phy-exynos5250-usb2.c +1 -0

+               writel(ctrl0, drv->reg_phy +

EXYNOS_5250_HOSTPHYCTRL0);

drivers/phy/phy-exynos5250-usb2.c static int exynos5250_power_on(struct samsung_usb2_phy_instance *inst)

Quoted 5 lines

drivers/phy/phy-exynos5250-usb2.c +5 -0

+               break;
+       case EXYNOS5250_HSIC0:
+       case EXYNOS5250_HSIC1:
+               hsic = (EXYNOS_5250_HOSTPHYCTRLX_REFCLKDIV_12 |
+

EXYNOS_5250_HOSTPHYCTRLX_REFCLKSEL_DEFAULT |

drivers/phy/phy-exynos5250-usb2.c static int exynos5250_power_on(struct samsung_usb2_phy_instance *inst)

Quoted 5 lines

drivers/phy/phy-exynos5250-usb2.c +5 -0

+                               EXYNOS_5250_HOSTPHYCTRLX_SIDDQ |
+                               EXYNOS_5250_HOSTPHYCTRLX_FORCESLEEP |
+                               EXYNOS_5250_HOSTPHYCTRLX_FORCESUSPEND
+                               );
+               writel(hsic, drv->reg_phy +

EXYNOS_5250_HOSTPHYCTRL1);

drivers/phy/phy-exynos5250-usb2.c static int exynos5250_power_on(struct · line 363

Quoted 1 line

drivers/phy/phy-exynos5250-usb2.c +1 -0

+               writel(hsic, drv->reg_phy +

EXYNOS_5250_HOSTPHYCTRL2);

Quoted 8 lines

drivers/phy/phy-exynos5250-usb2.c +2 -0

+               break;
+       }
 

        return 0;

}
--
1.7.9.5

Quoted 5 lines

--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to [email protected] More majordomo info at
http://vger.kernel.org/majordomo-info.html

--
Best Regards
Vivek Gautam
Samsung R&D Institute, Bangalore
India

This the alternative version of the support for Exynos 421x USB 2.0 PHY in the Generic PHY framework. In this version the support for Exynos 4210 and 4212 was joined into one file.

Signed-off-by Kamil Debski <[email protected]>

---
Hi,

Me and Kishon were discussing for quite a long time the way how Exynos 4 should be handled. I have decided to post the original patches and try to make an alternative version with support for Exynos 4210 and 4212 joined in one file. I have prepared two versions. The first one has 506 lines (vs 563 when two files are used). When doing the second version I was a little more aggresive in removing code. This was done at a cost of adding if's deciding which SoC version the driver is dealing with in some internal functions. This resulted in a better number of removed lines - the second version has only 452 lines (vs 563 original and 506 version 1).

From: Kishon Vijay Abraham I [mailto:[email protected]]
Sent: Monday, January 06, 2014 11:24 AM

Hi,

Quoted 10 lines · Kamil Debski

This the alternative version of the support for Exynos 421x USB 2.0 PHY in the Generic PHY framework. In this version the support for Exynos
4210 and 4212 was joined into one file.

Signed-off-by Kamil Debski <[email protected]>

---
Hi,

Me and Kishon were discussing for quite a long time the way how

Exynos

Quoted 7 lines

4 should be handled. I have decided to post the original patches and try to make an alternative version with support for Exynos 4210 and 4212 joined in one file. I have prepared two versions. The first one has 506 lines (vs
563 when two files are used). When doing the second version I was a little more aggresive in removing code. This was done at a cost of adding if's deciding which SoC version the driver is dealing with in

some internal functions.

Quoted 1 line

This resulted in a better number of removed lines - the second

version

Quoted 1 line

has only 452 lines (vs 563 original and 506 version 1).

Alright.. If the alternate approach doesn't give too much of advantage, lets stick with the original one. I would recommend creating a documentation (Documentation/phy/?) for the samsung PHY since that actually creates a layer on top of generic PHY framework. That would help while adding new samsung PHY drivers.

Btw thank you for preparing alternate versions for your original patches.

From: Kamil Debski [mailto:[email protected]]
Sent: Friday, December 20, 2013 2:24 PM

Hi,

This is the fifth version of the patchset. It adds a new Exynos USB 2.0 PHY driver. The driver uses the Generic PHY Framework.

I would like to thank everyone who contributed with comments and took the time to read through the patches in the previous versions of this patchset.
We had a lengthy discussion with Kishon about how the driver should look like.
This patchset contains the updated version of my original idea, where support for Exynos 4210 and 4212 is done in separate files. Kishon's idea is to join these two into a single file. I have prepared two alternative version which I will send soon after this patchset.

Just like the fourth version this patch depends on:
[PATCH V11 1/3] ARM: dts: Add pmu sysreg node to exynos5250 and exynos5420 dtsi files [1].

Best wishes,
Kamil Debski

[1] - http://www.spinics.net/lists/linux-samsung-soc/msg24528.html

----------------
Changes from v4:
1) phy: core: Add an exported of_phy_get function
- the new exported function of_phy_get was changed to take the phy's name as a
parameter instead of the index
2) phy: core: Add devm_of_phy_get to phy-core
- fixes made in the comments to devm_of_phy_get
3) phy: Add new Exynos USB PHY driver
- move the documentation from a new to an existing file - samsung- phy.txt
- fix typos and uppercase hex addresses
- add more explanations to Kconfig (checkpatch still complains, but I find it
hard to think what else could I add)
- add selects MFD_SYSCON as the driver needs it (Thank you, Tobias!)
- cleanup included headers in both *.c and .h files
- use BIT(x) macro instead of (1 << x)
- replaced HOST and DEV with PHY0 and PHY1 in phy-exynos4212-usb2.c, the
registers are described as PHYx in the documentation hence the
decision to
leave the PHYx naming
- fixed typo in exynos4210_rate_to_clk reg -> *reg
- change hax_mode_switch and enabled type to bool
4) usb: ehci-s5p: Change to use phy provided by the generic phy framework
- Put the issue of phy->otg in order - since the new phy driver does not provide
this field. With the new driver the switch between host and device is
done in
power_on of the respective host and device phys.
5) usb: s3c-hsotg: Use the new Exynos USB phy driver with the generic phy
framework
- fixed the example in the documentation
6) phy: Add support for S5PV210 to the Exynos USB PHY driver
- include files cleanup
- use BIT(x) macro instead of (1 << x)
7) phy: Add Exynos 5250 support to the Exynos USB 2.0 PHY driver
- include files cleanup
- use BIT(x) macro instead of (1 << x)
8) dts: Add usb2phy to Exynos 4
- no changes
9) dts: Add usb2phy to Exynos 5250
- no changes

----------------
Changes from v3:
- using PMU and system registers indirectly via syscon
- change labelling
- change Kconfig name
- fixed typos/stray whitespace
- move of_phy_provider_register() to the end of probe
- add a regular error return code to the rate_to_clk functions
- cleanup code and remove unused code
- change struct names to avoid collisions
- add mechanism to support multiple phys by the ehci driver

----------------
Changes from v2:
- rebase all patches to the usb-next branch
- fixes in the documentation file
- remove wrong entries in the phy node (ranges, and #address- &
#size-cells)
- add clocks and clock-names as required properites
- rephrase a few sentences
- fixes in the ehci-exynos.c file
- move phy_name variable next to phy in exynos_ehci_hcd
- remove otg from exynos_ehci_hcd as it was no longer used
- move devm_phy_get after the Exynos5440 skip_phy check
- fixes in the s3c-hsotg.c file
- cosmetic fixes (remove empty line that was wrongfully added)
- fixes in the main driver
- remove cpu_type in favour for a boolean flag matched with the
compatible
value
- rename files, structures, variables and Kconfig entires - change
from simple

    "uphy" to "usb2_phy"

- fix multiline comments style
- simplify #ifdefs in of_device_id
- fix Kconfig description
- change dev_info to dev_dbg where reasonable
- cosmetic changes (remove wrongful blank lines)
- remove unnecessary reference counting

----------------
Changes from v1:
- the changes include minor fixes of the hardware initialization of the PHY
module
- some other minor fixes were introduced

----------------------
Original cover letter:

Hi,

This patch adds a new drive for USB PHYs for Samsung SoCs. The driver is using the Generic PHY Framework created by Kishon Vijay Abrahan I. It can be found here https://lkml.org/lkml/2013/8/21/29. This patch adds support to Exynos4 family of SoCs. Support for Exynos3 and Exynos5 is planned to be added in the near future.

I welcome your comments.

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

[1] https://lkml.org/lkml/2013/8/21/29

Kamil Debski (8):
phy: core: Add an exported of_phy_get function
phy: core: Add devm_of_phy_get to phy-core
phy: Add new Exynos USB PHY driver
usb: ehci-s5p: Change to use phy provided by the generic phy
framework
usb: s3c-hsotg: Use the new Exynos USB phy driver with the generic
phy framework
phy: Add Exynos 5250 support to the Exynos USB 2.0 PHY driver
dts: Add usb2phy to Exynos 4
dts: Add usb2phy to Exynos 5250

Mateusz Krawczuk (1):
phy: Add support for S5PV210 to the Exynos USB PHY driver

 .../devicetree/bindings/arm/samsung/pmu.txt        |    2 +
 .../devicetree/bindings/phy/samsung-phy.txt        |   57 +++
 .../devicetree/bindings/usb/samsung-hsotg.txt      |    4 +
 Documentation/devicetree/bindings/usb/usb-ehci.txt |   35 ++
 arch/arm/boot/dts/exynos4.dtsi                     |   31 ++
 arch/arm/boot/dts/exynos4210.dtsi                  |   17 +
 arch/arm/boot/dts/exynos4x12.dtsi                  |   17 +
 arch/arm/boot/dts/exynos5250.dtsi                  |   33 +-
 drivers/phy/Kconfig                                |   50 +++
 drivers/phy/Makefile                               |    5 +
 drivers/phy/phy-core.c                             |   76 +++-
 drivers/phy/phy-exynos4210-usb2.c                  |  257
+++++++++++++
 drivers/phy/phy-exynos4212-usb2.c                  |  306
+++++++++++++++
 drivers/phy/phy-exynos5250-usb2.c                  |  406
++++++++++++++++++++
 drivers/phy/phy-s5pv210-usb2.c                     |  199 ++++++++++
 drivers/phy/phy-samsung-usb2.c                     |  238 ++++++++++++
 drivers/phy/phy-samsung-usb2.h                     |   69 ++++
 drivers/usb/gadget/s3c-hsotg.c                     |   11 +-
 drivers/usb/host/ehci-exynos.c                     |   97 +++--
 include/linux/phy/phy.h                            |    3 +
 20 files changed, 1853 insertions(+), 60 deletions(-)  create mode

100644 drivers/phy/phy-exynos4210-usb2.c create mode 100644 drivers/phy/phy-exynos4212-usb2.c create mode 100644 drivers/phy/phy- exynos5250-usb2.c create mode 100644 drivers/phy/phy-s5pv210-usb2.c create mode 100644 drivers/phy/phy-samsung-usb2.c create mode 100644 drivers/phy/phy-samsung-usb2.h

--
1.7.9.5

Hi Kishon,

I wanted to ask about your comments to this patchset. As I mentioned there are two alternative version where the Exynos 4210 and 4212 support is merged in one file.

I would be grateful if you had some time to look at the patchset and share your comments.

Best wishes and happy new year!