* [PATCH 1/5] drivers: usb: phy: add a new driver for omap usb2 phy
2012-09-06 14:57 [PATCH 0/5] usb: phy/otg: add dt support Kishon Vijay Abraham I
@ 2012-09-06 14:57 ` Kishon Vijay Abraham I
2012-09-24 13:15 ` Rob Herring
2012-09-06 14:57 ` [PATCH 2/5] drivers: usb: otg: make twl6030_usb as a comparator driver to omap_usb2 Kishon Vijay Abraham I
` (3 subsequent siblings)
4 siblings, 1 reply; 14+ messages in thread
From: Kishon Vijay Abraham I @ 2012-09-06 14:57 UTC (permalink / raw)
To: grant.likely, rob.herring, rob, b-cousson, tony, linux, balbi,
gregkh, kishon, devicetree-discuss, linux-doc, linux-kernel,
linux-omap, linux-arm-kernel, linux-usb
All phy related programming like enabling/disabling the clocks, powering
on/off the phy is taken care of by this driver. It is also used for OTG
related functionality like srp.
This also includes device tree support for usb2 phy driver and
the documentation with device tree binding information is updated.
Currently writing to control module register is taken care in this
driver which will be removed once the control module driver is in place.
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
Documentation/devicetree/bindings/usb/usb-phy.txt | 17 ++
drivers/usb/phy/Kconfig | 9 +
drivers/usb/phy/Makefile | 1 +
drivers/usb/phy/omap-usb2.c | 271 +++++++++++++++++++++
include/linux/usb/omap_usb.h | 46 ++++
include/linux/usb/phy_companion.h | 34 +++
6 files changed, 378 insertions(+)
create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt
create mode 100644 drivers/usb/phy/omap-usb2.c
create mode 100644 include/linux/usb/omap_usb.h
create mode 100644 include/linux/usb/phy_companion.h
diff --git a/Documentation/devicetree/bindings/usb/usb-phy.txt b/Documentation/devicetree/bindings/usb/usb-phy.txt
new file mode 100644
index 0000000..80d4148
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/usb-phy.txt
@@ -0,0 +1,17 @@
+USB PHY
+
+OMAP USB2 PHY
+
+Required properties:
+ - compatible: Should be "ti,omap-usb2"
+ - reg : Address and length of the register set for the device. Also
+add the address of control module dev conf register until a driver for
+control module is added
+
+This is usually a subnode of ocp2scp to which it is connected.
+
+usb2phy@4a0ad080 {
+ compatible = "ti,omap-usb2";
+ reg = <0x4a0ad080 0x58>,
+ <0x4a002300 0x4>;
+};
diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
index 2838adb..63c339b 100644
--- a/drivers/usb/phy/Kconfig
+++ b/drivers/usb/phy/Kconfig
@@ -4,6 +4,15 @@
comment "USB Physical Layer drivers"
depends on USB || USB_GADGET
+config OMAP_USB2
+ tristate "OMAP USB2 PHY Driver"
+ select USB_OTG_UTILS
+ help
+ Enable this to support the transceiver that is part of SOC. This
+ driver takes care of all the PHY functionality apart from comparator.
+ The USB OTG controller communicates with the comparator using this
+ driver.
+
config USB_ISP1301
tristate "NXP ISP1301 USB transceiver support"
depends on USB || USB_GADGET
diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
index bb948fb..b069f29 100644
--- a/drivers/usb/phy/Makefile
+++ b/drivers/usb/phy/Makefile
@@ -4,6 +4,7 @@
ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
+obj-$(CONFIG_OMAP_USB2) += omap-usb2.o
obj-$(CONFIG_USB_ISP1301) += isp1301.o
obj-$(CONFIG_MV_U3D_PHY) += mv_u3d_phy.o
obj-$(CONFIG_USB_EHCI_TEGRA) += tegra_usb_phy.o
diff --git a/drivers/usb/phy/omap-usb2.c b/drivers/usb/phy/omap-usb2.c
new file mode 100644
index 0000000..15ab3d6
--- /dev/null
+++ b/drivers/usb/phy/omap-usb2.c
@@ -0,0 +1,271 @@
+/*
+ * omap-usb2.c - USB PHY, talking to musb controller in OMAP.
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Author: Kishon Vijay Abraham I <kishon@ti.com>
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/io.h>
+#include <linux/usb/omap_usb.h>
+#include <linux/usb/phy_companion.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/pm_runtime.h>
+#include <linux/delay.h>
+
+/**
+ * omap_usb2_set_comparator - links the comparator present in the sytem with
+ * this phy
+ * @comparator - the companion phy(comparator) for this phy
+ *
+ * The phy companion driver should call this API passing the phy_companion
+ * filled with set_vbus and start_srp to be used by usb phy.
+ *
+ * For use by phy companion driver
+ */
+int omap_usb2_set_comparator(struct phy_companion *comparator)
+{
+ struct omap_usb *phy;
+ struct usb_phy *x = usb_get_phy(USB_PHY_TYPE_USB2);
+
+ if (IS_ERR(x))
+ return -ENODEV;
+
+ phy = phy_to_omapusb(x);
+ phy->comparator = comparator;
+ return 0;
+}
+EXPORT_SYMBOL_GPL(omap_usb2_set_comparator);
+
+/**
+ * omap_usb_phy_power - power on/off the phy using control module reg
+ * @phy: struct omap_usb *
+ * @on: 0 or 1, based on powering on or off the PHY
+ *
+ * XXX: Remove this function once control module driver gets merged
+ */
+static void omap_usb_phy_power(struct omap_usb *phy, int on)
+{
+ u32 val;
+
+ if (on) {
+ val = readl(phy->control_dev);
+ if (val & PHY_PD) {
+ writel(~PHY_PD, phy->control_dev);
+ /* XXX: add proper documentation for this delay */
+ mdelay(200);
+ }
+ } else {
+ writel(PHY_PD, phy->control_dev);
+ }
+}
+
+static int omap_usb_set_vbus(struct usb_otg *otg, bool enabled)
+{
+ struct omap_usb *phy = phy_to_omapusb(otg->phy);
+
+ if (!phy->comparator)
+ return -ENODEV;
+
+ return phy->comparator->set_vbus(phy->comparator, enabled);
+}
+
+static int omap_usb_start_srp(struct usb_otg *otg)
+{
+ struct omap_usb *phy = phy_to_omapusb(otg->phy);
+
+ if (!phy->comparator)
+ return -ENODEV;
+
+ return phy->comparator->start_srp(phy->comparator);
+}
+
+static int omap_usb_set_host(struct usb_otg *otg, struct usb_bus *host)
+{
+ struct usb_phy *phy = otg->phy;
+
+ otg->host = host;
+ if (!host)
+ phy->state = OTG_STATE_UNDEFINED;
+
+ return 0;
+}
+
+static int omap_usb_set_peripheral(struct usb_otg *otg,
+ struct usb_gadget *gadget)
+{
+ struct usb_phy *phy = otg->phy;
+
+ otg->gadget = gadget;
+ if (!gadget)
+ phy->state = OTG_STATE_UNDEFINED;
+
+ return 0;
+}
+
+static int omap_usb2_suspend(struct usb_phy *x, int suspend)
+{
+ u32 ret;
+ struct omap_usb *phy = phy_to_omapusb(x);
+
+ if (suspend && !phy->is_suspended) {
+ omap_usb_phy_power(phy, 0);
+ pm_runtime_put_sync(phy->dev);
+ phy->is_suspended = 1;
+ } else if (!suspend && phy->is_suspended) {
+ ret = pm_runtime_get_sync(phy->dev);
+ if (ret < 0) {
+ dev_err(phy->dev, "get_sync failed with err %d\n",
+ ret);
+ return ret;
+ }
+ omap_usb_phy_power(phy, 1);
+ phy->is_suspended = 0;
+ }
+
+ return 0;
+}
+
+static int __devinit omap_usb2_probe(struct platform_device *pdev)
+{
+ struct omap_usb *phy;
+ struct usb_otg *otg;
+ struct resource *res;
+
+ phy = devm_kzalloc(&pdev->dev, sizeof(*phy), GFP_KERNEL);
+ if (!phy) {
+ dev_err(&pdev->dev, "unable to allocate memory for USB2 PHY\n");
+ return -ENOMEM;
+ }
+
+ otg = devm_kzalloc(&pdev->dev, sizeof(*otg), GFP_KERNEL);
+ if (!otg) {
+ dev_err(&pdev->dev, "unable to allocate memory for USB OTG\n");
+ return -ENOMEM;
+ }
+
+ phy->dev = &pdev->dev;
+
+ phy->phy.dev = phy->dev;
+ phy->phy.label = "omap-usb2";
+ phy->phy.set_suspend = omap_usb2_suspend;
+ phy->phy.otg = otg;
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+
+ phy->control_dev = devm_request_and_ioremap(&pdev->dev, res);
+ if (phy->control_dev == NULL) {
+ dev_err(&pdev->dev, "Failed to obtain io memory\n");
+ return -ENXIO;
+ }
+
+ phy->is_suspended = 1;
+ omap_usb_phy_power(phy, 0);
+
+ otg->set_host = omap_usb_set_host;
+ otg->set_peripheral = omap_usb_set_peripheral;
+ otg->set_vbus = omap_usb_set_vbus;
+ otg->start_srp = omap_usb_start_srp;
+ otg->phy = &phy->phy;
+
+ phy->wkupclk = devm_clk_get(phy->dev, "usb_phy_cm_clk32k");
+ if (IS_ERR(phy->wkupclk)) {
+ dev_err(&pdev->dev, "unable to get usb_phy_cm_clk32k\n");
+ return PTR_ERR(phy->wkupclk);
+ }
+ clk_prepare(phy->wkupclk);
+
+ usb_add_phy(&phy->phy, USB_PHY_TYPE_USB2);
+
+ platform_set_drvdata(pdev, phy);
+
+ pm_runtime_enable(phy->dev);
+
+ return 0;
+}
+
+static int __devexit omap_usb2_remove(struct platform_device *pdev)
+{
+ struct omap_usb *phy = platform_get_drvdata(pdev);
+
+ clk_unprepare(phy->wkupclk);
+ usb_remove_phy(&phy->phy);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM_RUNTIME
+
+static int omap_usb2_runtime_suspend(struct device *dev)
+{
+ struct platform_device *pdev = to_platform_device(dev);
+ struct omap_usb *phy = platform_get_drvdata(pdev);
+
+ clk_disable(phy->wkupclk);
+
+ return 0;
+}
+
+static int omap_usb2_runtime_resume(struct device *dev)
+{
+ u32 ret = 0;
+ struct platform_device *pdev = to_platform_device(dev);
+ struct omap_usb *phy = platform_get_drvdata(pdev);
+
+ ret = clk_enable(phy->wkupclk);
+ if (ret < 0)
+ dev_err(phy->dev, "Failed to enable wkupclk %d\n", ret);
+
+ return ret;
+}
+
+static const struct dev_pm_ops omap_usb2_pm_ops = {
+ SET_RUNTIME_PM_OPS(omap_usb2_runtime_suspend, omap_usb2_runtime_resume,
+ NULL)
+};
+
+#define DEV_PM_OPS (&omap_usb2_pm_ops)
+#else
+#define DEV_PM_OPS NULL
+#endif
+
+#ifdef CONFIG_OF
+static const struct of_device_id omap_usb2_id_table[] = {
+ { .compatible = "ti,omap-usb2" },
+ {}
+};
+MODULE_DEVICE_TABLE(of, omap_usb2_id_table);
+#endif
+
+static struct platform_driver omap_usb2_driver = {
+ .probe = omap_usb2_probe,
+ .remove = __devexit_p(omap_usb2_remove),
+ .driver = {
+ .name = "omap-usb2",
+ .owner = THIS_MODULE,
+ .pm = DEV_PM_OPS,
+ .of_match_table = of_match_ptr(omap_usb2_id_table),
+ },
+};
+
+module_platform_driver(omap_usb2_driver);
+
+MODULE_ALIAS("platform: omap_usb2");
+MODULE_AUTHOR("Texas Instruments Inc.");
+MODULE_DESCRIPTION("OMAP USB2 phy driver");
+MODULE_LICENSE("GPL v2");
diff --git a/include/linux/usb/omap_usb.h b/include/linux/usb/omap_usb.h
new file mode 100644
index 0000000..0ea17f8
--- /dev/null
+++ b/include/linux/usb/omap_usb.h
@@ -0,0 +1,46 @@
+/*
+ * omap_usb.h -- omap usb2 phy header file
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Author: Kishon Vijay Abraham I <kishon@ti.com>
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __DRIVERS_OMAP_USB2_H
+#define __DRIVERS_OMAP_USB2_H
+
+#include <linux/usb/otg.h>
+
+struct omap_usb {
+ struct usb_phy phy;
+ struct phy_companion *comparator;
+ struct device *dev;
+ u32 __iomem *control_dev;
+ struct clk *wkupclk;
+ u8 is_suspended:1;
+};
+
+#define PHY_PD 0x1
+
+#define phy_to_omapusb(x) container_of((x), struct omap_usb, phy)
+
+#if defined(CONFIG_OMAP_USB2) || defined(CONFIG_OMAP_USB2_MODULE)
+extern int omap_usb2_set_comparator(struct phy_companion *comparator);
+#else
+static inline int omap_usb2_set_comparator(struct phy_companion *comparator)
+{
+ return -ENODEV;
+}
+#endif
+
+#endif /* __DRIVERS_OMAP_USB_H */
diff --git a/include/linux/usb/phy_companion.h b/include/linux/usb/phy_companion.h
new file mode 100644
index 0000000..edd2ec2
--- /dev/null
+++ b/include/linux/usb/phy_companion.h
@@ -0,0 +1,34 @@
+/*
+ * phy-companion.h -- phy companion to indicate the comparator part of PHY
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Author: Kishon Vijay Abraham I <kishon@ti.com>
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __DRIVERS_PHY_COMPANION_H
+#define __DRIVERS_PHY_COMPANION_H
+
+#include <linux/usb/otg.h>
+
+/* phy_companion to take care of VBUS, ID and srp capabilities */
+struct phy_companion {
+
+ /* effective for A-peripheral, ignored for B devices */
+ int (*set_vbus)(struct phy_companion *x, bool enabled);
+
+ /* for B devices only: start session with A-Host */
+ int (*start_srp)(struct phy_companion *x);
+};
+
+#endif /* __DRIVERS_PHY_COMPANION_H */
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* Re: [PATCH 1/5] drivers: usb: phy: add a new driver for omap usb2 phy
2012-09-06 14:57 ` [PATCH 1/5] drivers: usb: phy: add a new driver for omap usb2 phy Kishon Vijay Abraham I
@ 2012-09-24 13:15 ` Rob Herring
2012-09-25 10:06 ` ABRAHAM, KISHON VIJAY
0 siblings, 1 reply; 14+ messages in thread
From: Rob Herring @ 2012-09-24 13:15 UTC (permalink / raw)
To: Kishon Vijay Abraham I
Cc: grant.likely, rob, b-cousson, tony, linux, balbi, gregkh,
devicetree-discuss, linux-doc, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
On 09/06/2012 09:57 AM, Kishon Vijay Abraham I wrote:
> All phy related programming like enabling/disabling the clocks, powering
> on/off the phy is taken care of by this driver. It is also used for OTG
> related functionality like srp.
>
> This also includes device tree support for usb2 phy driver and
> the documentation with device tree binding information is updated.
>
> Currently writing to control module register is taken care in this
> driver which will be removed once the control module driver is in place.
>
> Cc: Felipe Balbi <balbi@ti.com>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
> ---
> Documentation/devicetree/bindings/usb/usb-phy.txt | 17 ++
> drivers/usb/phy/Kconfig | 9 +
> drivers/usb/phy/Makefile | 1 +
> drivers/usb/phy/omap-usb2.c | 271 +++++++++++++++++++++
> include/linux/usb/omap_usb.h | 46 ++++
> include/linux/usb/phy_companion.h | 34 +++
> 6 files changed, 378 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt
> create mode 100644 drivers/usb/phy/omap-usb2.c
> create mode 100644 include/linux/usb/omap_usb.h
> create mode 100644 include/linux/usb/phy_companion.h
>
> diff --git a/Documentation/devicetree/bindings/usb/usb-phy.txt b/Documentation/devicetree/bindings/usb/usb-phy.txt
> new file mode 100644
> index 0000000..80d4148
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/usb/usb-phy.txt
This is a very generic name...
> @@ -0,0 +1,17 @@
> +USB PHY
> +
> +OMAP USB2 PHY
> +
> +Required properties:
> + - compatible: Should be "ti,omap-usb2"
...for a specific phy. However, I do think a generic binding to describe
host ctrlr to phy connections is needed.
> + - reg : Address and length of the register set for the device. Also
> +add the address of control module dev conf register until a driver for
> +control module is added
The dts should describe the h/w, not what you need for the current
driver. The 2nd reg field does not belong here.
> +
> +This is usually a subnode of ocp2scp to which it is connected.
How is usb port to phy connection described?
Rob
> +
> +usb2phy@4a0ad080 {
> + compatible = "ti,omap-usb2";
> + reg = <0x4a0ad080 0x58>,
> + <0x4a002300 0x4>;
> +};
> diff --git a/drivers/usb/phy/Kconfig b/drivers/usb/phy/Kconfig
> index 2838adb..63c339b 100644
> --- a/drivers/usb/phy/Kconfig
> +++ b/drivers/usb/phy/Kconfig
> @@ -4,6 +4,15 @@
> comment "USB Physical Layer drivers"
> depends on USB || USB_GADGET
>
> +config OMAP_USB2
> + tristate "OMAP USB2 PHY Driver"
> + select USB_OTG_UTILS
> + help
> + Enable this to support the transceiver that is part of SOC. This
> + driver takes care of all the PHY functionality apart from comparator.
> + The USB OTG controller communicates with the comparator using this
> + driver.
> +
> config USB_ISP1301
> tristate "NXP ISP1301 USB transceiver support"
> depends on USB || USB_GADGET
> diff --git a/drivers/usb/phy/Makefile b/drivers/usb/phy/Makefile
> index bb948fb..b069f29 100644
> --- a/drivers/usb/phy/Makefile
> +++ b/drivers/usb/phy/Makefile
> @@ -4,6 +4,7 @@
>
> ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
>
> +obj-$(CONFIG_OMAP_USB2) += omap-usb2.o
> obj-$(CONFIG_USB_ISP1301) += isp1301.o
> obj-$(CONFIG_MV_U3D_PHY) += mv_u3d_phy.o
> obj-$(CONFIG_USB_EHCI_TEGRA) += tegra_usb_phy.o
> diff --git a/drivers/usb/phy/omap-usb2.c b/drivers/usb/phy/omap-usb2.c
> new file mode 100644
> index 0000000..15ab3d6
> --- /dev/null
> +++ b/drivers/usb/phy/omap-usb2.c
> @@ -0,0 +1,271 @@
> +/*
> + * omap-usb2.c - USB PHY, talking to musb controller in OMAP.
> + *
> + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * Author: Kishon Vijay Abraham I <kishon@ti.com>
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + */
> +
> +#include <linux/module.h>
> +#include <linux/platform_device.h>
> +#include <linux/slab.h>
> +#include <linux/of.h>
> +#include <linux/io.h>
> +#include <linux/usb/omap_usb.h>
> +#include <linux/usb/phy_companion.h>
> +#include <linux/clk.h>
> +#include <linux/err.h>
> +#include <linux/pm_runtime.h>
> +#include <linux/delay.h>
> +
> +/**
> + * omap_usb2_set_comparator - links the comparator present in the sytem with
> + * this phy
> + * @comparator - the companion phy(comparator) for this phy
> + *
> + * The phy companion driver should call this API passing the phy_companion
> + * filled with set_vbus and start_srp to be used by usb phy.
> + *
> + * For use by phy companion driver
> + */
> +int omap_usb2_set_comparator(struct phy_companion *comparator)
> +{
> + struct omap_usb *phy;
> + struct usb_phy *x = usb_get_phy(USB_PHY_TYPE_USB2);
> +
> + if (IS_ERR(x))
> + return -ENODEV;
> +
> + phy = phy_to_omapusb(x);
> + phy->comparator = comparator;
> + return 0;
> +}
> +EXPORT_SYMBOL_GPL(omap_usb2_set_comparator);
> +
> +/**
> + * omap_usb_phy_power - power on/off the phy using control module reg
> + * @phy: struct omap_usb *
> + * @on: 0 or 1, based on powering on or off the PHY
> + *
> + * XXX: Remove this function once control module driver gets merged
> + */
> +static void omap_usb_phy_power(struct omap_usb *phy, int on)
> +{
> + u32 val;
> +
> + if (on) {
> + val = readl(phy->control_dev);
> + if (val & PHY_PD) {
> + writel(~PHY_PD, phy->control_dev);
> + /* XXX: add proper documentation for this delay */
> + mdelay(200);
> + }
> + } else {
> + writel(PHY_PD, phy->control_dev);
> + }
> +}
> +
> +static int omap_usb_set_vbus(struct usb_otg *otg, bool enabled)
> +{
> + struct omap_usb *phy = phy_to_omapusb(otg->phy);
> +
> + if (!phy->comparator)
> + return -ENODEV;
> +
> + return phy->comparator->set_vbus(phy->comparator, enabled);
> +}
> +
> +static int omap_usb_start_srp(struct usb_otg *otg)
> +{
> + struct omap_usb *phy = phy_to_omapusb(otg->phy);
> +
> + if (!phy->comparator)
> + return -ENODEV;
> +
> + return phy->comparator->start_srp(phy->comparator);
> +}
> +
> +static int omap_usb_set_host(struct usb_otg *otg, struct usb_bus *host)
> +{
> + struct usb_phy *phy = otg->phy;
> +
> + otg->host = host;
> + if (!host)
> + phy->state = OTG_STATE_UNDEFINED;
> +
> + return 0;
> +}
> +
> +static int omap_usb_set_peripheral(struct usb_otg *otg,
> + struct usb_gadget *gadget)
> +{
> + struct usb_phy *phy = otg->phy;
> +
> + otg->gadget = gadget;
> + if (!gadget)
> + phy->state = OTG_STATE_UNDEFINED;
> +
> + return 0;
> +}
> +
> +static int omap_usb2_suspend(struct usb_phy *x, int suspend)
> +{
> + u32 ret;
> + struct omap_usb *phy = phy_to_omapusb(x);
> +
> + if (suspend && !phy->is_suspended) {
> + omap_usb_phy_power(phy, 0);
> + pm_runtime_put_sync(phy->dev);
> + phy->is_suspended = 1;
> + } else if (!suspend && phy->is_suspended) {
> + ret = pm_runtime_get_sync(phy->dev);
> + if (ret < 0) {
> + dev_err(phy->dev, "get_sync failed with err %d\n",
> + ret);
> + return ret;
> + }
> + omap_usb_phy_power(phy, 1);
> + phy->is_suspended = 0;
> + }
> +
> + return 0;
> +}
> +
> +static int __devinit omap_usb2_probe(struct platform_device *pdev)
> +{
> + struct omap_usb *phy;
> + struct usb_otg *otg;
> + struct resource *res;
> +
> + phy = devm_kzalloc(&pdev->dev, sizeof(*phy), GFP_KERNEL);
> + if (!phy) {
> + dev_err(&pdev->dev, "unable to allocate memory for USB2 PHY\n");
> + return -ENOMEM;
> + }
> +
> + otg = devm_kzalloc(&pdev->dev, sizeof(*otg), GFP_KERNEL);
> + if (!otg) {
> + dev_err(&pdev->dev, "unable to allocate memory for USB OTG\n");
> + return -ENOMEM;
> + }
> +
> + phy->dev = &pdev->dev;
> +
> + phy->phy.dev = phy->dev;
> + phy->phy.label = "omap-usb2";
> + phy->phy.set_suspend = omap_usb2_suspend;
> + phy->phy.otg = otg;
> +
> + res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
> +
> + phy->control_dev = devm_request_and_ioremap(&pdev->dev, res);
> + if (phy->control_dev == NULL) {
> + dev_err(&pdev->dev, "Failed to obtain io memory\n");
> + return -ENXIO;
> + }
> +
> + phy->is_suspended = 1;
> + omap_usb_phy_power(phy, 0);
> +
> + otg->set_host = omap_usb_set_host;
> + otg->set_peripheral = omap_usb_set_peripheral;
> + otg->set_vbus = omap_usb_set_vbus;
> + otg->start_srp = omap_usb_start_srp;
> + otg->phy = &phy->phy;
> +
> + phy->wkupclk = devm_clk_get(phy->dev, "usb_phy_cm_clk32k");
> + if (IS_ERR(phy->wkupclk)) {
> + dev_err(&pdev->dev, "unable to get usb_phy_cm_clk32k\n");
> + return PTR_ERR(phy->wkupclk);
> + }
> + clk_prepare(phy->wkupclk);
> +
> + usb_add_phy(&phy->phy, USB_PHY_TYPE_USB2);
> +
> + platform_set_drvdata(pdev, phy);
> +
> + pm_runtime_enable(phy->dev);
> +
> + return 0;
> +}
> +
> +static int __devexit omap_usb2_remove(struct platform_device *pdev)
> +{
> + struct omap_usb *phy = platform_get_drvdata(pdev);
> +
> + clk_unprepare(phy->wkupclk);
> + usb_remove_phy(&phy->phy);
> +
> + return 0;
> +}
> +
> +#ifdef CONFIG_PM_RUNTIME
> +
> +static int omap_usb2_runtime_suspend(struct device *dev)
> +{
> + struct platform_device *pdev = to_platform_device(dev);
> + struct omap_usb *phy = platform_get_drvdata(pdev);
> +
> + clk_disable(phy->wkupclk);
> +
> + return 0;
> +}
> +
> +static int omap_usb2_runtime_resume(struct device *dev)
> +{
> + u32 ret = 0;
> + struct platform_device *pdev = to_platform_device(dev);
> + struct omap_usb *phy = platform_get_drvdata(pdev);
> +
> + ret = clk_enable(phy->wkupclk);
> + if (ret < 0)
> + dev_err(phy->dev, "Failed to enable wkupclk %d\n", ret);
> +
> + return ret;
> +}
> +
> +static const struct dev_pm_ops omap_usb2_pm_ops = {
> + SET_RUNTIME_PM_OPS(omap_usb2_runtime_suspend, omap_usb2_runtime_resume,
> + NULL)
> +};
> +
> +#define DEV_PM_OPS (&omap_usb2_pm_ops)
> +#else
> +#define DEV_PM_OPS NULL
> +#endif
> +
> +#ifdef CONFIG_OF
> +static const struct of_device_id omap_usb2_id_table[] = {
> + { .compatible = "ti,omap-usb2" },
> + {}
> +};
> +MODULE_DEVICE_TABLE(of, omap_usb2_id_table);
> +#endif
> +
> +static struct platform_driver omap_usb2_driver = {
> + .probe = omap_usb2_probe,
> + .remove = __devexit_p(omap_usb2_remove),
> + .driver = {
> + .name = "omap-usb2",
> + .owner = THIS_MODULE,
> + .pm = DEV_PM_OPS,
> + .of_match_table = of_match_ptr(omap_usb2_id_table),
> + },
> +};
> +
> +module_platform_driver(omap_usb2_driver);
> +
> +MODULE_ALIAS("platform: omap_usb2");
> +MODULE_AUTHOR("Texas Instruments Inc.");
> +MODULE_DESCRIPTION("OMAP USB2 phy driver");
> +MODULE_LICENSE("GPL v2");
> diff --git a/include/linux/usb/omap_usb.h b/include/linux/usb/omap_usb.h
> new file mode 100644
> index 0000000..0ea17f8
> --- /dev/null
> +++ b/include/linux/usb/omap_usb.h
> @@ -0,0 +1,46 @@
> +/*
> + * omap_usb.h -- omap usb2 phy header file
> + *
> + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * Author: Kishon Vijay Abraham I <kishon@ti.com>
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + */
> +
> +#ifndef __DRIVERS_OMAP_USB2_H
> +#define __DRIVERS_OMAP_USB2_H
> +
> +#include <linux/usb/otg.h>
> +
> +struct omap_usb {
> + struct usb_phy phy;
> + struct phy_companion *comparator;
> + struct device *dev;
> + u32 __iomem *control_dev;
> + struct clk *wkupclk;
> + u8 is_suspended:1;
> +};
> +
> +#define PHY_PD 0x1
> +
> +#define phy_to_omapusb(x) container_of((x), struct omap_usb, phy)
> +
> +#if defined(CONFIG_OMAP_USB2) || defined(CONFIG_OMAP_USB2_MODULE)
> +extern int omap_usb2_set_comparator(struct phy_companion *comparator);
> +#else
> +static inline int omap_usb2_set_comparator(struct phy_companion *comparator)
> +{
> + return -ENODEV;
> +}
> +#endif
> +
> +#endif /* __DRIVERS_OMAP_USB_H */
> diff --git a/include/linux/usb/phy_companion.h b/include/linux/usb/phy_companion.h
> new file mode 100644
> index 0000000..edd2ec2
> --- /dev/null
> +++ b/include/linux/usb/phy_companion.h
> @@ -0,0 +1,34 @@
> +/*
> + * phy-companion.h -- phy companion to indicate the comparator part of PHY
> + *
> + * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * Author: Kishon Vijay Abraham I <kishon@ti.com>
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + */
> +
> +#ifndef __DRIVERS_PHY_COMPANION_H
> +#define __DRIVERS_PHY_COMPANION_H
> +
> +#include <linux/usb/otg.h>
> +
> +/* phy_companion to take care of VBUS, ID and srp capabilities */
> +struct phy_companion {
> +
> + /* effective for A-peripheral, ignored for B devices */
> + int (*set_vbus)(struct phy_companion *x, bool enabled);
> +
> + /* for B devices only: start session with A-Host */
> + int (*start_srp)(struct phy_companion *x);
> +};
> +
> +#endif /* __DRIVERS_PHY_COMPANION_H */
>
^ permalink raw reply [flat|nested] 14+ messages in thread* Re: [PATCH 1/5] drivers: usb: phy: add a new driver for omap usb2 phy
2012-09-24 13:15 ` Rob Herring
@ 2012-09-25 10:06 ` ABRAHAM, KISHON VIJAY
2012-09-27 14:24 ` Rob Herring
0 siblings, 1 reply; 14+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-09-25 10:06 UTC (permalink / raw)
To: Rob Herring
Cc: grant.likely, rob, b-cousson, tony, linux, balbi, gregkh,
devicetree-discuss, linux-doc, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
Hi,
On Mon, Sep 24, 2012 at 6:45 PM, Rob Herring <robherring2@gmail.com> wrote:
> On 09/06/2012 09:57 AM, Kishon Vijay Abraham I wrote:
>> All phy related programming like enabling/disabling the clocks, powering
>> on/off the phy is taken care of by this driver. It is also used for OTG
>> related functionality like srp.
>>
>> This also includes device tree support for usb2 phy driver and
>> the documentation with device tree binding information is updated.
>>
>> Currently writing to control module register is taken care in this
>> driver which will be removed once the control module driver is in place.
>>
>> Cc: Felipe Balbi <balbi@ti.com>
>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>> ---
>> Documentation/devicetree/bindings/usb/usb-phy.txt | 17 ++
>> drivers/usb/phy/Kconfig | 9 +
>> drivers/usb/phy/Makefile | 1 +
>> drivers/usb/phy/omap-usb2.c | 271 +++++++++++++++++++++
>> include/linux/usb/omap_usb.h | 46 ++++
>> include/linux/usb/phy_companion.h | 34 +++
>> 6 files changed, 378 insertions(+)
>> create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt
>> create mode 100644 drivers/usb/phy/omap-usb2.c
>> create mode 100644 include/linux/usb/omap_usb.h
>> create mode 100644 include/linux/usb/phy_companion.h
>>
>> diff --git a/Documentation/devicetree/bindings/usb/usb-phy.txt b/Documentation/devicetree/bindings/usb/usb-phy.txt
>> new file mode 100644
>> index 0000000..80d4148
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/usb/usb-phy.txt
>
> This is a very generic name...
>
>> @@ -0,0 +1,17 @@
>> +USB PHY
>> +
>> +OMAP USB2 PHY
>> +
>> +Required properties:
>> + - compatible: Should be "ti,omap-usb2"
>
> ...for a specific phy. However, I do think a generic binding to describe
> host ctrlr to phy connections is needed.
>
>> + - reg : Address and length of the register set for the device. Also
>> +add the address of control module dev conf register until a driver for
>> +control module is added
>
> The dts should describe the h/w, not what you need for the current
> driver. The 2nd reg field does not belong here.
Indeed. This was discussed and agreed upon as a interim solution till
we have a control module driver in place to write to the control
module register.
>
>> +
>> +This is usually a subnode of ocp2scp to which it is connected.
>
> How is usb port to phy connection described?
Currently the usb controller to phy connection is established only by
type. We have a couple of patches being currently discussed in the
list to establish the connection by phandle.
https://patchwork.kernel.org/patch/1457801/ (Generic PHY Framework:
devm_of_phy_get())
http://www.spinics.net/lists/linux-usb/msg69547.html
Thanks
Kishon
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/5] drivers: usb: phy: add a new driver for omap usb2 phy
2012-09-25 10:06 ` ABRAHAM, KISHON VIJAY
@ 2012-09-27 14:24 ` Rob Herring
2012-09-27 15:00 ` ABRAHAM, KISHON VIJAY
2012-09-27 22:48 ` Cousson, Benoit
0 siblings, 2 replies; 14+ messages in thread
From: Rob Herring @ 2012-09-27 14:24 UTC (permalink / raw)
To: ABRAHAM, KISHON VIJAY
Cc: grant.likely, rob, b-cousson, tony, linux, balbi, gregkh,
devicetree-discuss, linux-doc, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
On 09/25/2012 05:06 AM, ABRAHAM, KISHON VIJAY wrote:
> Hi,
>
> On Mon, Sep 24, 2012 at 6:45 PM, Rob Herring <robherring2@gmail.com> wrote:
>> On 09/06/2012 09:57 AM, Kishon Vijay Abraham I wrote:
>>> All phy related programming like enabling/disabling the clocks, powering
>>> on/off the phy is taken care of by this driver. It is also used for OTG
>>> related functionality like srp.
>>>
>>> This also includes device tree support for usb2 phy driver and
>>> the documentation with device tree binding information is updated.
>>>
>>> Currently writing to control module register is taken care in this
>>> driver which will be removed once the control module driver is in place.
>>>
>>> Cc: Felipe Balbi <balbi@ti.com>
>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>>> ---
>>> Documentation/devicetree/bindings/usb/usb-phy.txt | 17 ++
>>> drivers/usb/phy/Kconfig | 9 +
>>> drivers/usb/phy/Makefile | 1 +
>>> drivers/usb/phy/omap-usb2.c | 271 +++++++++++++++++++++
>>> include/linux/usb/omap_usb.h | 46 ++++
>>> include/linux/usb/phy_companion.h | 34 +++
>>> 6 files changed, 378 insertions(+)
>>> create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt
>>> create mode 100644 drivers/usb/phy/omap-usb2.c
>>> create mode 100644 include/linux/usb/omap_usb.h
>>> create mode 100644 include/linux/usb/phy_companion.h
>>>
>>> diff --git a/Documentation/devicetree/bindings/usb/usb-phy.txt b/Documentation/devicetree/bindings/usb/usb-phy.txt
>>> new file mode 100644
>>> index 0000000..80d4148
>>> --- /dev/null
>>> +++ b/Documentation/devicetree/bindings/usb/usb-phy.txt
>>
>> This is a very generic name...
>>
>>> @@ -0,0 +1,17 @@
>>> +USB PHY
>>> +
>>> +OMAP USB2 PHY
>>> +
>>> +Required properties:
>>> + - compatible: Should be "ti,omap-usb2"
>>
>> ...for a specific phy. However, I do think a generic binding to describe
>> host ctrlr to phy connections is needed.
>>
>>> + - reg : Address and length of the register set for the device. Also
>>> +add the address of control module dev conf register until a driver for
>>> +control module is added
>>
>> The dts should describe the h/w, not what you need for the current
>> driver. The 2nd reg field does not belong here.
>
> Indeed. This was discussed and agreed upon as a interim solution till
> we have a control module driver in place to write to the control
> module register.
Discussed where and agreed by who? I for one do not agree.
Rob
>>
>>> +
>>> +This is usually a subnode of ocp2scp to which it is connected.
>>
>> How is usb port to phy connection described?
> Currently the usb controller to phy connection is established only by
> type. We have a couple of patches being currently discussed in the
> list to establish the connection by phandle.
>
> https://patchwork.kernel.org/patch/1457801/ (Generic PHY Framework:
> devm_of_phy_get())
> http://www.spinics.net/lists/linux-usb/msg69547.html
>
> Thanks
> Kishon
>
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/5] drivers: usb: phy: add a new driver for omap usb2 phy
2012-09-27 14:24 ` Rob Herring
@ 2012-09-27 15:00 ` ABRAHAM, KISHON VIJAY
2012-09-27 22:48 ` Cousson, Benoit
1 sibling, 0 replies; 14+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-09-27 15:00 UTC (permalink / raw)
To: Rob Herring
Cc: grant.likely, rob, b-cousson, tony, linux, balbi, gregkh,
devicetree-discuss, linux-doc, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
Hi,
On Thu, Sep 27, 2012 at 7:54 PM, Rob Herring <robherring2@gmail.com> wrote:
> On 09/25/2012 05:06 AM, ABRAHAM, KISHON VIJAY wrote:
>> Hi,
>>
>> On Mon, Sep 24, 2012 at 6:45 PM, Rob Herring <robherring2@gmail.com> wrote:
>>> On 09/06/2012 09:57 AM, Kishon Vijay Abraham I wrote:
>>>> All phy related programming like enabling/disabling the clocks, powering
>>>> on/off the phy is taken care of by this driver. It is also used for OTG
>>>> related functionality like srp.
>>>>
>>>> This also includes device tree support for usb2 phy driver and
>>>> the documentation with device tree binding information is updated.
>>>>
>>>> Currently writing to control module register is taken care in this
>>>> driver which will be removed once the control module driver is in place.
>>>>
>>>> Cc: Felipe Balbi <balbi@ti.com>
>>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>>>> ---
>>>> Documentation/devicetree/bindings/usb/usb-phy.txt | 17 ++
>>>> drivers/usb/phy/Kconfig | 9 +
>>>> drivers/usb/phy/Makefile | 1 +
>>>> drivers/usb/phy/omap-usb2.c | 271 +++++++++++++++++++++
>>>> include/linux/usb/omap_usb.h | 46 ++++
>>>> include/linux/usb/phy_companion.h | 34 +++
>>>> 6 files changed, 378 insertions(+)
>>>> create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt
>>>> create mode 100644 drivers/usb/phy/omap-usb2.c
>>>> create mode 100644 include/linux/usb/omap_usb.h
>>>> create mode 100644 include/linux/usb/phy_companion.h
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/usb/usb-phy.txt b/Documentation/devicetree/bindings/usb/usb-phy.txt
>>>> new file mode 100644
>>>> index 0000000..80d4148
>>>> --- /dev/null
>>>> +++ b/Documentation/devicetree/bindings/usb/usb-phy.txt
>>>
>>> This is a very generic name...
>>>
>>>> @@ -0,0 +1,17 @@
>>>> +USB PHY
>>>> +
>>>> +OMAP USB2 PHY
>>>> +
>>>> +Required properties:
>>>> + - compatible: Should be "ti,omap-usb2"
>>>
>>> ...for a specific phy. However, I do think a generic binding to describe
>>> host ctrlr to phy connections is needed.
>>>
>>>> + - reg : Address and length of the register set for the device. Also
>>>> +add the address of control module dev conf register until a driver for
>>>> +control module is added
>>>
>>> The dts should describe the h/w, not what you need for the current
>>> driver. The 2nd reg field does not belong here.
>>
>> Indeed. This was discussed and agreed upon as a interim solution till
>> we have a control module driver in place to write to the control
>> module register.
>
> Discussed where and agreed by who? I for one do not agree.
Please find the discussion @ https://patchwork.kernel.org/patch/1415261/
Thanks
Kishon
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/5] drivers: usb: phy: add a new driver for omap usb2 phy
2012-09-27 14:24 ` Rob Herring
2012-09-27 15:00 ` ABRAHAM, KISHON VIJAY
@ 2012-09-27 22:48 ` Cousson, Benoit
2012-09-28 10:07 ` ABRAHAM, KISHON VIJAY
1 sibling, 1 reply; 14+ messages in thread
From: Cousson, Benoit @ 2012-09-27 22:48 UTC (permalink / raw)
To: Rob Herring
Cc: ABRAHAM, KISHON VIJAY, grant.likely, rob, tony, linux, balbi,
gregkh, devicetree-discuss, linux-doc, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
On 9/27/2012 7:24 AM, Rob Herring wrote:
> On 09/25/2012 05:06 AM, ABRAHAM, KISHON VIJAY wrote:
>> Hi,
>>
>> On Mon, Sep 24, 2012 at 6:45 PM, Rob Herring <robherring2@gmail.com> wrote:
>>> On 09/06/2012 09:57 AM, Kishon Vijay Abraham I wrote:
>>>> All phy related programming like enabling/disabling the clocks, powering
>>>> on/off the phy is taken care of by this driver. It is also used for OTG
>>>> related functionality like srp.
>>>>
>>>> This also includes device tree support for usb2 phy driver and
>>>> the documentation with device tree binding information is updated.
>>>>
>>>> Currently writing to control module register is taken care in this
>>>> driver which will be removed once the control module driver is in place.
>>>>
>>>> Cc: Felipe Balbi <balbi@ti.com>
>>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>>>> ---
>>>> Documentation/devicetree/bindings/usb/usb-phy.txt | 17 ++
>>>> drivers/usb/phy/Kconfig | 9 +
>>>> drivers/usb/phy/Makefile | 1 +
>>>> drivers/usb/phy/omap-usb2.c | 271 +++++++++++++++++++++
>>>> include/linux/usb/omap_usb.h | 46 ++++
>>>> include/linux/usb/phy_companion.h | 34 +++
>>>> 6 files changed, 378 insertions(+)
>>>> create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt
>>>> create mode 100644 drivers/usb/phy/omap-usb2.c
>>>> create mode 100644 include/linux/usb/omap_usb.h
>>>> create mode 100644 include/linux/usb/phy_companion.h
>>>>
>>>> diff --git a/Documentation/devicetree/bindings/usb/usb-phy.txt b/Documentation/devicetree/bindings/usb/usb-phy.txt
>>>> new file mode 100644
>>>> index 0000000..80d4148
>>>> --- /dev/null
>>>> +++ b/Documentation/devicetree/bindings/usb/usb-phy.txt
>>>
>>> This is a very generic name...
>>>
>>>> @@ -0,0 +1,17 @@
>>>> +USB PHY
>>>> +
>>>> +OMAP USB2 PHY
>>>> +
>>>> +Required properties:
>>>> + - compatible: Should be "ti,omap-usb2"
>>>
>>> ...for a specific phy. However, I do think a generic binding to describe
>>> host ctrlr to phy connections is needed.
>>>
>>>> + - reg : Address and length of the register set for the device. Also
>>>> +add the address of control module dev conf register until a driver for
>>>> +control module is added
>>>
>>> The dts should describe the h/w, not what you need for the current
>>> driver. The 2nd reg field does not belong here.
>>
>> Indeed. This was discussed and agreed upon as a interim solution till
>> we have a control module driver in place to write to the control
>> module register.
>
> Discussed where and agreed by who? I for one do not agree.
Yeah, what was tolerated was the addition of that address inside hwmod
data, but I do agree that it should not go into DTS.
Regards,
Benoit
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/5] drivers: usb: phy: add a new driver for omap usb2 phy
2012-09-27 22:48 ` Cousson, Benoit
@ 2012-09-28 10:07 ` ABRAHAM, KISHON VIJAY
2012-09-28 15:12 ` Cousson, Benoit
0 siblings, 1 reply; 14+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-09-28 10:07 UTC (permalink / raw)
To: Cousson, Benoit
Cc: Rob Herring, grant.likely, rob, tony, linux, balbi, gregkh,
devicetree-discuss, linux-doc, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
Hi,
On Fri, Sep 28, 2012 at 4:18 AM, Cousson, Benoit <b-cousson@ti.com> wrote:
> On 9/27/2012 7:24 AM, Rob Herring wrote:
>>
>> On 09/25/2012 05:06 AM, ABRAHAM, KISHON VIJAY wrote:
>>>
>>> Hi,
>>>
>>> On Mon, Sep 24, 2012 at 6:45 PM, Rob Herring <robherring2@gmail.com>
>>> wrote:
>>>>
>>>> On 09/06/2012 09:57 AM, Kishon Vijay Abraham I wrote:
>>>>>
>>>>> All phy related programming like enabling/disabling the clocks,
>>>>> powering
>>>>> on/off the phy is taken care of by this driver. It is also used for OTG
>>>>> related functionality like srp.
>>>>>
>>>>> This also includes device tree support for usb2 phy driver and
>>>>> the documentation with device tree binding information is updated.
>>>>>
>>>>> Currently writing to control module register is taken care in this
>>>>> driver which will be removed once the control module driver is in
>>>>> place.
>>>>>
>>>>> Cc: Felipe Balbi <balbi@ti.com>
>>>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>>>>> ---
>>>>> Documentation/devicetree/bindings/usb/usb-phy.txt | 17 ++
>>>>> drivers/usb/phy/Kconfig | 9 +
>>>>> drivers/usb/phy/Makefile | 1 +
>>>>> drivers/usb/phy/omap-usb2.c | 271
>>>>> +++++++++++++++++++++
>>>>> include/linux/usb/omap_usb.h | 46 ++++
>>>>> include/linux/usb/phy_companion.h | 34 +++
>>>>> 6 files changed, 378 insertions(+)
>>>>> create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt
>>>>> create mode 100644 drivers/usb/phy/omap-usb2.c
>>>>> create mode 100644 include/linux/usb/omap_usb.h
>>>>> create mode 100644 include/linux/usb/phy_companion.h
>>>>>
>>>>> diff --git a/Documentation/devicetree/bindings/usb/usb-phy.txt
>>>>> b/Documentation/devicetree/bindings/usb/usb-phy.txt
>>>>> new file mode 100644
>>>>> index 0000000..80d4148
>>>>> --- /dev/null
>>>>> +++ b/Documentation/devicetree/bindings/usb/usb-phy.txt
>>>>
>>>>
>>>> This is a very generic name...
>>>>
>>>>> @@ -0,0 +1,17 @@
>>>>> +USB PHY
>>>>> +
>>>>> +OMAP USB2 PHY
>>>>> +
>>>>> +Required properties:
>>>>> + - compatible: Should be "ti,omap-usb2"
>>>>
>>>>
>>>> ...for a specific phy. However, I do think a generic binding to describe
>>>> host ctrlr to phy connections is needed.
>>>>
>>>>> + - reg : Address and length of the register set for the device. Also
>>>>> +add the address of control module dev conf register until a driver for
>>>>> +control module is added
>>>>
>>>>
>>>> The dts should describe the h/w, not what you need for the current
>>>> driver. The 2nd reg field does not belong here.
>>>
>>>
>>> Indeed. This was discussed and agreed upon as a interim solution till
>>> we have a control module driver in place to write to the control
>>> module register.
>>
>>
>> Discussed where and agreed by who? I for one do not agree.
>
>
> Yeah, what was tolerated was the addition of that address inside hwmod data,
> but I do agree that it should not go into DTS.
So how can we handle reg writes to control module until we have a
control module driver. usb2 phy does not have a hwmod data for itself.
Do you think we should add a new hwmod data for usb2 phy and use this
in the usb2phy data node in the dts file?
Thanks
Kishon
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/5] drivers: usb: phy: add a new driver for omap usb2 phy
2012-09-28 10:07 ` ABRAHAM, KISHON VIJAY
@ 2012-09-28 15:12 ` Cousson, Benoit
2012-09-28 18:59 ` ABRAHAM, KISHON VIJAY
0 siblings, 1 reply; 14+ messages in thread
From: Cousson, Benoit @ 2012-09-28 15:12 UTC (permalink / raw)
To: ABRAHAM, KISHON VIJAY
Cc: Rob Herring, grant.likely, rob, tony, linux, balbi, gregkh,
devicetree-discuss, linux-doc, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
On 9/28/2012 3:07 AM, ABRAHAM, KISHON VIJAY wrote:
> Hi,
>
> On Fri, Sep 28, 2012 at 4:18 AM, Cousson, Benoit <b-cousson@ti.com> wrote:
>> On 9/27/2012 7:24 AM, Rob Herring wrote:
>>>
>>> On 09/25/2012 05:06 AM, ABRAHAM, KISHON VIJAY wrote:
>>>>
>>>> Hi,
>>>>
>>>> On Mon, Sep 24, 2012 at 6:45 PM, Rob Herring <robherring2@gmail.com>
>>>> wrote:
>>>>>
>>>>> On 09/06/2012 09:57 AM, Kishon Vijay Abraham I wrote:
>>>>>>
>>>>>> All phy related programming like enabling/disabling the clocks,
>>>>>> powering
>>>>>> on/off the phy is taken care of by this driver. It is also used for OTG
>>>>>> related functionality like srp.
>>>>>>
>>>>>> This also includes device tree support for usb2 phy driver and
>>>>>> the documentation with device tree binding information is updated.
>>>>>>
>>>>>> Currently writing to control module register is taken care in this
>>>>>> driver which will be removed once the control module driver is in
>>>>>> place.
>>>>>>
>>>>>> Cc: Felipe Balbi <balbi@ti.com>
>>>>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>>>>>> ---
>>>>>> Documentation/devicetree/bindings/usb/usb-phy.txt | 17 ++
>>>>>> drivers/usb/phy/Kconfig | 9 +
>>>>>> drivers/usb/phy/Makefile | 1 +
>>>>>> drivers/usb/phy/omap-usb2.c | 271
>>>>>> +++++++++++++++++++++
>>>>>> include/linux/usb/omap_usb.h | 46 ++++
>>>>>> include/linux/usb/phy_companion.h | 34 +++
>>>>>> 6 files changed, 378 insertions(+)
>>>>>> create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt
>>>>>> create mode 100644 drivers/usb/phy/omap-usb2.c
>>>>>> create mode 100644 include/linux/usb/omap_usb.h
>>>>>> create mode 100644 include/linux/usb/phy_companion.h
>>>>>>
>>>>>> diff --git a/Documentation/devicetree/bindings/usb/usb-phy.txt
>>>>>> b/Documentation/devicetree/bindings/usb/usb-phy.txt
>>>>>> new file mode 100644
>>>>>> index 0000000..80d4148
>>>>>> --- /dev/null
>>>>>> +++ b/Documentation/devicetree/bindings/usb/usb-phy.txt
>>>>>
>>>>>
>>>>> This is a very generic name...
>>>>>
>>>>>> @@ -0,0 +1,17 @@
>>>>>> +USB PHY
>>>>>> +
>>>>>> +OMAP USB2 PHY
>>>>>> +
>>>>>> +Required properties:
>>>>>> + - compatible: Should be "ti,omap-usb2"
>>>>>
>>>>>
>>>>> ...for a specific phy. However, I do think a generic binding to describe
>>>>> host ctrlr to phy connections is needed.
>>>>>
>>>>>> + - reg : Address and length of the register set for the device. Also
>>>>>> +add the address of control module dev conf register until a driver for
>>>>>> +control module is added
>>>>>
>>>>>
>>>>> The dts should describe the h/w, not what you need for the current
>>>>> driver. The 2nd reg field does not belong here.
>>>>
>>>>
>>>> Indeed. This was discussed and agreed upon as a interim solution till
>>>> we have a control module driver in place to write to the control
>>>> module register.
>>>
>>>
>>> Discussed where and agreed by who? I for one do not agree.
>>
>>
>> Yeah, what was tolerated was the addition of that address inside hwmod data,
>> but I do agree that it should not go into DTS.
>
> So how can we handle reg writes to control module until we have a
> control module driver. usb2 phy does not have a hwmod data for itself.
> Do you think we should add a new hwmod data for usb2 phy and use this
> in the usb2phy data node in the dts file?
Now, I'm confused... didn't you already do that? What was the hwmod you
added?
Maybe it is time to write your own control module driver now.
Talking with Tony on that, there is no need for a common control driver,
it is up to each individual control driver to handle their own register
space. It means that you should probably just add a simple driver to
access these region.
Regards,
Benoit
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH 1/5] drivers: usb: phy: add a new driver for omap usb2 phy
2012-09-28 15:12 ` Cousson, Benoit
@ 2012-09-28 18:59 ` ABRAHAM, KISHON VIJAY
0 siblings, 0 replies; 14+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-09-28 18:59 UTC (permalink / raw)
To: Cousson, Benoit
Cc: Rob Herring, grant.likely, rob, tony, linux, balbi, gregkh,
devicetree-discuss, linux-doc, linux-kernel, linux-omap,
linux-arm-kernel, linux-usb
Hi,
On Fri, Sep 28, 2012 at 8:42 PM, Cousson, Benoit <b-cousson@ti.com> wrote:
> On 9/28/2012 3:07 AM, ABRAHAM, KISHON VIJAY wrote:
>>
>> Hi,
>>
>> On Fri, Sep 28, 2012 at 4:18 AM, Cousson, Benoit <b-cousson@ti.com> wrote:
>>>
>>> On 9/27/2012 7:24 AM, Rob Herring wrote:
>>>>
>>>>
>>>> On 09/25/2012 05:06 AM, ABRAHAM, KISHON VIJAY wrote:
>>>>>
>>>>>
>>>>> Hi,
>>>>>
>>>>> On Mon, Sep 24, 2012 at 6:45 PM, Rob Herring <robherring2@gmail.com>
>>>>> wrote:
>>>>>>
>>>>>>
>>>>>> On 09/06/2012 09:57 AM, Kishon Vijay Abraham I wrote:
>>>>>>>
>>>>>>>
>>>>>>> All phy related programming like enabling/disabling the clocks,
>>>>>>> powering
>>>>>>> on/off the phy is taken care of by this driver. It is also used for
>>>>>>> OTG
>>>>>>> related functionality like srp.
>>>>>>>
>>>>>>> This also includes device tree support for usb2 phy driver and
>>>>>>> the documentation with device tree binding information is updated.
>>>>>>>
>>>>>>> Currently writing to control module register is taken care in this
>>>>>>> driver which will be removed once the control module driver is in
>>>>>>> place.
>>>>>>>
>>>>>>> Cc: Felipe Balbi <balbi@ti.com>
>>>>>>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>>>>>>> ---
>>>>>>> Documentation/devicetree/bindings/usb/usb-phy.txt | 17 ++
>>>>>>> drivers/usb/phy/Kconfig | 9 +
>>>>>>> drivers/usb/phy/Makefile | 1 +
>>>>>>> drivers/usb/phy/omap-usb2.c | 271
>>>>>>> +++++++++++++++++++++
>>>>>>> include/linux/usb/omap_usb.h | 46 ++++
>>>>>>> include/linux/usb/phy_companion.h | 34 +++
>>>>>>> 6 files changed, 378 insertions(+)
>>>>>>> create mode 100644
>>>>>>> Documentation/devicetree/bindings/usb/usb-phy.txt
>>>>>>> create mode 100644 drivers/usb/phy/omap-usb2.c
>>>>>>> create mode 100644 include/linux/usb/omap_usb.h
>>>>>>> create mode 100644 include/linux/usb/phy_companion.h
>>>>>>>
>>>>>>> diff --git a/Documentation/devicetree/bindings/usb/usb-phy.txt
>>>>>>> b/Documentation/devicetree/bindings/usb/usb-phy.txt
>>>>>>> new file mode 100644
>>>>>>> index 0000000..80d4148
>>>>>>> --- /dev/null
>>>>>>> +++ b/Documentation/devicetree/bindings/usb/usb-phy.txt
>>>>>>
>>>>>>
>>>>>>
>>>>>> This is a very generic name...
>>>>>>
>>>>>>> @@ -0,0 +1,17 @@
>>>>>>> +USB PHY
>>>>>>> +
>>>>>>> +OMAP USB2 PHY
>>>>>>> +
>>>>>>> +Required properties:
>>>>>>> + - compatible: Should be "ti,omap-usb2"
>>>>>>
>>>>>>
>>>>>>
>>>>>> ...for a specific phy. However, I do think a generic binding to
>>>>>> describe
>>>>>> host ctrlr to phy connections is needed.
>>>>>>
>>>>>>> + - reg : Address and length of the register set for the device. Also
>>>>>>> +add the address of control module dev conf register until a driver
>>>>>>> for
>>>>>>> +control module is added
>>>>>>
>>>>>>
>>>>>>
>>>>>> The dts should describe the h/w, not what you need for the current
>>>>>> driver. The 2nd reg field does not belong here.
>>>>>
>>>>>
>>>>>
>>>>> Indeed. This was discussed and agreed upon as a interim solution till
>>>>> we have a control module driver in place to write to the control
>>>>> module register.
>>>>
>>>>
>>>>
>>>> Discussed where and agreed by who? I for one do not agree.
>>>
>>>
>>>
>>> Yeah, what was tolerated was the addition of that address inside hwmod
>>> data,
>>> but I do agree that it should not go into DTS.
>>
>>
>> So how can we handle reg writes to control module until we have a
>> control module driver. usb2 phy does not have a hwmod data for itself.
>> Do you think we should add a new hwmod data for usb2 phy and use this
>> in the usb2phy data node in the dts file?
>
>
> Now, I'm confused... didn't you already do that? What was the hwmod you
> added?
That was in usb_otg_hs (musb glue for omap) for writing to MUSB
mailbox. This is for usb2 phy for powering on/off the PHY.
Thanks
Kishon
^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH 2/5] drivers: usb: otg: make twl6030_usb as a comparator driver to omap_usb2
2012-09-06 14:57 [PATCH 0/5] usb: phy/otg: add dt support Kishon Vijay Abraham I
2012-09-06 14:57 ` [PATCH 1/5] drivers: usb: phy: add a new driver for omap usb2 phy Kishon Vijay Abraham I
@ 2012-09-06 14:57 ` Kishon Vijay Abraham I
2012-09-06 14:57 ` [PATCH 3/5] drivers: usb: twl6030: Add dt support for twl6030 usb Kishon Vijay Abraham I
` (2 subsequent siblings)
4 siblings, 0 replies; 14+ messages in thread
From: Kishon Vijay Abraham I @ 2012-09-06 14:57 UTC (permalink / raw)
To: grant.likely, rob.herring, rob, b-cousson, tony, linux, balbi,
gregkh, kishon, devicetree-discuss, linux-doc, linux-kernel,
linux-omap, linux-arm-kernel, linux-usb
All the PHY configuration other than VBUS, ID GND and OTG SRP are removed
from twl6030. The phy configurations are taken care by the dedicated
usb2 phy driver. So twl6030 is made as comparator driver for VBUS and
ID detection.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
drivers/usb/otg/Kconfig | 2 +-
drivers/usb/otg/twl6030-usb.c | 118 +++++++----------------------------------
2 files changed, 19 insertions(+), 101 deletions(-)
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index 13fd1ddf..d8c8a42 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -68,7 +68,7 @@ config TWL4030_USB
config TWL6030_USB
tristate "TWL6030 USB Transceiver Driver"
- depends on TWL4030_CORE
+ depends on TWL4030_CORE && OMAP_USB2
select USB_OTG_UTILS
help
Enable this to support the USB OTG transceiver on TWL6030
diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c
index 6907d8d..32525bb 100644
--- a/drivers/usb/otg/twl6030-usb.c
+++ b/drivers/usb/otg/twl6030-usb.c
@@ -25,8 +25,9 @@
#include <linux/interrupt.h>
#include <linux/platform_device.h>
#include <linux/io.h>
-#include <linux/usb/otg.h>
#include <linux/usb/musb-omap.h>
+#include <linux/usb/phy_companion.h>
+#include <linux/usb/omap_usb.h>
#include <linux/i2c/twl.h>
#include <linux/regulator/consumer.h>
#include <linux/err.h>
@@ -87,7 +88,7 @@
#define VBUS_DET BIT(2)
struct twl6030_usb {
- struct usb_phy phy;
+ struct phy_companion comparator;
struct device *dev;
/* for vbus reporting with irqs disabled */
@@ -107,7 +108,7 @@ struct twl6030_usb {
unsigned long features;
};
-#define phy_to_twl(x) container_of((x), struct twl6030_usb, phy)
+#define comparator_to_twl(x) container_of((x), struct twl6030_usb, comparator)
/*-------------------------------------------------------------------------*/
@@ -137,50 +138,9 @@ static inline u8 twl6030_readb(struct twl6030_usb *twl, u8 module, u8 address)
return ret;
}
-static int twl6030_phy_init(struct usb_phy *x)
+static int twl6030_start_srp(struct phy_companion *comparator)
{
- struct twl6030_usb *twl;
- struct device *dev;
- struct twl4030_usb_data *pdata;
-
- twl = phy_to_twl(x);
- dev = twl->dev;
- pdata = dev->platform_data;
-
- if (twl->linkstat == OMAP_MUSB_ID_GROUND)
- pdata->phy_power(twl->dev, 1, 1);
- else
- pdata->phy_power(twl->dev, 0, 1);
-
- return 0;
-}
-
-static void twl6030_phy_shutdown(struct usb_phy *x)
-{
- struct twl6030_usb *twl;
- struct device *dev;
- struct twl4030_usb_data *pdata;
-
- twl = phy_to_twl(x);
- dev = twl->dev;
- pdata = dev->platform_data;
- pdata->phy_power(twl->dev, 0, 0);
-}
-
-static int twl6030_phy_suspend(struct usb_phy *x, int suspend)
-{
- struct twl6030_usb *twl = phy_to_twl(x);
- struct device *dev = twl->dev;
- struct twl4030_usb_data *pdata = dev->platform_data;
-
- pdata->phy_suspend(dev, suspend);
-
- return 0;
-}
-
-static int twl6030_start_srp(struct usb_otg *otg)
-{
- struct twl6030_usb *twl = phy_to_twl(otg->phy);
+ struct twl6030_usb *twl = comparator_to_twl(comparator);
twl6030_writeb(twl, TWL_MODULE_USB, 0x24, USB_VBUS_CTRL_SET);
twl6030_writeb(twl, TWL_MODULE_USB, 0x84, USB_VBUS_CTRL_SET);
@@ -313,23 +273,8 @@ static irqreturn_t twl6030_usbotg_irq(int irq, void *_twl)
return IRQ_HANDLED;
}
-static int twl6030_set_peripheral(struct usb_otg *otg,
- struct usb_gadget *gadget)
+static int twl6030_enable_irq(struct twl6030_usb *twl)
{
- if (!otg)
- return -ENODEV;
-
- otg->gadget = gadget;
- if (!gadget)
- otg->phy->state = OTG_STATE_UNDEFINED;
-
- return 0;
-}
-
-static int twl6030_enable_irq(struct usb_phy *x)
-{
- struct twl6030_usb *twl = phy_to_twl(x);
-
twl6030_writeb(twl, TWL_MODULE_USB, 0x1, USB_ID_INT_EN_HI_SET);
twl6030_interrupt_unmask(0x05, REG_INT_MSK_LINE_C);
twl6030_interrupt_unmask(0x05, REG_INT_MSK_STS_C);
@@ -362,9 +307,9 @@ static void otg_set_vbus_work(struct work_struct *data)
CHARGERUSB_CTRL1);
}
-static int twl6030_set_vbus(struct usb_otg *otg, bool enabled)
+static int twl6030_set_vbus(struct phy_companion *comparator, bool enabled)
{
- struct twl6030_usb *twl = phy_to_twl(otg->phy);
+ struct twl6030_usb *twl = comparator_to_twl(comparator);
twl->vbus_enable = enabled;
schedule_work(&twl->set_vbus_work);
@@ -372,23 +317,12 @@ static int twl6030_set_vbus(struct usb_otg *otg, bool enabled)
return 0;
}
-static int twl6030_set_host(struct usb_otg *otg, struct usb_bus *host)
-{
- if (!otg)
- return -ENODEV;
-
- otg->host = host;
- if (!host)
- otg->phy->state = OTG_STATE_UNDEFINED;
- return 0;
-}
-
static int __devinit twl6030_usb_probe(struct platform_device *pdev)
{
+ u32 ret;
struct twl6030_usb *twl;
int status, err;
struct twl4030_usb_data *pdata;
- struct usb_otg *otg;
struct device *dev = &pdev->dev;
pdata = dev->platform_data;
@@ -396,28 +330,20 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
if (!twl)
return -ENOMEM;
- otg = devm_kzalloc(dev, sizeof *otg, GFP_KERNEL);
- if (!otg)
- return -ENOMEM;
-
twl->dev = &pdev->dev;
twl->irq1 = platform_get_irq(pdev, 0);
twl->irq2 = platform_get_irq(pdev, 1);
twl->features = pdata->features;
twl->linkstat = OMAP_MUSB_UNKNOWN;
- twl->phy.dev = twl->dev;
- twl->phy.label = "twl6030";
- twl->phy.otg = otg;
- twl->phy.init = twl6030_phy_init;
- twl->phy.shutdown = twl6030_phy_shutdown;
- twl->phy.set_suspend = twl6030_phy_suspend;
+ twl->comparator.set_vbus = twl6030_set_vbus;
+ twl->comparator.start_srp = twl6030_start_srp;
- otg->phy = &twl->phy;
- otg->set_host = twl6030_set_host;
- otg->set_peripheral = twl6030_set_peripheral;
- otg->set_vbus = twl6030_set_vbus;
- otg->start_srp = twl6030_start_srp;
+ ret = omap_usb2_set_comparator(&twl->comparator);
+ if (ret == -ENODEV) {
+ dev_info(&pdev->dev, "phy not ready, deferring probe");
+ return -EPROBE_DEFER;
+ }
/* init spinlock for workqueue */
spin_lock_init(&twl->lock);
@@ -427,7 +353,6 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "ldo init failed\n");
return err;
}
- usb_add_phy(&twl->phy, USB_PHY_TYPE_USB2);
platform_set_drvdata(pdev, twl);
if (device_create_file(&pdev->dev, &dev_attr_vbus))
@@ -458,9 +383,7 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
}
twl->asleep = 0;
- pdata->phy_init(dev);
- twl6030_phy_suspend(&twl->phy, 0);
- twl6030_enable_irq(&twl->phy);
+ twl6030_enable_irq(twl);
dev_info(&pdev->dev, "Initialized TWL6030 USB module\n");
return 0;
@@ -470,10 +393,6 @@ static int __exit twl6030_usb_remove(struct platform_device *pdev)
{
struct twl6030_usb *twl = platform_get_drvdata(pdev);
- struct twl4030_usb_data *pdata;
- struct device *dev = &pdev->dev;
- pdata = dev->platform_data;
-
twl6030_interrupt_mask(TWL6030_USBOTG_INT_MASK,
REG_INT_MSK_LINE_C);
twl6030_interrupt_mask(TWL6030_USBOTG_INT_MASK,
@@ -481,7 +400,6 @@ static int __exit twl6030_usb_remove(struct platform_device *pdev)
free_irq(twl->irq1, twl);
free_irq(twl->irq2, twl);
regulator_put(twl->usb3v3);
- pdata->phy_exit(twl->dev);
device_remove_file(twl->dev, &dev_attr_vbus);
cancel_work_sync(&twl->set_vbus_work);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 3/5] drivers: usb: twl6030: Add dt support for twl6030 usb
2012-09-06 14:57 [PATCH 0/5] usb: phy/otg: add dt support Kishon Vijay Abraham I
2012-09-06 14:57 ` [PATCH 1/5] drivers: usb: phy: add a new driver for omap usb2 phy Kishon Vijay Abraham I
2012-09-06 14:57 ` [PATCH 2/5] drivers: usb: otg: make twl6030_usb as a comparator driver to omap_usb2 Kishon Vijay Abraham I
@ 2012-09-06 14:57 ` Kishon Vijay Abraham I
2012-09-06 14:57 ` [PATCH 4/5] drivers: usb: twl4030: Add device tree support for twl4030 usb Kishon Vijay Abraham I
2012-09-06 14:57 ` [PATCH 5/5] arm: omap: phy: remove unused functions from omap-phy-internal.c Kishon Vijay Abraham I
4 siblings, 0 replies; 14+ messages in thread
From: Kishon Vijay Abraham I @ 2012-09-06 14:57 UTC (permalink / raw)
To: grant.likely, rob.herring, rob, b-cousson, tony, linux, balbi,
gregkh, kishon, devicetree-discuss, linux-doc, linux-kernel,
linux-omap, linux-arm-kernel, linux-usb
Add device tree support for twl6030 usb driver.
Update the Documentation with device tree binding information.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
.../devicetree/bindings/usb/twlxxxx-usb.txt | 21 +++++++++++
drivers/usb/otg/twl6030-usb.c | 39 +++++++++++++-------
2 files changed, 47 insertions(+), 13 deletions(-)
create mode 100644 Documentation/devicetree/bindings/usb/twlxxxx-usb.txt
diff --git a/Documentation/devicetree/bindings/usb/twlxxxx-usb.txt b/Documentation/devicetree/bindings/usb/twlxxxx-usb.txt
new file mode 100644
index 0000000..930f9ff
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/twlxxxx-usb.txt
@@ -0,0 +1,21 @@
+USB COMPARATOR OF TWL CHIPS
+
+TWL6030 USB COMPARATOR
+ - compatible : Should be "ti,twl6030-usb"
+ - interrupts : Two interrupt numbers to the cpu should be specified. First
+ interrupt number is the otg interrupt number that raises ID interrupts when
+ the controller has to act as host and the second interrupt number is the
+ usb interrupt number that raises VBUS interrupts when the controller has to
+ act as device
+ - usb-supply : phandle to the regulator device tree node. It should be vusb
+ if it is twl6030 or ldousb if it is twl6025 subclass.
+
+twl6030-usb {
+ compatible = "ti,twl6030-usb";
+ interrupts = < 4 10 >;
+};
+
+Board specific device node entry
+&twl6030-usb {
+ usb-supply = <&vusb>;
+};
diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c
index 32525bb..fcadef7 100644
--- a/drivers/usb/otg/twl6030-usb.c
+++ b/drivers/usb/otg/twl6030-usb.c
@@ -105,7 +105,7 @@ struct twl6030_usb {
u8 asleep;
bool irq_enabled;
bool vbus_enable;
- unsigned long features;
+ const char *regulator;
};
#define comparator_to_twl(x) container_of((x), struct twl6030_usb, comparator)
@@ -153,13 +153,6 @@ static int twl6030_start_srp(struct phy_companion *comparator)
static int twl6030_usb_ldo_init(struct twl6030_usb *twl)
{
- char *regulator_name;
-
- if (twl->features & TWL6025_SUBCLASS)
- regulator_name = "ldousb";
- else
- regulator_name = "vusb";
-
/* Set to OTG_REV 1.3 and turn on the ID_WAKEUP_COMP */
twl6030_writeb(twl, TWL6030_MODULE_ID0 , 0x1, TWL6030_BACKUP_REG);
@@ -169,7 +162,7 @@ static int twl6030_usb_ldo_init(struct twl6030_usb *twl)
/* Program MISC2 register and set bit VUSB_IN_VBAT */
twl6030_writeb(twl, TWL6030_MODULE_ID0 , 0x10, TWL6030_MISC2);
- twl->usb3v3 = regulator_get(twl->dev, regulator_name);
+ twl->usb3v3 = regulator_get(twl->dev, twl->regulator);
if (IS_ERR(twl->usb3v3))
return -ENODEV;
@@ -322,9 +315,9 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
u32 ret;
struct twl6030_usb *twl;
int status, err;
- struct twl4030_usb_data *pdata;
- struct device *dev = &pdev->dev;
- pdata = dev->platform_data;
+ struct device_node *np = pdev->dev.of_node;
+ struct device *dev = &pdev->dev;
+ struct twl4030_usb_data *pdata = dev->platform_data;
twl = devm_kzalloc(dev, sizeof *twl, GFP_KERNEL);
if (!twl)
@@ -333,7 +326,6 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
twl->dev = &pdev->dev;
twl->irq1 = platform_get_irq(pdev, 0);
twl->irq2 = platform_get_irq(pdev, 1);
- twl->features = pdata->features;
twl->linkstat = OMAP_MUSB_UNKNOWN;
twl->comparator.set_vbus = twl6030_set_vbus;
@@ -345,6 +337,18 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
return -EPROBE_DEFER;
}
+ if (np) {
+ twl->regulator = "usb";
+ } else if (pdata) {
+ if (pdata->features & TWL6025_SUBCLASS)
+ twl->regulator = "ldousb";
+ else
+ twl->regulator = "vusb";
+ } else {
+ dev_err(&pdev->dev, "twl6030 initialized without pdata\n");
+ return -EINVAL;
+ }
+
/* init spinlock for workqueue */
spin_lock_init(&twl->lock);
@@ -406,12 +410,21 @@ static int __exit twl6030_usb_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_OF
+static const struct of_device_id twl6030_usb_id_table[] = {
+ { .compatible = "ti,twl6030-usb" },
+ {}
+};
+MODULE_DEVICE_TABLE(of, twl6030_usb_id_table);
+#endif
+
static struct platform_driver twl6030_usb_driver = {
.probe = twl6030_usb_probe,
.remove = __exit_p(twl6030_usb_remove),
.driver = {
.name = "twl6030_usb",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(twl6030_usb_id_table),
},
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 4/5] drivers: usb: twl4030: Add device tree support for twl4030 usb
2012-09-06 14:57 [PATCH 0/5] usb: phy/otg: add dt support Kishon Vijay Abraham I
` (2 preceding siblings ...)
2012-09-06 14:57 ` [PATCH 3/5] drivers: usb: twl6030: Add dt support for twl6030 usb Kishon Vijay Abraham I
@ 2012-09-06 14:57 ` Kishon Vijay Abraham I
2012-09-06 14:57 ` [PATCH 5/5] arm: omap: phy: remove unused functions from omap-phy-internal.c Kishon Vijay Abraham I
4 siblings, 0 replies; 14+ messages in thread
From: Kishon Vijay Abraham I @ 2012-09-06 14:57 UTC (permalink / raw)
To: grant.likely, rob.herring, rob, b-cousson, tony, linux, balbi,
gregkh, kishon, devicetree-discuss, linux-doc, linux-kernel,
linux-omap, linux-arm-kernel, linux-usb
Add device tree support for twl4030 usb driver.
Update the Documentation with device tree binding information.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
.../devicetree/bindings/usb/twlxxxx-usb.txt | 19 ++++++++++++++
drivers/usb/otg/twl4030-usb.c | 26 +++++++++++++++-----
2 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/twlxxxx-usb.txt b/Documentation/devicetree/bindings/usb/twlxxxx-usb.txt
index 930f9ff..36b9aed 100644
--- a/Documentation/devicetree/bindings/usb/twlxxxx-usb.txt
+++ b/Documentation/devicetree/bindings/usb/twlxxxx-usb.txt
@@ -19,3 +19,22 @@ Board specific device node entry
&twl6030-usb {
usb-supply = <&vusb>;
};
+
+TWL4030 USB PHY AND COMPARATOR
+ - compatible : Should be "ti,twl4030-usb"
+ - interrupts : The interrupt numbers to the cpu should be specified. First
+ interrupt number is the otg interrupt number that raises ID interrupts
+ and VBUS interrupts. The second interrupt number is optional.
+ - <supply-name>-supply : phandle to the regulator device tree node.
+ <supply-name> should be vusb1v5, vusb1v8 and vusb3v1
+ - usb_mode : The mode used by the phy to connect to the controller. "1"
+ specifies "ULPI" mode and "2" specifies "CEA2011_3PIN" mode.
+
+twl4030-usb {
+ compatible = "ti,twl4030-usb";
+ interrupts = < 10 4 >;
+ usb1v5-supply = <&vusb1v5>;
+ usb1v8-supply = <&vusb1v8>;
+ usb3v1-supply = <&vusb3v1>;
+ usb_mode = <1>;
+};
diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index 523cad5..f0d2e75 100644
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -585,23 +585,28 @@ static int __devinit twl4030_usb_probe(struct platform_device *pdev)
struct twl4030_usb *twl;
int status, err;
struct usb_otg *otg;
-
- if (!pdata) {
- dev_dbg(&pdev->dev, "platform_data not available\n");
- return -EINVAL;
- }
+ struct device_node *np = pdev->dev.of_node;
twl = devm_kzalloc(&pdev->dev, sizeof *twl, GFP_KERNEL);
if (!twl)
return -ENOMEM;
+ if (np)
+ of_property_read_u32(np, "usb_mode",
+ (enum twl4030_usb_mode *)&twl->usb_mode);
+ else if (pdata)
+ twl->usb_mode = pdata->usb_mode;
+ else {
+ dev_err(&pdev->dev, "twl4030 initialized without pdata\n");
+ return -EINVAL;
+ }
+
otg = devm_kzalloc(&pdev->dev, sizeof *otg, GFP_KERNEL);
if (!otg)
return -ENOMEM;
twl->dev = &pdev->dev;
twl->irq = platform_get_irq(pdev, 0);
- twl->usb_mode = pdata->usb_mode;
twl->vbus_supplied = false;
twl->asleep = 1;
twl->linkstat = OMAP_MUSB_UNKNOWN;
@@ -690,12 +695,21 @@ static int __exit twl4030_usb_remove(struct platform_device *pdev)
return 0;
}
+#ifdef CONFIG_OF
+static const struct of_device_id twl4030_usb_id_table[] = {
+ { .compatible = "ti,twl4030-usb" },
+ {}
+};
+MODULE_DEVICE_TABLE(of, twl4030_usb_id_table);
+#endif
+
static struct platform_driver twl4030_usb_driver = {
.probe = twl4030_usb_probe,
.remove = __exit_p(twl4030_usb_remove),
.driver = {
.name = "twl4030_usb",
.owner = THIS_MODULE,
+ .of_match_table = of_match_ptr(twl4030_usb_id_table),
},
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread* [PATCH 5/5] arm: omap: phy: remove unused functions from omap-phy-internal.c
2012-09-06 14:57 [PATCH 0/5] usb: phy/otg: add dt support Kishon Vijay Abraham I
` (3 preceding siblings ...)
2012-09-06 14:57 ` [PATCH 4/5] drivers: usb: twl4030: Add device tree support for twl4030 usb Kishon Vijay Abraham I
@ 2012-09-06 14:57 ` Kishon Vijay Abraham I
4 siblings, 0 replies; 14+ messages in thread
From: Kishon Vijay Abraham I @ 2012-09-06 14:57 UTC (permalink / raw)
To: grant.likely, rob.herring, rob, b-cousson, tony, linux, balbi,
gregkh, kishon, devicetree-discuss, linux-doc, linux-kernel,
linux-omap, linux-arm-kernel, linux-usb
All the unnessary functions in omap-phy-internal is removed.
These functionality are now handled by omap-usb2 phy driver.
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/omap_phy_internal.c | 138 -------------------------------
arch/arm/mach-omap2/twl-common.c | 5 --
arch/arm/mach-omap2/usb-musb.c | 3 -
3 files changed, 146 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_phy_internal.c b/arch/arm/mach-omap2/omap_phy_internal.c
index d52651a..874aecc 100644
--- a/arch/arm/mach-omap2/omap_phy_internal.c
+++ b/arch/arm/mach-omap2/omap_phy_internal.c
@@ -31,144 +31,6 @@
#include <plat/usb.h>
#include "control.h"
-/* OMAP control module register for UTMI PHY */
-#define CONTROL_DEV_CONF 0x300
-#define PHY_PD 0x1
-
-#define USBOTGHS_CONTROL 0x33c
-#define AVALID BIT(0)
-#define BVALID BIT(1)
-#define VBUSVALID BIT(2)
-#define SESSEND BIT(3)
-#define IDDIG BIT(4)
-
-static struct clk *phyclk, *clk48m, *clk32k;
-static void __iomem *ctrl_base;
-static int usbotghs_control;
-
-int omap4430_phy_init(struct device *dev)
-{
- ctrl_base = ioremap(OMAP443X_SCM_BASE, SZ_1K);
- if (!ctrl_base) {
- pr_err("control module ioremap failed\n");
- return -ENOMEM;
- }
- /* Power down the phy */
- __raw_writel(PHY_PD, ctrl_base + CONTROL_DEV_CONF);
-
- if (!dev) {
- iounmap(ctrl_base);
- return 0;
- }
-
- phyclk = clk_get(dev, "ocp2scp_usb_phy_ick");
- if (IS_ERR(phyclk)) {
- dev_err(dev, "cannot clk_get ocp2scp_usb_phy_ick\n");
- iounmap(ctrl_base);
- return PTR_ERR(phyclk);
- }
-
- clk48m = clk_get(dev, "ocp2scp_usb_phy_phy_48m");
- if (IS_ERR(clk48m)) {
- dev_err(dev, "cannot clk_get ocp2scp_usb_phy_phy_48m\n");
- clk_put(phyclk);
- iounmap(ctrl_base);
- return PTR_ERR(clk48m);
- }
-
- clk32k = clk_get(dev, "usb_phy_cm_clk32k");
- if (IS_ERR(clk32k)) {
- dev_err(dev, "cannot clk_get usb_phy_cm_clk32k\n");
- clk_put(phyclk);
- clk_put(clk48m);
- iounmap(ctrl_base);
- return PTR_ERR(clk32k);
- }
- return 0;
-}
-
-int omap4430_phy_set_clk(struct device *dev, int on)
-{
- static int state;
-
- if (on && !state) {
- /* Enable the phy clocks */
- clk_enable(phyclk);
- clk_enable(clk48m);
- clk_enable(clk32k);
- state = 1;
- } else if (state) {
- /* Disable the phy clocks */
- clk_disable(phyclk);
- clk_disable(clk48m);
- clk_disable(clk32k);
- state = 0;
- }
- return 0;
-}
-
-int omap4430_phy_power(struct device *dev, int ID, int on)
-{
- if (on) {
- if (ID)
- /* enable VBUS valid, IDDIG groung */
- __raw_writel(AVALID | VBUSVALID, ctrl_base +
- USBOTGHS_CONTROL);
- else
- /*
- * Enable VBUS Valid, AValid and IDDIG
- * high impedance
- */
- __raw_writel(IDDIG | AVALID | VBUSVALID,
- ctrl_base + USBOTGHS_CONTROL);
- } else {
- /* Enable session END and IDIG to high impedance. */
- __raw_writel(SESSEND | IDDIG, ctrl_base +
- USBOTGHS_CONTROL);
- }
- return 0;
-}
-
-int omap4430_phy_suspend(struct device *dev, int suspend)
-{
- if (suspend) {
- /* Disable the clocks */
- omap4430_phy_set_clk(dev, 0);
- /* Power down the phy */
- __raw_writel(PHY_PD, ctrl_base + CONTROL_DEV_CONF);
-
- /* save the context */
- usbotghs_control = __raw_readl(ctrl_base + USBOTGHS_CONTROL);
- } else {
- /* Enable the internel phy clcoks */
- omap4430_phy_set_clk(dev, 1);
- /* power on the phy */
- if (__raw_readl(ctrl_base + CONTROL_DEV_CONF) & PHY_PD) {
- __raw_writel(~PHY_PD, ctrl_base + CONTROL_DEV_CONF);
- mdelay(200);
- }
-
- /* restore the context */
- __raw_writel(usbotghs_control, ctrl_base + USBOTGHS_CONTROL);
- }
-
- return 0;
-}
-
-int omap4430_phy_exit(struct device *dev)
-{
- if (ctrl_base)
- iounmap(ctrl_base);
- if (phyclk)
- clk_put(phyclk);
- if (clk48m)
- clk_put(clk48m);
- if (clk32k)
- clk_put(clk32k);
-
- return 0;
-}
-
void am35x_musb_reset(void)
{
u32 regval;
diff --git a/arch/arm/mach-omap2/twl-common.c b/arch/arm/mach-omap2/twl-common.c
index de47f17..e2cdf67 100644
--- a/arch/arm/mach-omap2/twl-common.c
+++ b/arch/arm/mach-omap2/twl-common.c
@@ -250,11 +250,6 @@ void __init omap3_pmic_get_config(struct twl4030_platform_data *pmic_data,
#if defined(CONFIG_ARCH_OMAP4)
static struct twl4030_usb_data omap4_usb_pdata = {
- .phy_init = omap4430_phy_init,
- .phy_exit = omap4430_phy_exit,
- .phy_power = omap4430_phy_power,
- .phy_set_clock = omap4430_phy_set_clk,
- .phy_suspend = omap4430_phy_suspend,
};
static struct regulator_init_data omap4_vdac_idata = {
diff --git a/arch/arm/mach-omap2/usb-musb.c b/arch/arm/mach-omap2/usb-musb.c
index c4a5768..e9b4b23 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -117,7 +117,4 @@ void __init usb_musb_init(struct omap_musb_board_data *musb_board_data)
dev->dma_mask = &musb_dmamask;
dev->coherent_dma_mask = musb_dmamask;
put_device(dev);
-
- if (cpu_is_omap44xx())
- omap4430_phy_init(dev);
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 14+ messages in thread