lkml.org 
[lkml]   [2013]   [Jul]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/4] usb: phy: add am335x pieces to generic phy
Date
This patch copies the phy support bits from dsps into the generic phy
driver. Most code can be re-used except for the on/off.
The additional am335x can be removed once we have a phy driver that does
more than this.

Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
drivers/usb/phy/phy-generic.c | 116 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 104 insertions(+), 12 deletions(-)

diff --git a/drivers/usb/phy/phy-generic.c b/drivers/usb/phy/phy-generic.c
index 57a0bf0..efc778a 100644
--- a/drivers/usb/phy/phy-generic.c
+++ b/drivers/usb/phy/phy-generic.c
@@ -35,6 +35,7 @@
#include <linux/clk.h>
#include <linux/regulator/consumer.h>
#include <linux/of.h>
+#include <linux/of_address.h>

struct usb_phy_gen_xceiv {
struct usb_phy phy;
@@ -42,6 +43,14 @@ struct usb_phy_gen_xceiv {
struct clk *clk;
struct regulator *vcc;
struct regulator *reset;
+
+ void __iomem *priv_reg;
+};
+
+struct phy_data {
+ int (*phy_init)(struct usb_phy *x);
+ void (*phy_shutdown)(struct usb_phy *x);
+ int (*reg_init)(struct platform_device *pdev);
};

static struct platform_device *pd;
@@ -139,8 +148,91 @@ static int nop_set_host(struct usb_otg *otg, struct usb_bus *host)
return 0;
}

+const struct phy_data usb_gen_phy_data = {
+ .phy_init = nop_init,
+ .phy_shutdown = nop_shutdown,
+};
+
+#ifdef CONFIG_SOC_AM33XX
+static int am335x_reg_init(struct platform_device *pdev)
+{
+ struct device_node *node = pdev->dev.of_node;
+ struct usb_phy_gen_xceiv *nop;
+ struct resource res;
+ int ret;
+
+ nop = platform_get_drvdata(pdev);
+ ret = of_address_to_resource(node, 0, &res);
+ if (ret)
+ return ret;
+
+ nop->priv_reg = devm_request_and_ioremap(&pdev->dev, &res);
+ if (!nop->priv_reg)
+ return -EINVAL;
+ return 0;
+}
+
+#define AM335X_USB_CTRL 0x00
+#define AM335x_USB_STS 0x04
+
+#define USBPHY_CM_PWRDN (1 << 0)
+#define USBPHY_OTG_PWRDN (1 << 1)
+#define USBPHY_OTGVDET_EN (1 << 19)
+#define USBPHY_OTGSESSEND_EN (1 << 20)
+static void am335x_phy_power(struct usb_phy_gen_xceiv *nop, bool on)
+{
+ u32 val;
+
+ val = readl(nop->priv_reg);
+ if (on) {
+ val &= ~(USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN);
+ val |= USBPHY_OTGVDET_EN | USBPHY_OTGSESSEND_EN;
+ } else {
+ val |= USBPHY_CM_PWRDN | USBPHY_OTG_PWRDN;
+ }
+
+ writel(val, nop->priv_reg);
+}
+
+static int am335x_phy_init(struct usb_phy *phy)
+{
+ struct usb_phy_gen_xceiv *nop = dev_get_drvdata(phy->dev);
+ int ret;
+
+ ret = nop_init(phy);
+ if (ret)
+ return ret;
+ am335x_phy_power(nop, true);
+ return 0;
+}
+
+static void am335x_phy_shutdown(struct usb_phy *phy)
+{
+ struct usb_phy_gen_xceiv *nop = dev_get_drvdata(phy->dev);
+
+ am335x_phy_power(nop, false);
+ nop_shutdown(phy);
+}
+
+const struct phy_data am335x_phy_data = {
+ .reg_init = am335x_reg_init,
+ .phy_init = am335x_phy_init,
+ .phy_shutdown = am335x_phy_shutdown,
+};
+#endif
+
+static const struct of_device_id nop_xceiv_dt_ids[] = {
+ { .compatible = "usb-nop-xceiv", },
+#ifdef CONFIG_SOC_AM33XX
+ { .compatible = "ti,am335x-usb-phy", .data = &am335x_phy_data },
+#endif
+ { }
+};
+MODULE_DEVICE_TABLE(of, nop_xceiv_dt_ids);
+
static int usb_phy_gen_xceiv_probe(struct platform_device *pdev)
{
+ const struct phy_data *phy_data = &usb_gen_phy_data;
struct device *dev = &pdev->dev;
struct usb_phy_gen_xceiv_platform_data *pdata = pdev->dev.platform_data;
struct usb_phy_gen_xceiv *nop;
@@ -154,6 +246,8 @@ static int usb_phy_gen_xceiv_probe(struct platform_device *pdev)
if (!nop)
return -ENOMEM;

+ platform_set_drvdata(pdev, nop);
+
nop->phy.otg = devm_kzalloc(&pdev->dev, sizeof(*nop->phy.otg),
GFP_KERNEL);
if (!nop->phy.otg)
@@ -161,13 +255,20 @@ static int usb_phy_gen_xceiv_probe(struct platform_device *pdev)

if (dev->of_node) {
struct device_node *node = dev->of_node;
+ const struct of_device_id *of_id;

if (of_property_read_u32(node, "clock-frequency", &clk_rate))
clk_rate = 0;

needs_vcc = of_property_read_bool(node, "vcc-supply");
needs_reset = of_property_read_bool(node, "reset-supply");
-
+ of_id = of_match_node(nop_xceiv_dt_ids, node);
+ if (of_id) {
+ phy_data = of_id->data;
+ err = phy_data->reg_init(pdev);
+ if (err)
+ return err;
+ }
} else if (pdata) {
type = pdata->type;
clk_rate = pdata->clk_rate;
@@ -217,8 +318,8 @@ static int usb_phy_gen_xceiv_probe(struct platform_device *pdev)
nop->phy.dev = nop->dev;
nop->phy.label = "nop-xceiv";
nop->phy.set_suspend = nop_set_suspend;
- nop->phy.init = nop_init;
- nop->phy.shutdown = nop_shutdown;
+ nop->phy.init = phy_data->phy_init;
+ nop->phy.shutdown = phy_data->phy_shutdown;
nop->phy.state = OTG_STATE_UNDEFINED;
nop->phy.type = type;

@@ -233,8 +334,6 @@ static int usb_phy_gen_xceiv_probe(struct platform_device *pdev)
goto err_add;
}

- platform_set_drvdata(pdev, nop);
-
ATOMIC_INIT_NOTIFIER_HEAD(&nop->phy.notifier);

return 0;
@@ -257,13 +356,6 @@ static int usb_phy_gen_xceiv_remove(struct platform_device *pdev)
return 0;
}

-static const struct of_device_id nop_xceiv_dt_ids[] = {
- { .compatible = "usb-nop-xceiv" },
- { }
-};
-
-MODULE_DEVICE_TABLE(of, nop_xceiv_dt_ids);
-
static struct platform_driver usb_phy_gen_xceiv_driver = {
.probe = usb_phy_gen_xceiv_probe,
.remove = usb_phy_gen_xceiv_remove,
--
1.8.3.2


\
 
 \ /
  Last update: 2013-07-26 23:01    [W:0.219 / U:0.024 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site