* [PATCH v6 01/11] drivers: usb: otg: add a new driver for omap usb2 phy
2012-07-30 9:09 [PATCH v6 00/11] omap: musb: Add device tree support Kishon Vijay Abraham I
@ 2012-07-30 9:09 ` Kishon Vijay Abraham I
2012-07-30 9:37 ` Shubhrajyoti
2012-08-03 13:27 ` Felipe Balbi
2012-07-30 9:09 ` [PATCH v6 02/11] arm/dts: omap: Add omap-usb2 dt data Kishon Vijay Abraham I
` (10 subsequent siblings)
11 siblings, 2 replies; 38+ messages in thread
From: Kishon Vijay Abraham I @ 2012-07-30 9:09 UTC (permalink / raw)
To: linux-arm-kernel
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>
---
.../devicetree/bindings/bus/omap-ocp2scp.txt | 3 +
Documentation/devicetree/bindings/usb/omap-usb.txt | 17 ++
drivers/usb/otg/Kconfig | 10 +
drivers/usb/otg/Makefile | 1 +
drivers/usb/otg/omap-usb2.c | 280 ++++++++++++++++++++
include/linux/usb/omap_usb.h | 45 ++++
include/linux/usb/phy_companion.h | 34 +++
7 files changed, 390 insertions(+)
create mode 100644 Documentation/devicetree/bindings/usb/omap-usb.txt
create mode 100644 drivers/usb/otg/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/bus/omap-ocp2scp.txt b/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
index d2fe064..bb0c7f4 100644
--- a/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
+++ b/Documentation/devicetree/bindings/bus/omap-ocp2scp.txt
@@ -8,3 +8,6 @@ properties:
Sub-nodes:
All the devices connected to ocp2scp are described using sub-node to ocp2scp
+- usb2phy :
+ The binding details of usb2phy can be found in:
+ Documentation/devicetree/bindings/usb/omap-usb.txt
diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt
new file mode 100644
index 0000000..52f503b
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/omap-usb.txt
@@ -0,0 +1,17 @@
+OMAP 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 at 4a0ad080 {
+ compatible = "ti,omap-usb2";
+ reg = <0x4a0ad080 0x58>,
+ <0x4a002300 0x1>;
+};
diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
index 5c87db0..c751db7 100644
--- a/drivers/usb/otg/Kconfig
+++ b/drivers/usb/otg/Kconfig
@@ -78,6 +78,16 @@ config TWL6030_USB
are hooked to this driver through platform_data structure.
The definition of internal PHY APIs are in the mach-omap2 layer.
+config OMAP_USB2
+ tristate "OMAP USB2 PHY Driver"
+ depends on OMAP_OCP2SCP
+ 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 NOP_USB_XCEIV
tristate "NOP USB Transceiver Driver"
select USB_OTG_UTILS
diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile
index 41aa509..2c2a3ca 100644
--- a/drivers/usb/otg/Makefile
+++ b/drivers/usb/otg/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_USB_GPIO_VBUS) += gpio_vbus.o
obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
obj-$(CONFIG_TWL4030_USB) += twl4030-usb.o
obj-$(CONFIG_TWL6030_USB) += twl6030-usb.o
+obj-$(CONFIG_OMAP_USB2) += omap-usb2.o
obj-$(CONFIG_NOP_USB_XCEIV) += nop-usb-xceiv.o
obj-$(CONFIG_USB_ULPI) += ulpi.o
obj-$(CONFIG_USB_ULPI_VIEWPORT) += ulpi_viewport.o
diff --git a/drivers/usb/otg/omap-usb2.c b/drivers/usb/otg/omap-usb2.c
new file mode 100644
index 0000000..026cb3c
--- /dev/null
+++ b/drivers/usb/otg/omap-usb2.c
@@ -0,0 +1,280 @@
+/*
+ * 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
+ */
+void omap_usb2_set_comparator(struct phy_companion *comparator)
+{
+ struct omap_usb *phy;
+ struct usb_phy *x = usb_get_phy(USB_PHY_TYPE_USB2);
+
+ if (x) {
+ phy = phy_to_omapusb(x);
+ phy->comparator = comparator;
+ }
+}
+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);
+ platform_set_drvdata(pdev, NULL);
+
+ 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),
+ },
+};
+
+static int __init usb2_omap_init(void)
+{
+ return platform_driver_register(&omap_usb2_driver);
+}
+arch_initcall(usb2_omap_init);
+
+static void __exit usb2_omap_exit(void)
+{
+ platform_driver_unregister(&omap_usb2_driver);
+}
+module_exit(usb2_omap_exit);
+
+MODULE_ALIAS("platform: omap_usb2");
+MODULE_AUTHOR("Texas Instruments Inc.");
+MODULE_DESCRIPTION("OMAP USB2 PHY DRIVER");
+MODULE_LICENSE("GPLv2");
diff --git a/include/linux/usb/omap_usb.h b/include/linux/usb/omap_usb.h
new file mode 100644
index 0000000..fcabc93
--- /dev/null
+++ b/include/linux/usb/omap_usb.h
@@ -0,0 +1,45 @@
+/*
+ * 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 void omap_usb2_set_comparator(struct phy_companion *comparator);
+#else
+static inline void omap_usb2_set_comparator(struct phy_companion *comparator)
+{
+}
+#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] 38+ messages in thread* [PATCH v6 01/11] drivers: usb: otg: add a new driver for omap usb2 phy
2012-07-30 9:09 ` [PATCH v6 01/11] drivers: usb: otg: add a new driver for omap usb2 phy Kishon Vijay Abraham I
@ 2012-07-30 9:37 ` Shubhrajyoti
2012-07-30 9:46 ` ABRAHAM, KISHON VIJAY
2012-08-03 13:27 ` Felipe Balbi
1 sibling, 1 reply; 38+ messages in thread
From: Shubhrajyoti @ 2012-07-30 9:37 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 30 July 2012 02:39 PM, Kishon Vijay Abraham I wrote:
> + writel(~PHY_PD, phy->control_dev);
> + /* XXX: add proper documentation for this delay */
> + mdelay(200);
Do you need this to be busy?
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 01/11] drivers: usb: otg: add a new driver for omap usb2 phy
2012-07-30 9:37 ` Shubhrajyoti
@ 2012-07-30 9:46 ` ABRAHAM, KISHON VIJAY
2012-07-30 10:04 ` Shubhrajyoti
0 siblings, 1 reply; 38+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-07-30 9:46 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Mon, Jul 30, 2012 at 3:07 PM, Shubhrajyoti <shubhrajyoti@ti.com> wrote:
> On Monday 30 July 2012 02:39 PM, Kishon Vijay Abraham I wrote:
>> + writel(~PHY_PD, phy->control_dev);
>> + /* XXX: add proper documentation for this delay */
>> + mdelay(200);
> Do you need this to be busy?
This might be called from interrupt context. This delay was initially
added in omap_phy_internal.c and I just inherited it.
Thanks
Kishon
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 01/11] drivers: usb: otg: add a new driver for omap usb2 phy
2012-07-30 9:46 ` ABRAHAM, KISHON VIJAY
@ 2012-07-30 10:04 ` Shubhrajyoti
0 siblings, 0 replies; 38+ messages in thread
From: Shubhrajyoti @ 2012-07-30 10:04 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 30 July 2012 03:16 PM, ABRAHAM, KISHON VIJAY wrote:
> Hi,
>
> On Mon, Jul 30, 2012 at 3:07 PM, Shubhrajyoti <shubhrajyoti@ti.com> wrote:
>> On Monday 30 July 2012 02:39 PM, Kishon Vijay Abraham I wrote:
>>> + writel(~PHY_PD, phy->control_dev);
>>> + /* XXX: add proper documentation for this delay */
>>> + mdelay(200);
>> Do you need this to be busy?
> This might be called from interrupt context. This delay was initially
> added in omap_phy_internal.c and I just inherited it.
Thanks for the explanation.
> Thanks
> Kishon
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 01/11] drivers: usb: otg: add a new driver for omap usb2 phy
2012-07-30 9:09 ` [PATCH v6 01/11] drivers: usb: otg: add a new driver for omap usb2 phy Kishon Vijay Abraham I
2012-07-30 9:37 ` Shubhrajyoti
@ 2012-08-03 13:27 ` Felipe Balbi
2012-08-03 14:31 ` ABRAHAM, KISHON VIJAY
1 sibling, 1 reply; 38+ messages in thread
From: Felipe Balbi @ 2012-08-03 13:27 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 30, 2012 at 02:39:50PM +0530, 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>
> ---
> .../devicetree/bindings/bus/omap-ocp2scp.txt | 3 +
> Documentation/devicetree/bindings/usb/omap-usb.txt | 17 ++
> drivers/usb/otg/Kconfig | 10 +
> drivers/usb/otg/Makefile | 1 +
> drivers/usb/otg/omap-usb2.c | 280 ++++++++++++++++++++
let's move this to drivers/usb/phy/. I'll prepare a patch moving all phy
drivers to that directory after the OTG state machine is ready ;-)
> diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt
> new file mode 100644
> index 0000000..52f503b
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/usb/omap-usb.txt
> @@ -0,0 +1,17 @@
> +OMAP 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 at 4a0ad080 {
> + compatible = "ti,omap-usb2";
> + reg = <0x4a0ad080 0x58>,
> + <0x4a002300 0x1>;
> +};
> diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
> index 5c87db0..c751db7 100644
> --- a/drivers/usb/otg/Kconfig
> +++ b/drivers/usb/otg/Kconfig
> @@ -78,6 +78,16 @@ config TWL6030_USB
> are hooked to this driver through platform_data structure.
> The definition of internal PHY APIs are in the mach-omap2 layer.
>
> +config OMAP_USB2
> + tristate "OMAP USB2 PHY Driver"
> + depends on OMAP_OCP2SCP
> + 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 NOP_USB_XCEIV
> tristate "NOP USB Transceiver Driver"
> select USB_OTG_UTILS
> diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile
> index 41aa509..2c2a3ca 100644
> --- a/drivers/usb/otg/Makefile
> +++ b/drivers/usb/otg/Makefile
> @@ -13,6 +13,7 @@ obj-$(CONFIG_USB_GPIO_VBUS) += gpio_vbus.o
> obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
> obj-$(CONFIG_TWL4030_USB) += twl4030-usb.o
> obj-$(CONFIG_TWL6030_USB) += twl6030-usb.o
> +obj-$(CONFIG_OMAP_USB2) += omap-usb2.o
> obj-$(CONFIG_NOP_USB_XCEIV) += nop-usb-xceiv.o
> obj-$(CONFIG_USB_ULPI) += ulpi.o
> obj-$(CONFIG_USB_ULPI_VIEWPORT) += ulpi_viewport.o
> diff --git a/drivers/usb/otg/omap-usb2.c b/drivers/usb/otg/omap-usb2.c
> new file mode 100644
> index 0000000..026cb3c
> --- /dev/null
> +++ b/drivers/usb/otg/omap-usb2.c
> @@ -0,0 +1,280 @@
> +/*
> + * 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
> + */
> +void omap_usb2_set_comparator(struct phy_companion *comparator)
> +{
> + struct omap_usb *phy;
> + struct usb_phy *x = usb_get_phy(USB_PHY_TYPE_USB2);
> +
> + if (x) {
> + phy = phy_to_omapusb(x);
> + phy->comparator = comparator;
> + }
> +}
> +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);
> + platform_set_drvdata(pdev, NULL);
this platform_set_drvdata() is unnecessary as the pdev object will be
destroyed.
> + 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);
weird. I would expect the wakeup clock to be enabled on suspend and
disabled on resume. Isn't this causing any unbalanced disable warnings ?
> +
> + 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)
only runtime ? What about static suspend ? We need this to work also
after a traditional echo mem > /sys/power/state ;-)
> +#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),
> + },
> +};
> +
> +static int __init usb2_omap_init(void)
> +{
> + return platform_driver_register(&omap_usb2_driver);
> +}
> +arch_initcall(usb2_omap_init);
I'd really like to see this converted into a module_platform_driver().
If you have dependencies, just make sure to return -EPROBE_DEFER so your
probe gets retried.
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120803/824dddba/attachment.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread* [PATCH v6 01/11] drivers: usb: otg: add a new driver for omap usb2 phy
2012-08-03 13:27 ` Felipe Balbi
@ 2012-08-03 14:31 ` ABRAHAM, KISHON VIJAY
2012-08-06 8:49 ` Felipe Balbi
0 siblings, 1 reply; 38+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-08-03 14:31 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Fri, Aug 3, 2012 at 6:57 PM, Felipe Balbi <balbi@ti.com> wrote:
> On Mon, Jul 30, 2012 at 02:39:50PM +0530, 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>
>> ---
>> .../devicetree/bindings/bus/omap-ocp2scp.txt | 3 +
>> Documentation/devicetree/bindings/usb/omap-usb.txt | 17 ++
>> drivers/usb/otg/Kconfig | 10 +
>> drivers/usb/otg/Makefile | 1 +
>> drivers/usb/otg/omap-usb2.c | 280 ++++++++++++++++++++
>
> let's move this to drivers/usb/phy/. I'll prepare a patch moving all phy
> drivers to that directory after the OTG state machine is ready ;-)
Ok.
>
>> diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt
>> new file mode 100644
>> index 0000000..52f503b
>> --- /dev/null
>> +++ b/Documentation/devicetree/bindings/usb/omap-usb.txt
>> @@ -0,0 +1,17 @@
>> +OMAP 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 at 4a0ad080 {
>> + compatible = "ti,omap-usb2";
>> + reg = <0x4a0ad080 0x58>,
>> + <0x4a002300 0x1>;
>> +};
>> diff --git a/drivers/usb/otg/Kconfig b/drivers/usb/otg/Kconfig
>> index 5c87db0..c751db7 100644
>> --- a/drivers/usb/otg/Kconfig
>> +++ b/drivers/usb/otg/Kconfig
>> @@ -78,6 +78,16 @@ config TWL6030_USB
>> are hooked to this driver through platform_data structure.
>> The definition of internal PHY APIs are in the mach-omap2 layer.
>>
>> +config OMAP_USB2
>> + tristate "OMAP USB2 PHY Driver"
>> + depends on OMAP_OCP2SCP
>> + 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 NOP_USB_XCEIV
>> tristate "NOP USB Transceiver Driver"
>> select USB_OTG_UTILS
>> diff --git a/drivers/usb/otg/Makefile b/drivers/usb/otg/Makefile
>> index 41aa509..2c2a3ca 100644
>> --- a/drivers/usb/otg/Makefile
>> +++ b/drivers/usb/otg/Makefile
>> @@ -13,6 +13,7 @@ obj-$(CONFIG_USB_GPIO_VBUS) += gpio_vbus.o
>> obj-$(CONFIG_ISP1301_OMAP) += isp1301_omap.o
>> obj-$(CONFIG_TWL4030_USB) += twl4030-usb.o
>> obj-$(CONFIG_TWL6030_USB) += twl6030-usb.o
>> +obj-$(CONFIG_OMAP_USB2) += omap-usb2.o
>> obj-$(CONFIG_NOP_USB_XCEIV) += nop-usb-xceiv.o
>> obj-$(CONFIG_USB_ULPI) += ulpi.o
>> obj-$(CONFIG_USB_ULPI_VIEWPORT) += ulpi_viewport.o
>> diff --git a/drivers/usb/otg/omap-usb2.c b/drivers/usb/otg/omap-usb2.c
>> new file mode 100644
>> index 0000000..026cb3c
>> --- /dev/null
>> +++ b/drivers/usb/otg/omap-usb2.c
>> @@ -0,0 +1,280 @@
>> +/*
>> + * 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
>> + */
>> +void omap_usb2_set_comparator(struct phy_companion *comparator)
>> +{
>> + struct omap_usb *phy;
>> + struct usb_phy *x = usb_get_phy(USB_PHY_TYPE_USB2);
>> +
>> + if (x) {
>> + phy = phy_to_omapusb(x);
>> + phy->comparator = comparator;
>> + }
>> +}
>> +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);
>> + platform_set_drvdata(pdev, NULL);
>
> this platform_set_drvdata() is unnecessary as the pdev object will be
> destroyed.
Fine. Will remove it.
>
>> + 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);
>
> weird. I would expect the wakeup clock to be enabled on suspend and
> disabled on resume. Isn't this causing any unbalanced disable warnings ?
Even I was expecting the wakeup clock to be enabled on suspend but if
we have this enabled coreaon domain is never
gated and core does not hit low power state. btw Why do think this is
unbalanced?
>
>> +
>> + 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)
>
> only runtime ? What about static suspend ? We need this to work also
> after a traditional echo mem > /sys/power/state ;-)
The static suspend case is handled by users of this phy using set_suspend hooks.
>
>> +#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),
>> + },
>> +};
>> +
>> +static int __init usb2_omap_init(void)
>> +{
>> + return platform_driver_register(&omap_usb2_driver);
>> +}
>> +arch_initcall(usb2_omap_init);
>
> I'd really like to see this converted into a module_platform_driver().
> If you have dependencies, just make sure to return -EPROBE_DEFER so your
> probe gets retried.
Sure.
Thanks
Kishon
^ permalink raw reply [flat|nested] 38+ messages in thread* [PATCH v6 01/11] drivers: usb: otg: add a new driver for omap usb2 phy
2012-08-03 14:31 ` ABRAHAM, KISHON VIJAY
@ 2012-08-06 8:49 ` Felipe Balbi
2012-08-06 9:44 ` ABRAHAM, KISHON VIJAY
0 siblings, 1 reply; 38+ messages in thread
From: Felipe Balbi @ 2012-08-06 8:49 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Fri, Aug 03, 2012 at 08:01:44PM +0530, ABRAHAM, KISHON VIJAY wrote:
> >> + 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);
> >
> > weird. I would expect the wakeup clock to be enabled on suspend and
> > disabled on resume. Isn't this causing any unbalanced disable warnings ?
>
> Even I was expecting the wakeup clock to be enabled on suspend but if
> we have this enabled coreaon domain is never
> gated and core does not hit low power state. btw Why do think this is
> unbalanced?
because you never do a clk_enable() on probe(), so on your first
suspend, you will disable the clock without having enabled it before,
no? Unless pm_runtime forces a runtime_resume() when you call
pm_runtime_enable()...
> >> +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)
> >
> > only runtime ? What about static suspend ? We need this to work also
> > after a traditional echo mem > /sys/power/state ;-)
>
> The static suspend case is handled by users of this phy using
> set_suspend hooks.
I'm not sure if that's too wise, what if your user enabled USB, but
for whatever reason loaded only the phy driver and not musb or dwc3. It
will fail, right ?
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120806/d9818cf0/attachment.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread* [PATCH v6 01/11] drivers: usb: otg: add a new driver for omap usb2 phy
2012-08-06 8:49 ` Felipe Balbi
@ 2012-08-06 9:44 ` ABRAHAM, KISHON VIJAY
2012-08-06 9:44 ` Felipe Balbi
0 siblings, 1 reply; 38+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-08-06 9:44 UTC (permalink / raw)
To: linux-arm-kernel
Hi Felipe,
On Mon, Aug 6, 2012 at 2:19 PM, Felipe Balbi <balbi@ti.com> wrote:
> Hi,
>
> On Fri, Aug 03, 2012 at 08:01:44PM +0530, ABRAHAM, KISHON VIJAY wrote:
>> >> + 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);
>> >
>> > weird. I would expect the wakeup clock to be enabled on suspend and
>> > disabled on resume. Isn't this causing any unbalanced disable warnings ?
>>
>> Even I was expecting the wakeup clock to be enabled on suspend but if
>> we have this enabled coreaon domain is never
>> gated and core does not hit low power state. btw Why do think this is
>> unbalanced?
>
> because you never do a clk_enable() on probe(), so on your first
> suspend, you will disable the clock without having enabled it before,
> no? Unless pm_runtime forces a runtime_resume() when you call
> pm_runtime_enable()...
>
>> >> +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)
>> >
>> > only runtime ? What about static suspend ? We need this to work also
>> > after a traditional echo mem > /sys/power/state ;-)
>>
>> The static suspend case is handled by users of this phy using
>> set_suspend hooks.
>
> I'm not sure if that's too wise, what if your user enabled USB, but
> for whatever reason loaded only the phy driver and not musb or dwc3. It
> will fail, right ?
The enabling and disabling of phy is solely governed by usb controller
driver (musb/dwc3). So if you dont have musb/dwc3 loaded, the phy will
be for sure disabled.
Thanks
Kishon
^ permalink raw reply [flat|nested] 38+ messages in thread* [PATCH v6 01/11] drivers: usb: otg: add a new driver for omap usb2 phy
2012-08-06 9:44 ` ABRAHAM, KISHON VIJAY
@ 2012-08-06 9:44 ` Felipe Balbi
0 siblings, 0 replies; 38+ messages in thread
From: Felipe Balbi @ 2012-08-06 9:44 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Aug 06, 2012 at 03:14:42PM +0530, ABRAHAM, KISHON VIJAY wrote:
> >> >> +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)
> >> >
> >> > only runtime ? What about static suspend ? We need this to work also
> >> > after a traditional echo mem > /sys/power/state ;-)
> >>
> >> The static suspend case is handled by users of this phy using
> >> set_suspend hooks.
> >
> > I'm not sure if that's too wise, what if your user enabled USB, but
> > for whatever reason loaded only the phy driver and not musb or dwc3. It
> > will fail, right ?
>
> The enabling and disabling of phy is solely governed by usb controller
> driver (musb/dwc3). So if you dont have musb/dwc3 loaded, the phy will
> be for sure disabled.
fair enough... that's ok then ;-)
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120806/890a3afc/attachment.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 02/11] arm/dts: omap: Add omap-usb2 dt data
2012-07-30 9:09 [PATCH v6 00/11] omap: musb: Add device tree support Kishon Vijay Abraham I
2012-07-30 9:09 ` [PATCH v6 01/11] drivers: usb: otg: add a new driver for omap usb2 phy Kishon Vijay Abraham I
@ 2012-07-30 9:09 ` Kishon Vijay Abraham I
2012-08-03 13:27 ` Felipe Balbi
2012-07-30 9:09 ` [PATCH v6 03/11] drivers: usb: otg: make twl6030_usb as a comparator driver to omap_usb2 Kishon Vijay Abraham I
` (9 subsequent siblings)
11 siblings, 1 reply; 38+ messages in thread
From: Kishon Vijay Abraham I @ 2012-07-30 9:09 UTC (permalink / raw)
To: linux-arm-kernel
Add omap-usb2 data node in omap4 device tree file.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/omap4.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 29c6243..15f1890 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -279,6 +279,11 @@
#size-cells = <1>;
ranges;
ti,hwmods = "ocp2scp_usb_phy";
+ usb2phy at 4a0ad080 {
+ compatible = "ti,omap-usb2";
+ reg = <0x4a0ad080 0x58>,
+ <0x4a002300 0x1>;
+ };
};
};
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v6 02/11] arm/dts: omap: Add omap-usb2 dt data
2012-07-30 9:09 ` [PATCH v6 02/11] arm/dts: omap: Add omap-usb2 dt data Kishon Vijay Abraham I
@ 2012-08-03 13:27 ` Felipe Balbi
0 siblings, 0 replies; 38+ messages in thread
From: Felipe Balbi @ 2012-08-03 13:27 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 30, 2012 at 02:39:51PM +0530, Kishon Vijay Abraham I wrote:
> Add omap-usb2 data node in omap4 device tree file.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
looks good:
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> arch/arm/boot/dts/omap4.dtsi | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> index 29c6243..15f1890 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -279,6 +279,11 @@
> #size-cells = <1>;
> ranges;
> ti,hwmods = "ocp2scp_usb_phy";
> + usb2phy at 4a0ad080 {
> + compatible = "ti,omap-usb2";
> + reg = <0x4a0ad080 0x58>,
> + <0x4a002300 0x1>;
> + };
> };
> };
> };
> --
> 1.7.9.5
>
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120803/9196615d/attachment.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 03/11] drivers: usb: otg: make twl6030_usb as a comparator driver to omap_usb2
2012-07-30 9:09 [PATCH v6 00/11] omap: musb: Add device tree support Kishon Vijay Abraham I
2012-07-30 9:09 ` [PATCH v6 01/11] drivers: usb: otg: add a new driver for omap usb2 phy Kishon Vijay Abraham I
2012-07-30 9:09 ` [PATCH v6 02/11] arm/dts: omap: Add omap-usb2 dt data Kishon Vijay Abraham I
@ 2012-07-30 9:09 ` Kishon Vijay Abraham I
2012-08-03 13:28 ` Felipe Balbi
2012-07-30 9:09 ` [PATCH v6 04/11] arm: omap: hwmod: add a new addr space in otg for writing to control module Kishon Vijay Abraham I
` (8 subsequent siblings)
11 siblings, 1 reply; 38+ messages in thread
From: Kishon Vijay Abraham I @ 2012-07-30 9:09 UTC (permalink / raw)
To: linux-arm-kernel
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.
Writing to control module which is now handled in omap2430.c should be
removed once a driver for control module is in place.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
drivers/usb/musb/omap2430.c | 52 ++++++++++++++++---
drivers/usb/musb/omap2430.h | 9 ++++
drivers/usb/otg/twl6030-usb.c | 114 +++++------------------------------------
3 files changed, 67 insertions(+), 108 deletions(-)
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index 5fdb9da..addbebf 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -44,6 +44,7 @@ struct omap2430_glue {
struct platform_device *musb;
enum omap_musb_vbus_id_status status;
struct work_struct omap_musb_mailbox_work;
+ u32 __iomem *control_otghs;
};
#define glue_to_musb(g) platform_get_drvdata(g->musb)
@@ -51,6 +52,26 @@ struct omap2430_glue *_glue;
static struct timer_list musb_idle_timer;
+/**
+ * omap4_usb_phy_mailbox - write to usb otg mailbox
+ * @glue: struct omap2430_glue *
+ * @val: the value to be written to the mailbox
+ *
+ * On detection of a device (ID pin is grounded), this API should be called
+ * to set AVALID, VBUSVALID and ID pin is grounded.
+ *
+ * When OMAP is connected to a host (OMAP in device mode), this API
+ * is called to set AVALID, VBUSVALID and ID pin in high impedance.
+ *
+ * XXX: This function will be removed once we have a seperate driver for
+ * control module
+ */
+static void omap4_usb_phy_mailbox(struct omap2430_glue *glue, u32 val)
+{
+ if (glue->control_otghs)
+ writel(val, glue->control_otghs);
+}
+
static void musb_do_idle(unsigned long _musb)
{
struct musb *musb = (void *)_musb;
@@ -245,6 +266,7 @@ EXPORT_SYMBOL_GPL(omap_musb_mailbox);
static void omap_musb_set_mailbox(struct omap2430_glue *glue)
{
+ u32 val;
struct musb *musb = glue_to_musb(glue);
struct device *dev = musb->controller;
struct musb_hdrc_platform_data *pdata = dev->platform_data;
@@ -260,7 +282,8 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
musb->xceiv->last_event = USB_EVENT_ID;
if (!is_otg_enabled(musb) || musb->gadget_driver) {
pm_runtime_get_sync(dev);
- usb_phy_init(musb->xceiv);
+ val = AVALID | VBUSVALID;
+ omap4_usb_phy_mailbox(glue, val);
omap2430_musb_set_vbus(musb, 1);
}
break;
@@ -273,7 +296,8 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
musb->xceiv->last_event = USB_EVENT_VBUS;
if (musb->gadget_driver)
pm_runtime_get_sync(dev);
- usb_phy_init(musb->xceiv);
+ val = IDDIG | AVALID | VBUSVALID;
+ omap4_usb_phy_mailbox(glue, val);
break;
case OMAP_MUSB_ID_FLOAT:
@@ -291,7 +315,8 @@ static void omap_musb_set_mailbox(struct omap2430_glue *glue)
if (musb->xceiv->otg->set_vbus)
otg_set_vbus(musb->xceiv->otg, 0);
}
- usb_phy_shutdown(musb->xceiv);
+ val = SESSEND | IDDIG;
+ omap4_usb_phy_mailbox(glue, val);
break;
default:
dev_dbg(dev, "ID float\n");
@@ -366,6 +391,7 @@ err1:
static void omap2430_musb_enable(struct musb *musb)
{
u8 devctl;
+ u32 val;
unsigned long timeout = jiffies + msecs_to_jiffies(1000);
struct device *dev = musb->controller;
struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
@@ -375,7 +401,8 @@ static void omap2430_musb_enable(struct musb *musb)
switch (glue->status) {
case OMAP_MUSB_ID_GROUND:
- usb_phy_init(musb->xceiv);
+ val = AVALID | VBUSVALID;
+ omap4_usb_phy_mailbox(glue, val);
if (data->interface_type != MUSB_INTERFACE_UTMI)
break;
devctl = musb_readb(musb->mregs, MUSB_DEVCTL);
@@ -394,7 +421,8 @@ static void omap2430_musb_enable(struct musb *musb)
break;
case OMAP_MUSB_VBUS_VALID:
- usb_phy_init(musb->xceiv);
+ val = IDDIG | AVALID | VBUSVALID;
+ omap4_usb_phy_mailbox(glue, val);
break;
default:
@@ -404,11 +432,14 @@ static void omap2430_musb_enable(struct musb *musb)
static void omap2430_musb_disable(struct musb *musb)
{
+ u32 val;
struct device *dev = musb->controller;
struct omap2430_glue *glue = dev_get_drvdata(dev->parent);
- if (glue->status != OMAP_MUSB_UNKNOWN)
- usb_phy_shutdown(musb->xceiv);
+ if (glue->status != OMAP_MUSB_UNKNOWN) {
+ val = SESSEND | IDDIG;
+ omap4_usb_phy_mailbox(glue, val);
+ }
}
static int omap2430_musb_exit(struct musb *musb)
@@ -440,6 +471,7 @@ static int __devinit omap2430_probe(struct platform_device *pdev)
struct musb_hdrc_platform_data *pdata = pdev->dev.platform_data;
struct platform_device *musb;
struct omap2430_glue *glue;
+ struct resource *res;
int ret = -ENOMEM;
glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL);
@@ -462,6 +494,12 @@ static int __devinit omap2430_probe(struct platform_device *pdev)
glue->musb = musb;
glue->status = OMAP_MUSB_UNKNOWN;
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+
+ glue->control_otghs = devm_request_and_ioremap(&pdev->dev, res);
+ if (glue->control_otghs == NULL)
+ dev_dbg(&pdev->dev, "Failed to obtain control memory\n");
+
pdata->platform_ops = &omap2430_ops;
platform_set_drvdata(pdev, glue);
diff --git a/drivers/usb/musb/omap2430.h b/drivers/usb/musb/omap2430.h
index 40b3c02..b85f397 100644
--- a/drivers/usb/musb/omap2430.h
+++ b/drivers/usb/musb/omap2430.h
@@ -49,4 +49,13 @@
#define OTG_FORCESTDBY 0x414
# define ENABLEFORCE (1 << 0)
+/*
+ * Control Module bit definitions
+ * XXX: Will be removed once we have a driver for control module.
+ */
+#define AVALID BIT(0)
+#define BVALID BIT(1)
+#define VBUSVALID BIT(2)
+#define SESSEND BIT(3)
+#define IDDIG BIT(4)
#endif /* __MUSB_OMAP243X_H__ */
diff --git a/drivers/usb/otg/twl6030-usb.c b/drivers/usb/otg/twl6030-usb.c
index 600c27a..6a361d2 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);
@@ -316,23 +276,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, USB_ID_INT_EN_HI_SET, 0x1);
twl6030_interrupt_unmask(0x05, REG_INT_MSK_LINE_C);
twl6030_interrupt_unmask(0x05, REG_INT_MSK_STS_C);
@@ -365,9 +310,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);
@@ -375,23 +320,11 @@ 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)
{
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;
@@ -399,28 +332,15 @@ 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;
-
- 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;
+ twl->comparator.set_vbus = twl6030_set_vbus;
+ twl->comparator.start_srp = twl6030_start_srp;
+ omap_usb2_set_comparator(&twl->comparator);
/* init spinlock for workqueue */
spin_lock_init(&twl->lock);
@@ -430,7 +350,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))
@@ -461,9 +380,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;
@@ -473,10 +390,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,
@@ -484,7 +397,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] 38+ messages in thread* [PATCH v6 03/11] drivers: usb: otg: make twl6030_usb as a comparator driver to omap_usb2
2012-07-30 9:09 ` [PATCH v6 03/11] drivers: usb: otg: make twl6030_usb as a comparator driver to omap_usb2 Kishon Vijay Abraham I
@ 2012-08-03 13:28 ` Felipe Balbi
2012-08-03 14:33 ` ABRAHAM, KISHON VIJAY
0 siblings, 1 reply; 38+ messages in thread
From: Felipe Balbi @ 2012-08-03 13:28 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Mon, Jul 30, 2012 at 02:39:52PM +0530, Kishon Vijay Abraham I wrote:
> 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.
>
> Writing to control module which is now handled in omap2430.c should be
> removed once a driver for control module is in place.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
This looks good for the time being. Do you think it has any hard
dependencies on your new phy drivers, or can I apply this without those
other patches ??
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120803/a7f8d5e9/attachment-0001.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 03/11] drivers: usb: otg: make twl6030_usb as a comparator driver to omap_usb2
2012-08-03 13:28 ` Felipe Balbi
@ 2012-08-03 14:33 ` ABRAHAM, KISHON VIJAY
0 siblings, 0 replies; 38+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-08-03 14:33 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Fri, Aug 3, 2012 at 6:58 PM, Felipe Balbi <balbi@ti.com> wrote:
> Hi,
>
> On Mon, Jul 30, 2012 at 02:39:52PM +0530, Kishon Vijay Abraham I wrote:
>> 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.
>>
>> Writing to control module which is now handled in omap2430.c should be
>> removed once a driver for control module is in place.
>>
>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>
> This looks good for the time being. Do you think it has any hard
> dependencies on your new phy drivers, or can I apply this without those
> other patches ??
It has a hard dependency on usb2phy driver.
Thanks
Kishon
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 04/11] arm: omap: hwmod: add a new addr space in otg for writing to control module
2012-07-30 9:09 [PATCH v6 00/11] omap: musb: Add device tree support Kishon Vijay Abraham I
` (2 preceding siblings ...)
2012-07-30 9:09 ` [PATCH v6 03/11] drivers: usb: otg: make twl6030_usb as a comparator driver to omap_usb2 Kishon Vijay Abraham I
@ 2012-07-30 9:09 ` Kishon Vijay Abraham I
2012-08-03 13:29 ` Felipe Balbi
2012-07-30 9:09 ` [PATCH v6 05/11] drivers: usb: twl6030: Add dt support for twl6030 usb Kishon Vijay Abraham I
` (7 subsequent siblings)
11 siblings, 1 reply; 38+ messages in thread
From: Kishon Vijay Abraham I @ 2012-07-30 9:09 UTC (permalink / raw)
To: linux-arm-kernel
The mailbox register for usb otg in omap is present in control module.
On detection of any events VBUS or ID, this register should be written
to send the notification to musb core.
Till we have a separate control module driver to write to control module,
omap2430 will handle the register writes to control module by itself. So
a new address space to represent this control module register is added
to usb_otg_hs.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index 249ff76..775e185 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -5934,6 +5934,11 @@ static struct omap_hwmod_addr_space omap44xx_wd_timer2_addrs[] = {
.pa_end = 0x4a31407f,
.flags = ADDR_TYPE_RT
},
+ {
+ .pa_start = 0x4a00233c,
+ .pa_end = 0x4a00233f,
+ .flags = ADDR_TYPE_RT
+ },
{ }
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v6 04/11] arm: omap: hwmod: add a new addr space in otg for writing to control module
2012-07-30 9:09 ` [PATCH v6 04/11] arm: omap: hwmod: add a new addr space in otg for writing to control module Kishon Vijay Abraham I
@ 2012-08-03 13:29 ` Felipe Balbi
2012-08-03 14:37 ` ABRAHAM, KISHON VIJAY
0 siblings, 1 reply; 38+ messages in thread
From: Felipe Balbi @ 2012-08-03 13:29 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 30, 2012 at 02:39:53PM +0530, Kishon Vijay Abraham I wrote:
> The mailbox register for usb otg in omap is present in control module.
> On detection of any events VBUS or ID, this register should be written
> to send the notification to musb core.
>
> Till we have a separate control module driver to write to control module,
> omap2430 will handle the register writes to control module by itself. So
> a new address space to represent this control module register is added
> to usb_otg_hs.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
this should come before previous patch, right ? Otherwise we will try to
ioremap a resource which isn't passed down to driver. No ?
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120803/3660c173/attachment.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 04/11] arm: omap: hwmod: add a new addr space in otg for writing to control module
2012-08-03 13:29 ` Felipe Balbi
@ 2012-08-03 14:37 ` ABRAHAM, KISHON VIJAY
0 siblings, 0 replies; 38+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-08-03 14:37 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Fri, Aug 3, 2012 at 6:59 PM, Felipe Balbi <balbi@ti.com> wrote:
> On Mon, Jul 30, 2012 at 02:39:53PM +0530, Kishon Vijay Abraham I wrote:
>> The mailbox register for usb otg in omap is present in control module.
>> On detection of any events VBUS or ID, this register should be written
>> to send the notification to musb core.
>>
>> Till we have a separate control module driver to write to control module,
>> omap2430 will handle the register writes to control module by itself. So
>> a new address space to represent this control module register is added
>> to usb_otg_hs.
>>
>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>
> this should come before previous patch, right ? Otherwise we will try to
> ioremap a resource which isn't passed down to driver. No ?
right. Will change the order in my next series.
Thanks
Kishon
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 05/11] drivers: usb: twl6030: Add dt support for twl6030 usb
2012-07-30 9:09 [PATCH v6 00/11] omap: musb: Add device tree support Kishon Vijay Abraham I
` (3 preceding siblings ...)
2012-07-30 9:09 ` [PATCH v6 04/11] arm: omap: hwmod: add a new addr space in otg for writing to control module Kishon Vijay Abraham I
@ 2012-07-30 9:09 ` Kishon Vijay Abraham I
2012-08-03 13:31 ` Felipe Balbi
2012-07-30 9:09 ` [PATCH v6 06/11] arm/dts: Add twl6030-usb data Kishon Vijay Abraham I
` (6 subsequent siblings)
11 siblings, 1 reply; 38+ messages in thread
From: Kishon Vijay Abraham I @ 2012-07-30 9:09 UTC (permalink / raw)
To: linux-arm-kernel
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 6a361d2..f29c9ef 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;
@@ -324,9 +317,9 @@ static int __devinit twl6030_usb_probe(struct platform_device *pdev)
{
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)
@@ -335,13 +328,24 @@ 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;
twl->comparator.start_srp = twl6030_start_srp;
omap_usb2_set_comparator(&twl->comparator);
+ 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);
@@ -403,12 +407,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] 38+ messages in thread* [PATCH v6 05/11] drivers: usb: twl6030: Add dt support for twl6030 usb
2012-07-30 9:09 ` [PATCH v6 05/11] drivers: usb: twl6030: Add dt support for twl6030 usb Kishon Vijay Abraham I
@ 2012-08-03 13:31 ` Felipe Balbi
2012-08-03 14:39 ` ABRAHAM, KISHON VIJAY
0 siblings, 1 reply; 38+ messages in thread
From: Felipe Balbi @ 2012-08-03 13:31 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Mon, Jul 30, 2012 at 02:39:54PM +0530, Kishon Vijay Abraham I wrote:
> 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>
This looks great too. I can take this without any dependencies on the
rest of the series, I believe. Right ??
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120803/eca2eb51/attachment.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 05/11] drivers: usb: twl6030: Add dt support for twl6030 usb
2012-08-03 13:31 ` Felipe Balbi
@ 2012-08-03 14:39 ` ABRAHAM, KISHON VIJAY
0 siblings, 0 replies; 38+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-08-03 14:39 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Fri, Aug 3, 2012 at 7:01 PM, Felipe Balbi <balbi@ti.com> wrote:
> Hi,
>
> On Mon, Jul 30, 2012 at 02:39:54PM +0530, Kishon Vijay Abraham I wrote:
>> 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>
>
> This looks great too. I can take this without any dependencies on the
> rest of the series, I believe. Right ??
I think it might not apply cleanly without [PATCH v6 03/11] drivers:
usb: otg: make twl6030_usb as a comparator driver to omap_usb2.
Thanks
Kishon
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 06/11] arm/dts: Add twl6030-usb data
2012-07-30 9:09 [PATCH v6 00/11] omap: musb: Add device tree support Kishon Vijay Abraham I
` (4 preceding siblings ...)
2012-07-30 9:09 ` [PATCH v6 05/11] drivers: usb: twl6030: Add dt support for twl6030 usb Kishon Vijay Abraham I
@ 2012-07-30 9:09 ` Kishon Vijay Abraham I
2012-08-03 13:31 ` Felipe Balbi
2012-07-30 9:09 ` [PATCH v6 07/11] drivers: usb: twl4030: Add device tree support for twl4030 usb Kishon Vijay Abraham I
` (5 subsequent siblings)
11 siblings, 1 reply; 38+ messages in thread
From: Kishon Vijay Abraham I @ 2012-07-30 9:09 UTC (permalink / raw)
To: linux-arm-kernel
Add twl6030-usb data node in twl6030 device tree file
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/omap4-panda.dts | 4 ++++
arch/arm/boot/dts/omap4-sdp.dts | 4 ++++
arch/arm/boot/dts/twl6030.dtsi | 5 +++++
3 files changed, 13 insertions(+)
diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts
index 1efe0c5..7052422 100644
--- a/arch/arm/boot/dts/omap4-panda.dts
+++ b/arch/arm/boot/dts/omap4-panda.dts
@@ -89,3 +89,7 @@
ti,non-removable;
bus-width = <4>;
};
+
+&twlusb {
+ usb-supply = <&vusb>;
+};
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index d08c4d1..6326d7c 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -158,3 +158,7 @@
bus-width = <4>;
ti,non-removable;
};
+
+&twlusb {
+ usb-supply = <&vusb>;
+};
diff --git a/arch/arm/boot/dts/twl6030.dtsi b/arch/arm/boot/dts/twl6030.dtsi
index 3b2f351..8e3aac9 100644
--- a/arch/arm/boot/dts/twl6030.dtsi
+++ b/arch/arm/boot/dts/twl6030.dtsi
@@ -83,4 +83,9 @@
clk32kg: regulator at 12 {
compatible = "ti,twl6030-clk32kg";
};
+
+ twlusb: twl6030-usb {
+ compatible = "ti,twl6030-usb";
+ interrupts = < 4 10 >;
+ };
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v6 06/11] arm/dts: Add twl6030-usb data
2012-07-30 9:09 ` [PATCH v6 06/11] arm/dts: Add twl6030-usb data Kishon Vijay Abraham I
@ 2012-08-03 13:31 ` Felipe Balbi
0 siblings, 0 replies; 38+ messages in thread
From: Felipe Balbi @ 2012-08-03 13:31 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Mon, Jul 30, 2012 at 02:39:55PM +0530, Kishon Vijay Abraham I wrote:
> Add twl6030-usb data node in twl6030 device tree file
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> arch/arm/boot/dts/omap4-panda.dts | 4 ++++
> arch/arm/boot/dts/omap4-sdp.dts | 4 ++++
> arch/arm/boot/dts/twl6030.dtsi | 5 +++++
> 3 files changed, 13 insertions(+)
>
> diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts
> index 1efe0c5..7052422 100644
> --- a/arch/arm/boot/dts/omap4-panda.dts
> +++ b/arch/arm/boot/dts/omap4-panda.dts
> @@ -89,3 +89,7 @@
> ti,non-removable;
> bus-width = <4>;
> };
> +
> +&twlusb {
> + usb-supply = <&vusb>;
> +};
> diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
> index d08c4d1..6326d7c 100644
> --- a/arch/arm/boot/dts/omap4-sdp.dts
> +++ b/arch/arm/boot/dts/omap4-sdp.dts
> @@ -158,3 +158,7 @@
> bus-width = <4>;
> ti,non-removable;
> };
> +
> +&twlusb {
> + usb-supply = <&vusb>;
> +};
> diff --git a/arch/arm/boot/dts/twl6030.dtsi b/arch/arm/boot/dts/twl6030.dtsi
> index 3b2f351..8e3aac9 100644
> --- a/arch/arm/boot/dts/twl6030.dtsi
> +++ b/arch/arm/boot/dts/twl6030.dtsi
> @@ -83,4 +83,9 @@
> clk32kg: regulator at 12 {
> compatible = "ti,twl6030-clk32kg";
> };
> +
> + twlusb: twl6030-usb {
> + compatible = "ti,twl6030-usb";
> + interrupts = < 4 10 >;
> + };
> };
> --
> 1.7.9.5
>
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120803/fc9608a7/attachment.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 07/11] drivers: usb: twl4030: Add device tree support for twl4030 usb
2012-07-30 9:09 [PATCH v6 00/11] omap: musb: Add device tree support Kishon Vijay Abraham I
` (5 preceding siblings ...)
2012-07-30 9:09 ` [PATCH v6 06/11] arm/dts: Add twl6030-usb data Kishon Vijay Abraham I
@ 2012-07-30 9:09 ` Kishon Vijay Abraham I
2012-08-03 13:32 ` Felipe Balbi
2012-07-30 9:09 ` [PATCH v6 08/11] arm/dts: Add twl4030-usb data Kishon Vijay Abraham I
` (4 subsequent siblings)
11 siblings, 1 reply; 38+ messages in thread
From: Kishon Vijay Abraham I @ 2012-07-30 9:09 UTC (permalink / raw)
To: linux-arm-kernel
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] 38+ messages in thread* [PATCH v6 07/11] drivers: usb: twl4030: Add device tree support for twl4030 usb
2012-07-30 9:09 ` [PATCH v6 07/11] drivers: usb: twl4030: Add device tree support for twl4030 usb Kishon Vijay Abraham I
@ 2012-08-03 13:32 ` Felipe Balbi
2012-08-03 14:40 ` ABRAHAM, KISHON VIJAY
0 siblings, 1 reply; 38+ messages in thread
From: Felipe Balbi @ 2012-08-03 13:32 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Mon, Jul 30, 2012 at 02:39:56PM +0530, Kishon Vijay Abraham I wrote:
> 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>
I think this also doesn't have dependency on the rest of the series and
I could take this upstream. Right ?
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120803/c82ef6f3/attachment.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 07/11] drivers: usb: twl4030: Add device tree support for twl4030 usb
2012-08-03 13:32 ` Felipe Balbi
@ 2012-08-03 14:40 ` ABRAHAM, KISHON VIJAY
0 siblings, 0 replies; 38+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-08-03 14:40 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Fri, Aug 3, 2012 at 7:02 PM, Felipe Balbi <balbi@ti.com> wrote:
> Hi,
>
> On Mon, Jul 30, 2012 at 02:39:56PM +0530, Kishon Vijay Abraham I wrote:
>> 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>
>
> I think this also doesn't have dependency on the rest of the series and
> I could take this upstream. Right ?
right.
Thanks
Kishon
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 08/11] arm/dts: Add twl4030-usb data
2012-07-30 9:09 [PATCH v6 00/11] omap: musb: Add device tree support Kishon Vijay Abraham I
` (6 preceding siblings ...)
2012-07-30 9:09 ` [PATCH v6 07/11] drivers: usb: twl4030: Add device tree support for twl4030 usb Kishon Vijay Abraham I
@ 2012-07-30 9:09 ` Kishon Vijay Abraham I
2012-08-03 13:32 ` Felipe Balbi
2012-07-30 9:09 ` [PATCH v6 09/11] drivers: usb: musb: Add device tree support for omap musb glue Kishon Vijay Abraham I
` (3 subsequent siblings)
11 siblings, 1 reply; 38+ messages in thread
From: Kishon Vijay Abraham I @ 2012-07-30 9:09 UTC (permalink / raw)
To: linux-arm-kernel
Add twl4030-usb data node in twl4030 device tree file.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/twl4030.dtsi | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
index 22f4d13..761a5a5 100644
--- a/arch/arm/boot/dts/twl4030.dtsi
+++ b/arch/arm/boot/dts/twl4030.dtsi
@@ -37,6 +37,18 @@
regulator-max-microvolt = <3150000>;
};
+ vusb1v5: regulator-vusb1v5 {
+ compatible = "ti,twl4030-vusb1v5";
+ };
+
+ vusb1v8: regulator-vusb1v8 {
+ compatible = "ti,twl4030-vusb1v8";
+ };
+
+ vusb3v1: regulator-vusb3v1 {
+ compatible = "ti,twl4030-vusb3v1";
+ };
+
twl_gpio: gpio {
compatible = "ti,twl4030-gpio";
gpio-controller;
@@ -44,4 +56,13 @@
interrupt-controller;
#interrupt-cells = <1>;
};
+
+ twl4030-usb {
+ compatible = "ti,twl4030-usb";
+ interrupts = < 10 4 >;
+ usb1v5-supply = <&vusb1v5>;
+ usb1v8-supply = <&vusb1v8>;
+ usb3v1-supply = <&vusb3v1>;
+ usb_mode = <1>;
+ };
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v6 08/11] arm/dts: Add twl4030-usb data
2012-07-30 9:09 ` [PATCH v6 08/11] arm/dts: Add twl4030-usb data Kishon Vijay Abraham I
@ 2012-08-03 13:32 ` Felipe Balbi
0 siblings, 0 replies; 38+ messages in thread
From: Felipe Balbi @ 2012-08-03 13:32 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Mon, Jul 30, 2012 at 02:39:57PM +0530, Kishon Vijay Abraham I wrote:
> Add twl4030-usb data node in twl4030 device tree file.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> arch/arm/boot/dts/twl4030.dtsi | 21 +++++++++++++++++++++
> 1 file changed, 21 insertions(+)
>
> diff --git a/arch/arm/boot/dts/twl4030.dtsi b/arch/arm/boot/dts/twl4030.dtsi
> index 22f4d13..761a5a5 100644
> --- a/arch/arm/boot/dts/twl4030.dtsi
> +++ b/arch/arm/boot/dts/twl4030.dtsi
> @@ -37,6 +37,18 @@
> regulator-max-microvolt = <3150000>;
> };
>
> + vusb1v5: regulator-vusb1v5 {
> + compatible = "ti,twl4030-vusb1v5";
> + };
> +
> + vusb1v8: regulator-vusb1v8 {
> + compatible = "ti,twl4030-vusb1v8";
> + };
> +
> + vusb3v1: regulator-vusb3v1 {
> + compatible = "ti,twl4030-vusb3v1";
> + };
> +
> twl_gpio: gpio {
> compatible = "ti,twl4030-gpio";
> gpio-controller;
> @@ -44,4 +56,13 @@
> interrupt-controller;
> #interrupt-cells = <1>;
> };
> +
> + twl4030-usb {
> + compatible = "ti,twl4030-usb";
> + interrupts = < 10 4 >;
> + usb1v5-supply = <&vusb1v5>;
> + usb1v8-supply = <&vusb1v8>;
> + usb3v1-supply = <&vusb3v1>;
> + usb_mode = <1>;
> + };
> };
> --
> 1.7.9.5
>
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120803/76a64375/attachment.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 09/11] drivers: usb: musb: Add device tree support for omap musb glue
2012-07-30 9:09 [PATCH v6 00/11] omap: musb: Add device tree support Kishon Vijay Abraham I
` (7 preceding siblings ...)
2012-07-30 9:09 ` [PATCH v6 08/11] arm/dts: Add twl4030-usb data Kishon Vijay Abraham I
@ 2012-07-30 9:09 ` Kishon Vijay Abraham I
2012-08-03 13:34 ` Felipe Balbi
2012-07-30 9:09 ` [PATCH v6 10/11] arm/dts: omap: Add usb_otg and glue data Kishon Vijay Abraham I
` (2 subsequent siblings)
11 siblings, 1 reply; 38+ messages in thread
From: Kishon Vijay Abraham I @ 2012-07-30 9:09 UTC (permalink / raw)
To: linux-arm-kernel
Added device tree support for omap musb driver and updated the
Documentation with device tree binding information.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
Documentation/devicetree/bindings/usb/omap-usb.txt | 34 +++++++++++-
drivers/usb/musb/omap2430.c | 54 ++++++++++++++++++++
2 files changed, 87 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt
index 52f503b..49a90fb 100644
--- a/Documentation/devicetree/bindings/usb/omap-usb.txt
+++ b/Documentation/devicetree/bindings/usb/omap-usb.txt
@@ -1,4 +1,4 @@
-OMAP USB PHY
+OMAP USB PHY AND GLUE
OMAP USB2 PHY
@@ -15,3 +15,35 @@ usb2phy at 4a0ad080 {
reg = <0x4a0ad080 0x58>,
<0x4a002300 0x1>;
};
+
+OMAP MUSB GLUE
+ - compatible : Should be "ti,musb-omap2430"
+ - ti,hwmods : must be "usb_otg_hs"
+ - multipoint : Should be "1" indicating the musb controller supports
+ multipoint. This is a MUSB configuration-specific setting.
+ - num_eps : Specifies the number of endpoints. This is also a
+ MUSB configuration-specific setting. Should be set to "16"
+ - ram_bits : Specifies the ram address size. Should be set to "12"
+ - interface_type : This is a board specific setting to describe the type of
+ interface between the controller and the phy. It should be "0" or "1"
+ specifying ULPI and UTMI respectively.
+ - mode : Should be "3" to represent OTG. "1" signifies HOST and "2"
+ represents PERIPHERAL.
+ - power : Should be "50". This signifies the controller can supply upto
+ 100mA when operating in host mode.
+
+SOC specific device node entry
+usb_otg_hs: usb_otg_hs at 4a0ab000 {
+ compatible = "ti,musb-omap2430";
+ ti,hwmods = "usb_otg_hs";
+ multipoint = <1>;
+ num_eps = <16>;
+ ram_bits = <12>;
+};
+
+Board specific device node entry
+&usb_otg_hs {
+ interface_type = <1>;
+ mode = <3>;
+ power = <50>;
+};
diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
index addbebf..5db228f 100644
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
@@ -30,6 +30,7 @@
#include <linux/init.h>
#include <linux/list.h>
#include <linux/io.h>
+#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
#include <linux/pm_runtime.h>
@@ -469,8 +470,11 @@ static u64 omap2430_dmamask = DMA_BIT_MASK(32);
static int __devinit omap2430_probe(struct platform_device *pdev)
{
struct musb_hdrc_platform_data *pdata = pdev->dev.platform_data;
+ struct omap_musb_board_data *data;
struct platform_device *musb;
struct omap2430_glue *glue;
+ struct device_node *np = pdev->dev.of_node;
+ struct musb_hdrc_config *config;
struct resource *res;
int ret = -ENOMEM;
@@ -500,6 +504,42 @@ static int __devinit omap2430_probe(struct platform_device *pdev)
if (glue->control_otghs == NULL)
dev_dbg(&pdev->dev, "Failed to obtain control memory\n");
+ if (np) {
+ pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+ if (!pdata) {
+ dev_err(&pdev->dev,
+ "failed to allocate musb platfrom data\n");
+ ret = -ENOMEM;
+ goto err1;
+ }
+
+ data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
+ if (!data) {
+ dev_err(&pdev->dev,
+ "failed to allocate musb board data\n");
+ ret = -ENOMEM;
+ goto err1;
+ }
+
+ config = devm_kzalloc(&pdev->dev, sizeof(*config), GFP_KERNEL);
+ if (!data) {
+ dev_err(&pdev->dev,
+ "failed to allocate musb hdrc config\n");
+ goto err1;
+ }
+
+ of_property_read_u32(np, "mode", (u32 *)&pdata->mode);
+ of_property_read_u32(np, "interface_type",
+ (u32 *)&data->interface_type);
+ of_property_read_u32(np, "num_eps", (u32 *)&config->num_eps);
+ of_property_read_u32(np, "ram_bits", (u32 *)&config->ram_bits);
+ of_property_read_u32(np, "power", (u32 *)&pdata->power);
+ config->multipoint = of_property_read_bool(np, "multipoint");
+
+ pdata->board_data = data;
+ pdata->config = config;
+ }
+
pdata->platform_ops = &omap2430_ops;
platform_set_drvdata(pdev, glue);
@@ -597,12 +637,26 @@ static struct dev_pm_ops omap2430_pm_ops = {
#define DEV_PM_OPS NULL
#endif
+#ifdef CONFIG_OF
+static const struct of_device_id omap2430_id_table[] = {
+ {
+ .compatible = "ti,omap4-musb"
+ },
+ {
+ .compatible = "ti,omap3-musb"
+ },
+ {},
+};
+MODULE_DEVICE_TABLE(of, omap2430_id_table);
+#endif
+
static struct platform_driver omap2430_driver = {
.probe = omap2430_probe,
.remove = __devexit_p(omap2430_remove),
.driver = {
.name = "musb-omap2430",
.pm = DEV_PM_OPS,
+ .of_match_table = of_match_ptr(omap2430_id_table),
},
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v6 09/11] drivers: usb: musb: Add device tree support for omap musb glue
2012-07-30 9:09 ` [PATCH v6 09/11] drivers: usb: musb: Add device tree support for omap musb glue Kishon Vijay Abraham I
@ 2012-08-03 13:34 ` Felipe Balbi
2012-08-03 14:42 ` ABRAHAM, KISHON VIJAY
0 siblings, 1 reply; 38+ messages in thread
From: Felipe Balbi @ 2012-08-03 13:34 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Mon, Jul 30, 2012 at 02:39:58PM +0530, Kishon Vijay Abraham I wrote:
> Added device tree support for omap musb driver and updated the
> Documentation with device tree binding information.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
This looks good and I think I can take this without any dependencies
again. Correct ?
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120803/cac5e08c/attachment-0001.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 09/11] drivers: usb: musb: Add device tree support for omap musb glue
2012-08-03 13:34 ` Felipe Balbi
@ 2012-08-03 14:42 ` ABRAHAM, KISHON VIJAY
0 siblings, 0 replies; 38+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-08-03 14:42 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Fri, Aug 3, 2012 at 7:04 PM, Felipe Balbi <balbi@ti.com> wrote:
> Hi,
>
> On Mon, Jul 30, 2012 at 02:39:58PM +0530, Kishon Vijay Abraham I wrote:
>> Added device tree support for omap musb driver and updated the
>> Documentation with device tree binding information.
>>
>> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
>
> This looks good and I think I can take this without any dependencies
> again. Correct ?
correct.
Thanks
Kishon
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 10/11] arm/dts: omap: Add usb_otg and glue data
2012-07-30 9:09 [PATCH v6 00/11] omap: musb: Add device tree support Kishon Vijay Abraham I
` (8 preceding siblings ...)
2012-07-30 9:09 ` [PATCH v6 09/11] drivers: usb: musb: Add device tree support for omap musb glue Kishon Vijay Abraham I
@ 2012-07-30 9:09 ` Kishon Vijay Abraham I
2012-08-03 13:35 ` Felipe Balbi
2012-07-30 9:10 ` [PATCH v6 11/11] arm: omap: phy: remove unused functions from omap-phy-internal.c Kishon Vijay Abraham I
2012-08-06 8:52 ` [PATCH v6 00/11] omap: musb: Add device tree support Felipe Balbi
11 siblings, 1 reply; 38+ messages in thread
From: Kishon Vijay Abraham I @ 2012-07-30 9:09 UTC (permalink / raw)
To: linux-arm-kernel
Add usb otg data node in omap4/omap3 device tree file. Also update
the node with board specific setting in omapx-<board>.dts file.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/omap3-beagle.dts | 6 ++++++
arch/arm/boot/dts/omap3-evm.dts | 6 ++++++
arch/arm/boot/dts/omap3.dtsi | 8 ++++++++
arch/arm/boot/dts/omap4-panda.dts | 6 ++++++
arch/arm/boot/dts/omap4-sdp.dts | 6 ++++++
arch/arm/boot/dts/omap4.dtsi | 8 ++++++++
6 files changed, 40 insertions(+)
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
index 5b4506c..f3d7076 100644
--- a/arch/arm/boot/dts/omap3-beagle.dts
+++ b/arch/arm/boot/dts/omap3-beagle.dts
@@ -67,3 +67,9 @@
&mmc3 {
status = "disable";
};
+
+&usb_otg_hs {
+ interface_type = <0>;
+ mode = <3>;
+ power = <50>;
+};
diff --git a/arch/arm/boot/dts/omap3-evm.dts b/arch/arm/boot/dts/omap3-evm.dts
index 2eee16e..8963b3d 100644
--- a/arch/arm/boot/dts/omap3-evm.dts
+++ b/arch/arm/boot/dts/omap3-evm.dts
@@ -18,3 +18,9 @@
reg = <0x80000000 0x10000000>; /* 256 MB */
};
};
+
+&usb_otg_hs {
+ interface_type = <0>;
+ mode = <3>;
+ power = <50>;
+};
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 99474fa..4b8c142 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -215,5 +215,13 @@
compatible = "ti,omap3-hsmmc";
ti,hwmods = "mmc3";
};
+
+ usb_otg_hs: usb_otg_hs {
+ compatible = "ti,omap3-musb";
+ ti,hwmods = "usb_otg_hs";
+ multipoint = <1>;
+ num_eps = <16>;
+ ram_bits = <12>;
+ };
};
};
diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts
index 7052422..dd19370 100644
--- a/arch/arm/boot/dts/omap4-panda.dts
+++ b/arch/arm/boot/dts/omap4-panda.dts
@@ -93,3 +93,9 @@
&twlusb {
usb-supply = <&vusb>;
};
+
+&usb_otg_hs {
+ interface_type = <1>;
+ mode = <3>;
+ power = <50>;
+};
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 6326d7c..0fc10d4 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -162,3 +162,9 @@
&twlusb {
usb-supply = <&vusb>;
};
+
+&usb_otg_hs {
+ interface_type = <1>;
+ mode = <3>;
+ power = <50>;
+};
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index 15f1890..7886518 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -285,5 +285,13 @@
<0x4a002300 0x1>;
};
};
+
+ usb_otg_hs: usb_otg_hs {
+ compatible = "ti,omap4-musb";
+ ti,hwmods = "usb_otg_hs";
+ multipoint = <1>;
+ num_eps = <16>;
+ ram_bits = <12>;
+ };
};
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 38+ messages in thread* [PATCH v6 10/11] arm/dts: omap: Add usb_otg and glue data
2012-07-30 9:09 ` [PATCH v6 10/11] arm/dts: omap: Add usb_otg and glue data Kishon Vijay Abraham I
@ 2012-08-03 13:35 ` Felipe Balbi
0 siblings, 0 replies; 38+ messages in thread
From: Felipe Balbi @ 2012-08-03 13:35 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Jul 30, 2012 at 02:39:59PM +0530, Kishon Vijay Abraham I wrote:
> Add usb otg data node in omap4/omap3 device tree file. Also update
> the node with board specific setting in omapx-<board>.dts file.
>
> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
Acked-by: Felipe Balbi <balbi@ti.com>
> ---
> arch/arm/boot/dts/omap3-beagle.dts | 6 ++++++
> arch/arm/boot/dts/omap3-evm.dts | 6 ++++++
> arch/arm/boot/dts/omap3.dtsi | 8 ++++++++
> arch/arm/boot/dts/omap4-panda.dts | 6 ++++++
> arch/arm/boot/dts/omap4-sdp.dts | 6 ++++++
> arch/arm/boot/dts/omap4.dtsi | 8 ++++++++
> 6 files changed, 40 insertions(+)
>
> diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts
> index 5b4506c..f3d7076 100644
> --- a/arch/arm/boot/dts/omap3-beagle.dts
> +++ b/arch/arm/boot/dts/omap3-beagle.dts
> @@ -67,3 +67,9 @@
> &mmc3 {
> status = "disable";
> };
> +
> +&usb_otg_hs {
> + interface_type = <0>;
> + mode = <3>;
> + power = <50>;
> +};
> diff --git a/arch/arm/boot/dts/omap3-evm.dts b/arch/arm/boot/dts/omap3-evm.dts
> index 2eee16e..8963b3d 100644
> --- a/arch/arm/boot/dts/omap3-evm.dts
> +++ b/arch/arm/boot/dts/omap3-evm.dts
> @@ -18,3 +18,9 @@
> reg = <0x80000000 0x10000000>; /* 256 MB */
> };
> };
> +
> +&usb_otg_hs {
> + interface_type = <0>;
> + mode = <3>;
> + power = <50>;
> +};
> diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
> index 99474fa..4b8c142 100644
> --- a/arch/arm/boot/dts/omap3.dtsi
> +++ b/arch/arm/boot/dts/omap3.dtsi
> @@ -215,5 +215,13 @@
> compatible = "ti,omap3-hsmmc";
> ti,hwmods = "mmc3";
> };
> +
> + usb_otg_hs: usb_otg_hs {
> + compatible = "ti,omap3-musb";
> + ti,hwmods = "usb_otg_hs";
> + multipoint = <1>;
> + num_eps = <16>;
> + ram_bits = <12>;
> + };
> };
> };
> diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts
> index 7052422..dd19370 100644
> --- a/arch/arm/boot/dts/omap4-panda.dts
> +++ b/arch/arm/boot/dts/omap4-panda.dts
> @@ -93,3 +93,9 @@
> &twlusb {
> usb-supply = <&vusb>;
> };
> +
> +&usb_otg_hs {
> + interface_type = <1>;
> + mode = <3>;
> + power = <50>;
> +};
> diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
> index 6326d7c..0fc10d4 100644
> --- a/arch/arm/boot/dts/omap4-sdp.dts
> +++ b/arch/arm/boot/dts/omap4-sdp.dts
> @@ -162,3 +162,9 @@
> &twlusb {
> usb-supply = <&vusb>;
> };
> +
> +&usb_otg_hs {
> + interface_type = <1>;
> + mode = <3>;
> + power = <50>;
> +};
> diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
> index 15f1890..7886518 100644
> --- a/arch/arm/boot/dts/omap4.dtsi
> +++ b/arch/arm/boot/dts/omap4.dtsi
> @@ -285,5 +285,13 @@
> <0x4a002300 0x1>;
> };
> };
> +
> + usb_otg_hs: usb_otg_hs {
> + compatible = "ti,omap4-musb";
> + ti,hwmods = "usb_otg_hs";
> + multipoint = <1>;
> + num_eps = <16>;
> + ram_bits = <12>;
> + };
> };
> };
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120803/dcffa11d/attachment.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 11/11] arm: omap: phy: remove unused functions from omap-phy-internal.c
2012-07-30 9:09 [PATCH v6 00/11] omap: musb: Add device tree support Kishon Vijay Abraham I
` (9 preceding siblings ...)
2012-07-30 9:09 ` [PATCH v6 10/11] arm/dts: omap: Add usb_otg and glue data Kishon Vijay Abraham I
@ 2012-07-30 9:10 ` Kishon Vijay Abraham I
2012-08-03 13:36 ` Felipe Balbi
2012-08-06 8:52 ` [PATCH v6 00/11] omap: musb: Add device tree support Felipe Balbi
11 siblings, 1 reply; 38+ messages in thread
From: Kishon Vijay Abraham I @ 2012-07-30 9:10 UTC (permalink / raw)
To: linux-arm-kernel
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 4c90477..0c610b4 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 119d5a9..396d189 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 b19d1b4..e87ae49 100644
--- a/arch/arm/mach-omap2/usb-musb.c
+++ b/arch/arm/mach-omap2/usb-musb.c
@@ -119,7 +119,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] 38+ messages in thread* [PATCH v6 11/11] arm: omap: phy: remove unused functions from omap-phy-internal.c
2012-07-30 9:10 ` [PATCH v6 11/11] arm: omap: phy: remove unused functions from omap-phy-internal.c Kishon Vijay Abraham I
@ 2012-08-03 13:36 ` Felipe Balbi
2012-08-03 14:41 ` ABRAHAM, KISHON VIJAY
0 siblings, 1 reply; 38+ messages in thread
From: Felipe Balbi @ 2012-08-03 13:36 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Mon, Jul 30, 2012 at 02:40:00PM +0530, Kishon Vijay Abraham I wrote:
> 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>
Great stuff. I'll take this when we agree on the omap-usb2 phy driver.
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120803/2ff867f0/attachment.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 11/11] arm: omap: phy: remove unused functions from omap-phy-internal.c
2012-08-03 13:36 ` Felipe Balbi
@ 2012-08-03 14:41 ` ABRAHAM, KISHON VIJAY
0 siblings, 0 replies; 38+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-08-03 14:41 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Fri, Aug 3, 2012 at 7:06 PM, Felipe Balbi <balbi@ti.com> wrote:
> Hi,
>
> On Mon, Jul 30, 2012 at 02:40:00PM +0530, Kishon Vijay Abraham I wrote:
>> 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>
>
> Great stuff. I'll take this when we agree on the omap-usb2 phy driver.
Sure.
Thanks
Kishon
^ permalink raw reply [flat|nested] 38+ messages in thread
* [PATCH v6 00/11] omap: musb: Add device tree support
2012-07-30 9:09 [PATCH v6 00/11] omap: musb: Add device tree support Kishon Vijay Abraham I
` (10 preceding siblings ...)
2012-07-30 9:10 ` [PATCH v6 11/11] arm: omap: phy: remove unused functions from omap-phy-internal.c Kishon Vijay Abraham I
@ 2012-08-06 8:52 ` Felipe Balbi
2012-08-06 9:25 ` ABRAHAM, KISHON VIJAY
11 siblings, 1 reply; 38+ messages in thread
From: Felipe Balbi @ 2012-08-06 8:52 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Mon, Jul 30, 2012 at 02:39:49PM +0530, Kishon Vijay Abraham I wrote:
> This patch series adds device tree support for MUSB and device
> tree support for all the related modules to get MUSB working in
> OMAP platform.
>
> A new omap-usb2 phy driver has been added (with only dt suppport)
> to perform phy configurations. Previously this configuration was
> performed by twl6030, using pdata function pointers.
>
> With the addition of omap-usb2 to perform phy configurations,
> twl6030 is made as a comparator driver to detect VBUS and ID events
> and notify it to the glue layer.
>
> musb core is _NOT_ yet converted to support device tree support as it
> would need lot of driver re-design because of its enormous use of
> function pointers. That will be in _TO DO_ list.
>
> Changes from v5:
> minor cleanups like checking for return value in get_sync and few changes
> in the documentation has been done.
>
> Changes from v4:
> duplicate getting of 'mode' property is removed in omap-musb glue.
>
> Changes from v3:
> remove the address in the node name of usb_otg_hs since the usb_otg_hs
> node doesn't have a reg property. Thanks Ajay Gupta for finding this.
>
> Changes from v2:
> Fixed Sergei's comment to remove *0x* prefix in usb2phy at 0x4a0ad080
>
> Changes from v1:
> * Fixed Rajendra Nayak comments (regulator naming, compatible naming of
> musb and other minor cleanups.)
> * It's agreed to have ocp2scp in drivers/bus and usb2 phy is a child of
> ocp2scp, the documentation is updated accordingly.
>
> Changes from RFC:
> Removed the dependency on [RFC PATCH 00/11] OMAP System Control Module.
> Writing to control module register is now handled in otg driver itself.
> Once the system control module driver get upstreamed, I'll send a patch
> to make use of API's in control module driver to write to control
> module register.
>
> This series was developed on
> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git xceiv
>
> This patch series depends on
> [PATCH 0/2] omap: add ocp2scp as a bus driver
>
> Performed MUSB device mode testing on OMAP4 panda, OMAP4 SDP
> and OMAP3 beagle.
>
> Kishon Vijay Abraham I (11):
> drivers: usb: otg: add a new driver for omap usb2 phy
> arm/dts: omap: Add omap-usb2 dt data
> drivers: usb: otg: make twl6030_usb as a comparator driver to
> omap_usb2
> arm: omap: hwmod: add a new addr space in otg for writing to control
> module
> drivers: usb: twl6030: Add dt support for twl6030 usb
> arm/dts: Add twl6030-usb data
> drivers: usb: twl4030: Add device tree support for twl4030 usb
> arm/dts: Add twl4030-usb data
> drivers: usb: musb: Add device tree support for omap musb glue
> arm/dts: omap: Add usb_otg and glue data
> arm: omap: phy: remove unused functions from omap-phy-internal.c
When you send your next series, can you please split the stuff based on
their dependencies or at least note here what depends on what ? I mean,
I cannot take the DT patches without an Acked-by Grant and Tony, but the
drivers themselves I could take queue them since they're already in good
shape ;-)
Maybe just start the series with patches without dependencies on one
another, and the rest of the series would be ones that need to go
together, or something. That'll help me ;-)
--
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20120806/c80e301c/attachment.sig>
^ permalink raw reply [flat|nested] 38+ messages in thread* [PATCH v6 00/11] omap: musb: Add device tree support
2012-08-06 8:52 ` [PATCH v6 00/11] omap: musb: Add device tree support Felipe Balbi
@ 2012-08-06 9:25 ` ABRAHAM, KISHON VIJAY
0 siblings, 0 replies; 38+ messages in thread
From: ABRAHAM, KISHON VIJAY @ 2012-08-06 9:25 UTC (permalink / raw)
To: linux-arm-kernel
On Mon, Aug 6, 2012 at 2:22 PM, Felipe Balbi <balbi@ti.com> wrote:
> Hi,
>
> On Mon, Jul 30, 2012 at 02:39:49PM +0530, Kishon Vijay Abraham I wrote:
>> This patch series adds device tree support for MUSB and device
>> tree support for all the related modules to get MUSB working in
>> OMAP platform.
>>
>> A new omap-usb2 phy driver has been added (with only dt suppport)
>> to perform phy configurations. Previously this configuration was
>> performed by twl6030, using pdata function pointers.
>>
>> With the addition of omap-usb2 to perform phy configurations,
>> twl6030 is made as a comparator driver to detect VBUS and ID events
>> and notify it to the glue layer.
>>
>> musb core is _NOT_ yet converted to support device tree support as it
>> would need lot of driver re-design because of its enormous use of
>> function pointers. That will be in _TO DO_ list.
>>
>> Changes from v5:
>> minor cleanups like checking for return value in get_sync and few changes
>> in the documentation has been done.
>>
>> Changes from v4:
>> duplicate getting of 'mode' property is removed in omap-musb glue.
>>
>> Changes from v3:
>> remove the address in the node name of usb_otg_hs since the usb_otg_hs
>> node doesn't have a reg property. Thanks Ajay Gupta for finding this.
>>
>> Changes from v2:
>> Fixed Sergei's comment to remove *0x* prefix in usb2phy at 0x4a0ad080
>>
>> Changes from v1:
>> * Fixed Rajendra Nayak comments (regulator naming, compatible naming of
>> musb and other minor cleanups.)
>> * It's agreed to have ocp2scp in drivers/bus and usb2 phy is a child of
>> ocp2scp, the documentation is updated accordingly.
>>
>> Changes from RFC:
>> Removed the dependency on [RFC PATCH 00/11] OMAP System Control Module.
>> Writing to control module register is now handled in otg driver itself.
>> Once the system control module driver get upstreamed, I'll send a patch
>> to make use of API's in control module driver to write to control
>> module register.
>>
>> This series was developed on
>> git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git xceiv
>>
>> This patch series depends on
>> [PATCH 0/2] omap: add ocp2scp as a bus driver
>>
>> Performed MUSB device mode testing on OMAP4 panda, OMAP4 SDP
>> and OMAP3 beagle.
>>
>> Kishon Vijay Abraham I (11):
>> drivers: usb: otg: add a new driver for omap usb2 phy
>> arm/dts: omap: Add omap-usb2 dt data
>> drivers: usb: otg: make twl6030_usb as a comparator driver to
>> omap_usb2
>> arm: omap: hwmod: add a new addr space in otg for writing to control
>> module
>> drivers: usb: twl6030: Add dt support for twl6030 usb
>> arm/dts: Add twl6030-usb data
>> drivers: usb: twl4030: Add device tree support for twl4030 usb
>> arm/dts: Add twl4030-usb data
>> drivers: usb: musb: Add device tree support for omap musb glue
>> arm/dts: omap: Add usb_otg and glue data
>> arm: omap: phy: remove unused functions from omap-phy-internal.c
>
> When you send your next series, can you please split the stuff based on
> their dependencies or at least note here what depends on what ? I mean,
> I cannot take the DT patches without an Acked-by Grant and Tony, but the
> drivers themselves I could take queue them since they're already in good
> shape ;-)
>
> Maybe just start the series with patches without dependencies on one
> another, and the rest of the series would be ones that need to go
> together, or something. That'll help me ;-)
Ok Felipe.
Thanks
Kishon
^ permalink raw reply [flat|nested] 38+ messages in thread