usb: phy/otg: add dt support

Documentation/devicetree/bindings/usb/usb-phy.txt new file +6 -0

+
+usb2phy at 4a0ad080 {
+	compatible = "ti,omap-usb2";
+	reg = <0x4a0ad080 0x58>,
+	      <0x4a002300 0x4>;
+};

drivers/usb/phy/Kconfig +9 -0

index 2838adb..63c339b 100644
@@ -4,6 +4,15 @@
 comment "USB Physical Layer drivers"
 	depends on USB || USB_GADGET
 
+config OMAP_USB2
+	tristate "OMAP USB2 PHY Driver"
+	select USB_OTG_UTILS
+	help
+	  Enable this to support the transceiver that is part of SOC. This
+	  driver takes care of all the PHY functionality apart from comparator.
+	  The USB OTG controller communicates with the comparator using this
+	  driver.
+
 config USB_ISP1301
 	tristate "NXP ISP1301 USB transceiver support"
 	depends on USB || USB_GADGET

drivers/usb/phy/Makefile +1 -0

index bb948fb..b069f29 100644
@@ -4,6 +4,7 @@
 
 ccflags-$(CONFIG_USB_DEBUG) := -DDEBUG
 
+obj-$(CONFIG_OMAP_USB2)			+= omap-usb2.o
 obj-$(CONFIG_USB_ISP1301)		+= isp1301.o
 obj-$(CONFIG_MV_U3D_PHY)		+= mv_u3d_phy.o
 obj-$(CONFIG_USB_EHCI_TEGRA)	+= tegra_usb_phy.o

drivers/usb/phy/omap-usb2.c new file +271 -0

new file mode 100644
index 0000000..15ab3d6
@@ -0,0 +1,271 @@
+/*
+ * omap-usb2.c - USB PHY, talking to musb controller in OMAP.
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Author: Kishon Vijay Abraham I <[email protected]>
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/io.h>
+#include <linux/usb/omap_usb.h>
+#include <linux/usb/phy_companion.h>
+#include <linux/clk.h>
+#include <linux/err.h>
+#include <linux/pm_runtime.h>
+#include <linux/delay.h>
+
+/**
+ * omap_usb2_set_comparator - links the comparator present in the sytem with
+ *	this phy
+ * @comparator - the companion phy(comparator) for this phy
+ *
+ * The phy companion driver should call this API passing the phy_companion
+ * filled with set_vbus and start_srp to be used by usb phy.
+ *
+ * For use by phy companion driver
+ */
+int omap_usb2_set_comparator(struct phy_companion *comparator)
+{
+	struct omap_usb	*phy;
+	struct usb_phy	*x = usb_get_phy(USB_PHY_TYPE_USB2);
+
+	if (IS_ERR(x))
+		return -ENODEV;
+
+	phy = phy_to_omapusb(x);
+	phy->comparator = comparator;
+	return 0;
+}
+EXPORT_SYMBOL_GPL(omap_usb2_set_comparator);
+
+/**
+ * omap_usb_phy_power - power on/off the phy using control module reg
+ * @phy: struct omap_usb *
+ * @on: 0 or 1, based on powering on or off the PHY
+ *
+ * XXX: Remove this function once control module driver gets merged
+ */
+static void omap_usb_phy_power(struct omap_usb *phy, int on)
+{
+	u32 val;
+
+	if (on) {
+		val = readl(phy->control_dev);
+		if (val & PHY_PD) {
+			writel(~PHY_PD, phy->control_dev);
+			/* XXX: add proper documentation for this delay */
+			mdelay(200);
+		}
+	} else {
+		writel(PHY_PD, phy->control_dev);
+	}
+}
+
+static int omap_usb_set_vbus(struct usb_otg *otg, bool enabled)
+{
+	struct omap_usb *phy = phy_to_omapusb(otg->phy);
+
+	if (!phy->comparator)
+		return -ENODEV;
+
+	return phy->comparator->set_vbus(phy->comparator, enabled);
+}
+
+static int omap_usb_start_srp(struct usb_otg *otg)
+{
+	struct omap_usb *phy = phy_to_omapusb(otg->phy);
+
+	if (!phy->comparator)
+		return -ENODEV;
+
+	return phy->comparator->start_srp(phy->comparator);
+}
+
+static int omap_usb_set_host(struct usb_otg *otg, struct usb_bus *host)
+{
+	struct usb_phy	*phy = otg->phy;
+
+	otg->host = host;
+	if (!host)
+		phy->state = OTG_STATE_UNDEFINED;
+
+	return 0;
+}
+
+static int omap_usb_set_peripheral(struct usb_otg *otg,
+		struct usb_gadget *gadget)
+{
+	struct usb_phy	*phy = otg->phy;
+
+	otg->gadget = gadget;
+	if (!gadget)
+		phy->state = OTG_STATE_UNDEFINED;
+
+	return 0;
+}
+
+static int omap_usb2_suspend(struct usb_phy *x, int suspend)
+{
+	u32 ret;
+	struct omap_usb *phy = phy_to_omapusb(x);
+
+	if (suspend && !phy->is_suspended) {
+		omap_usb_phy_power(phy, 0);
+		pm_runtime_put_sync(phy->dev);
+		phy->is_suspended = 1;
+	} else if (!suspend && phy->is_suspended) {
+		ret = pm_runtime_get_sync(phy->dev);
+		if (ret < 0) {
+			dev_err(phy->dev, "get_sync failed with err %d\n",
+									ret);
+			return ret;
+		}
+		omap_usb_phy_power(phy, 1);
+		phy->is_suspended = 0;
+	}
+
+	return 0;
+}
+
+static int __devinit omap_usb2_probe(struct platform_device *pdev)
+{
+	struct omap_usb			*phy;
+	struct usb_otg			*otg;
+	struct resource			*res;
+
+	phy = devm_kzalloc(&pdev->dev, sizeof(*phy), GFP_KERNEL);
+	if (!phy) {
+		dev_err(&pdev->dev, "unable to allocate memory for USB2 PHY\n");
+		return -ENOMEM;
+	}
+
+	otg = devm_kzalloc(&pdev->dev, sizeof(*otg), GFP_KERNEL);
+	if (!otg) {
+		dev_err(&pdev->dev, "unable to allocate memory for USB OTG\n");
+		return -ENOMEM;
+	}
+
+	phy->dev		= &pdev->dev;
+
+	phy->phy.dev		= phy->dev;
+	phy->phy.label		= "omap-usb2";
+	phy->phy.set_suspend	= omap_usb2_suspend;
+	phy->phy.otg		= otg;
+
+	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+
+	phy->control_dev = devm_request_and_ioremap(&pdev->dev, res);
+	if (phy->control_dev == NULL) {
+		dev_err(&pdev->dev, "Failed to obtain io memory\n");
+		return -ENXIO;
+	}
+
+	phy->is_suspended	= 1;
+	omap_usb_phy_power(phy, 0);
+
+	otg->set_host		= omap_usb_set_host;
+	otg->set_peripheral	= omap_usb_set_peripheral;
+	otg->set_vbus		= omap_usb_set_vbus;
+	otg->start_srp		= omap_usb_start_srp;
+	otg->phy		= &phy->phy;
+
+	phy->wkupclk = devm_clk_get(phy->dev, "usb_phy_cm_clk32k");
+	if (IS_ERR(phy->wkupclk)) {
+		dev_err(&pdev->dev, "unable to get usb_phy_cm_clk32k\n");
+		return PTR_ERR(phy->wkupclk);
+	}
+	clk_prepare(phy->wkupclk);
+
+	usb_add_phy(&phy->phy, USB_PHY_TYPE_USB2);
+
+	platform_set_drvdata(pdev, phy);
+
+	pm_runtime_enable(phy->dev);
+
+	return 0;
+}
+
+static int __devexit omap_usb2_remove(struct platform_device *pdev)
+{
+	struct omap_usb	*phy = platform_get_drvdata(pdev);
+
+	clk_unprepare(phy->wkupclk);
+	usb_remove_phy(&phy->phy);
+
+	return 0;
+}
+
+#ifdef CONFIG_PM_RUNTIME
+
+static int omap_usb2_runtime_suspend(struct device *dev)
+{
+	struct platform_device	*pdev = to_platform_device(dev);
+	struct omap_usb	*phy = platform_get_drvdata(pdev);
+
+	clk_disable(phy->wkupclk);
+
+	return 0;
+}
+
+static int omap_usb2_runtime_resume(struct device *dev)
+{
+	u32 ret = 0;
+	struct platform_device	*pdev = to_platform_device(dev);
+	struct omap_usb	*phy = platform_get_drvdata(pdev);
+
+	ret = clk_enable(phy->wkupclk);
+	if (ret < 0)
+		dev_err(phy->dev, "Failed to enable wkupclk %d\n", ret);
+
+	return ret;
+}
+
+static const struct dev_pm_ops omap_usb2_pm_ops = {
+	SET_RUNTIME_PM_OPS(omap_usb2_runtime_suspend, omap_usb2_runtime_resume,
+		NULL)
+};
+
+#define DEV_PM_OPS     (&omap_usb2_pm_ops)
+#else
+#define DEV_PM_OPS     NULL
+#endif
+
+#ifdef CONFIG_OF
+static const struct of_device_id omap_usb2_id_table[] = {
+	{ .compatible = "ti,omap-usb2" },
+	{}
+};
+MODULE_DEVICE_TABLE(of, omap_usb2_id_table);
+#endif
+
+static struct platform_driver omap_usb2_driver = {
+	.probe		= omap_usb2_probe,
+	.remove		= __devexit_p(omap_usb2_remove),
+	.driver		= {
+		.name	= "omap-usb2",
+		.owner	= THIS_MODULE,
+		.pm	= DEV_PM_OPS,
+		.of_match_table = of_match_ptr(omap_usb2_id_table),
+	},
+};
+
+module_platform_driver(omap_usb2_driver);
+
+MODULE_ALIAS("platform: omap_usb2");
+MODULE_AUTHOR("Texas Instruments Inc.");
+MODULE_DESCRIPTION("OMAP USB2 phy driver");
+MODULE_LICENSE("GPL v2");

include/linux/usb/omap_usb.h new file +46 -0

new file mode 100644
index 0000000..0ea17f8
@@ -0,0 +1,46 @@
+/*
+ * omap_usb.h -- omap usb2 phy header file
+ *
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Author: Kishon Vijay Abraham I <[email protected]>
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+#ifndef __DRIVERS_OMAP_USB2_H
+#define __DRIVERS_OMAP_USB2_H
+
+#include <linux/usb/otg.h>
+
+struct omap_usb {
+	struct usb_phy		phy;
+	struct phy_companion	*comparator;
+	struct device		*dev;
+	u32 __iomem		*control_dev;
+	struct clk		*wkupclk;
+	u8			is_suspended:1;
+};
+
+#define	PHY_PD	0x1
+
+#define	phy_to_omapusb(x)	container_of((x), struct omap_usb, phy)
+
+#if defined(CONFIG_OMAP_USB2) || defined(CONFIG_OMAP_USB2_MODULE)
+extern int omap_usb2_set_comparator(struct phy_companion *comparator);
+#else
+static inline int omap_usb2_set_comparator(struct phy_companion *comparator)
+{
+	return -ENODEV;
+}
+#endif
+
+#endif /* __DRIVERS_OMAP_USB_H */

include/linux/usb/phy_companion.h new file +34 -0

new file mode 100644
index 0000000..edd2ec2
@@ -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 <[email protected]>
+ *
+ * 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 */

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

Quoted 30 lines · Kishon Vijay Abraham I

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 <[email protected]>

Signed-off-by Kishon Vijay Abraham I <[email protected]>

---
 Documentation/devicetree/bindings/usb/usb-phy.txt |   17 ++
 drivers/usb/phy/Kconfig                           |    9 +
 drivers/usb/phy/Makefile                          |    1 +
 drivers/usb/phy/omap-usb2.c                       |  271 +++++++++++++++++++++
 include/linux/usb/omap_usb.h                      |   46 ++++
 include/linux/usb/phy_companion.h                 |   34 +++
 6 files changed, 378 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt
 create mode 100644 drivers/usb/phy/omap-usb2.c
 create mode 100644 include/linux/usb/omap_usb.h
 create mode 100644 include/linux/usb/phy_companion.h

Documentation/devicetree/bindings/usb/usb-phy.txt new file +0 -0

new file mode 100644
index 0000000..80d4148

This is a very generic name...

Documentation/devicetree/bindings/usb/usb-phy.txt line 6

Quoted 7 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +6 -0

@@ -0,0 +1,17 @@
+USB PHY
+
+OMAP USB2 PHY
+
+Required properties:
+ - compatible: Should be "ti,omap-usb2"

...for a specific phy. However, I do think a generic binding to describe host ctrlr to phy connections is needed.

Documentation/devicetree/bindings/usb/usb-phy.txt line 9

Quoted 3 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +3 -0

+ - reg : Address and length of the register set for the device. Also
+add the address of control module dev conf register until a driver for
+control module is added

The dts should describe the h/w, not what you need for the current driver. The 2nd reg field does not belong here.

Documentation/devicetree/bindings/usb/usb-phy.txt line 11

Quoted 3 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +2 -0

+
+This is usually a subnode of ocp2scp to which it is connected.

How is usb port to phy connection described?

Hi,

Quoted 45 lines · Rob Herring

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

Quoted 30 lines · Kishon Vijay Abraham I

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 <[email protected]>

Signed-off-by Kishon Vijay Abraham I <[email protected]>

---
 Documentation/devicetree/bindings/usb/usb-phy.txt |   17 ++
 drivers/usb/phy/Kconfig                           |    9 +
 drivers/usb/phy/Makefile                          |    1 +
 drivers/usb/phy/omap-usb2.c                       |  271 +++++++++++++++++++++
 include/linux/usb/omap_usb.h                      |   46 ++++
 include/linux/usb/phy_companion.h                 |   34 +++
 6 files changed, 378 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt
 create mode 100644 drivers/usb/phy/omap-usb2.c
 create mode 100644 include/linux/usb/omap_usb.h
 create mode 100644 include/linux/usb/phy_companion.h

Documentation/devicetree/bindings/usb/usb-phy.txt new file +0 -0

new file mode 100644
index 0000000..80d4148

This is a very generic name...

Documentation/devicetree/bindings/usb/usb-phy.txt line 6

Quoted 7 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +6 -0

@@ -0,0 +1,17 @@
+USB PHY
+
+OMAP USB2 PHY
+
+Required properties:
+ - compatible: Should be "ti,omap-usb2"

...for a specific phy. However, I do think a generic binding to describe host ctrlr to phy connections is needed.

Quoted 6 lines

Documentation/devicetree/bindings/usb/usb-phy.txt line 9

Quoted 3 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +3 -0

+ - reg : Address and length of the register set for the device. Also
+add the address of control module dev conf register until a driver for
+control module is added

The dts should describe the h/w, not what you need for the current driver. The 2nd reg field does not belong here.

Indeed. This was discussed and agreed upon as a interim solution till we have a control module driver in place to write to the control module register.

Quoted 5 lines

Documentation/devicetree/bindings/usb/usb-phy.txt line 11

Quoted 3 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +2 -0

+
+This is usually a subnode of ocp2scp to which it is connected.

How is usb port to phy connection described?

Currently the usb controller to phy connection is established only by type. We have a couple of patches being currently discussed in the list to establish the connection by phandle.

https://patchwork.kernel.org/patch/1457801/ (Generic PHY Framework:
devm_of_phy_get())
http://www.spinics.net/lists/linux-usb/msg69547.html

Thanks
Kishon

Quoted 55 lines · KISHON VIJAY

Hi,

Quoted 51 lines · Rob Herring

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

Quoted 30 lines · Kishon Vijay Abraham I

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 <[email protected]>

Signed-off-by Kishon Vijay Abraham I <[email protected]>

---
 Documentation/devicetree/bindings/usb/usb-phy.txt |   17 ++
 drivers/usb/phy/Kconfig                           |    9 +
 drivers/usb/phy/Makefile                          |    1 +
 drivers/usb/phy/omap-usb2.c                       |  271 +++++++++++++++++++++
 include/linux/usb/omap_usb.h                      |   46 ++++
 include/linux/usb/phy_companion.h                 |   34 +++
 6 files changed, 378 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt
 create mode 100644 drivers/usb/phy/omap-usb2.c
 create mode 100644 include/linux/usb/omap_usb.h
 create mode 100644 include/linux/usb/phy_companion.h

Documentation/devicetree/bindings/usb/usb-phy.txt new file +0 -0

new file mode 100644
index 0000000..80d4148

This is a very generic name...

Documentation/devicetree/bindings/usb/usb-phy.txt line 6

Quoted 7 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +6 -0

@@ -0,0 +1,17 @@
+USB PHY
+
+OMAP USB2 PHY
+
+Required properties:
+ - compatible: Should be "ti,omap-usb2"

...for a specific phy. However, I do think a generic binding to describe host ctrlr to phy connections is needed.

Documentation/devicetree/bindings/usb/usb-phy.txt line 9

Quoted 3 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +3 -0

+ - reg : Address and length of the register set for the device. Also
+add the address of control module dev conf register until a driver for
+control module is added

The dts should describe the h/w, not what you need for the current driver. The 2nd reg field does not belong here.

Quoted 3 lines

Indeed. This was discussed and agreed upon as a interim solution till we have a control module driver in place to write to the control module register.

Discussed where and agreed by who? I for one do not agree.

Quoted 55 lines · KISHON VIJAY

Hi,

Quoted 51 lines · Rob Herring

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

Quoted 30 lines · Kishon Vijay Abraham I

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 <[email protected]>

Signed-off-by Kishon Vijay Abraham I <[email protected]>

---
  Documentation/devicetree/bindings/usb/usb-phy.txt |   17 ++
  drivers/usb/phy/Kconfig                           |    9 +
  drivers/usb/phy/Makefile                          |    1 +
  drivers/usb/phy/omap-usb2.c                       |  271 +++++++++++++++++++++
  include/linux/usb/omap_usb.h                      |   46 ++++
  include/linux/usb/phy_companion.h                 |   34 +++
  6 files changed, 378 insertions(+)

create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt create mode 100644 drivers/usb/phy/omap-usb2.c
create mode 100644 include/linux/usb/omap_usb.h
create mode 100644 include/linux/usb/phy_companion.h

Documentation/devicetree/bindings/usb/usb-phy.txt new file +0 -0

new file mode 100644
index 0000000..80d4148

This is a very generic name...

Documentation/devicetree/bindings/usb/usb-phy.txt line 6

Quoted 7 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +6 -0

@@ -0,0 +1,17 @@
+USB PHY
+
+OMAP USB2 PHY
+
+Required properties:
+ - compatible: Should be "ti,omap-usb2"

...for a specific phy. However, I do think a generic binding to describe host ctrlr to phy connections is needed.

Documentation/devicetree/bindings/usb/usb-phy.txt line 9

Quoted 3 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +3 -0

+ - reg : Address and length of the register set for the device. Also
+add the address of control module dev conf register until a driver for
+control module is added

The dts should describe the h/w, not what you need for the current driver. The 2nd reg field does not belong here.

Quoted 3 lines

Indeed. This was discussed and agreed upon as a interim solution till we have a control module driver in place to write to the control module register.

Discussed where and agreed by who? I for one do not agree.

Quoted 74 lines · Rob Herring

Quoted 70 lines · KISHON VIJAY

Hi,

Quoted 53 lines · Rob Herring

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

Quoted 35 lines · Kishon Vijay Abraham I

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 <[email protected]>

Signed-off-by Kishon Vijay Abraham I <[email protected]>

---
  Documentation/devicetree/bindings/usb/usb-phy.txt |   17 ++
  drivers/usb/phy/Kconfig                           |    9 +
  drivers/usb/phy/Makefile                          |    1 +
  drivers/usb/phy/omap-usb2.c                       |  271
+++++++++++++++++++++
  include/linux/usb/omap_usb.h                      |   46 ++++
  include/linux/usb/phy_companion.h                 |   34 +++
  6 files changed, 378 insertions(+)

create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt create mode 100644 drivers/usb/phy/omap-usb2.c
create mode 100644 include/linux/usb/omap_usb.h
create mode 100644 include/linux/usb/phy_companion.h

Documentation/devicetree/bindings/usb/usb-phy.txt new file +0 -0

new file mode 100644
index 0000000..80d4148

This is a very generic name...

Documentation/devicetree/bindings/usb/usb-phy.txt line 6

Quoted 7 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +6 -0

@@ -0,0 +1,17 @@
+USB PHY
+
+OMAP USB2 PHY
+
+Required properties:
+ - compatible: Should be "ti,omap-usb2"

...for a specific phy. However, I do think a generic binding to describe host ctrlr to phy connections is needed.

Quoted 7 lines

Documentation/devicetree/bindings/usb/usb-phy.txt line 9

Quoted 3 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +3 -0

+ - reg : Address and length of the register set for the device. Also
+add the address of control module dev conf register until a driver for
+control module is added

The dts should describe the h/w, not what you need for the current driver. The 2nd reg field does not belong here.

Indeed. This was discussed and agreed upon as a interim solution till we have a control module driver in place to write to the control module register.

Quoted 1 line

Discussed where and agreed by who? I for one do not agree.

Yeah, what was tolerated was the addition of that address inside hwmod data, but I do agree that it should not go into DTS.

Hi,

Quoted 78 lines · Benoit

Quoted 75 lines · Rob Herring

Quoted 67 lines · KISHON VIJAY

Hi,

Quoted 53 lines · Rob Herring

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

Quoted 35 lines · Kishon Vijay Abraham I

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 <[email protected]>

Signed-off-by Kishon Vijay Abraham I <[email protected]>

---
   Documentation/devicetree/bindings/usb/usb-phy.txt |   17 ++
   drivers/usb/phy/Kconfig                           |    9 +
   drivers/usb/phy/Makefile                          |    1 +
   drivers/usb/phy/omap-usb2.c                       |  271
+++++++++++++++++++++
   include/linux/usb/omap_usb.h                      |   46 ++++
   include/linux/usb/phy_companion.h                 |   34 +++
   6 files changed, 378 insertions(+)

create mode 100644 Documentation/devicetree/bindings/usb/usb-phy.txt create mode 100644 drivers/usb/phy/omap-usb2.c
create mode 100644 include/linux/usb/omap_usb.h
create mode 100644 include/linux/usb/phy_companion.h

Documentation/devicetree/bindings/usb/usb-phy.txt new file +0 -0

new file mode 100644
index 0000000..80d4148

This is a very generic name...

Documentation/devicetree/bindings/usb/usb-phy.txt line 6

Quoted 7 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +6 -0

@@ -0,0 +1,17 @@
+USB PHY
+
+OMAP USB2 PHY
+
+Required properties:
+ - compatible: Should be "ti,omap-usb2"

...for a specific phy. However, I do think a generic binding to describe host ctrlr to phy connections is needed.

Quoted 7 lines

Documentation/devicetree/bindings/usb/usb-phy.txt line 9

Quoted 3 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +3 -0

+ - reg : Address and length of the register set for the device. Also
+add the address of control module dev conf register until a driver for
+control module is added

The dts should describe the h/w, not what you need for the current driver. The 2nd reg field does not belong here.

Quoted 3 lines

Indeed. This was discussed and agreed upon as a interim solution till we have a control module driver in place to write to the control module register.

Discussed where and agreed by who? I for one do not agree.

Quoted 2 lines

Yeah, what was tolerated was the addition of that address inside hwmod data, but I do agree that it should not go into DTS.

So how can we handle reg writes to control module until we have a control module driver. usb2 phy does not have a hwmod data for itself. Do you think we should add a new hwmod data for usb2 phy and use this in the usb2phy data node in the dts file?

Quoted 102 lines · KISHON VIJAY

Hi,

Quoted 96 lines · Benoit

Quoted 81 lines · Rob Herring

Quoted 78 lines · KISHON VIJAY

Hi,

Quoted 69 lines · Rob Herring

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

Quoted 38 lines · Kishon Vijay Abraham I

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 <[email protected]>

Signed-off-by Kishon Vijay Abraham I <[email protected]>

---
   Documentation/devicetree/bindings/usb/usb-phy.txt |   17 ++
   drivers/usb/phy/Kconfig                           |    9 +
   drivers/usb/phy/Makefile                          |    1 +
   drivers/usb/phy/omap-usb2.c                       |  271
+++++++++++++++++++++
   include/linux/usb/omap_usb.h                      |   46 ++++
   include/linux/usb/phy_companion.h                 |   34 +++
   6 files changed, 378 insertions(+)

create mode 100644
Documentation/devicetree/bindings/usb/usb-phy.txt
create mode 100644 drivers/usb/phy/omap-usb2.c create mode 100644 include/linux/usb/omap_usb.h create mode 100644 include/linux/usb/phy_companion.h

Documentation/devicetree/bindings/usb/usb-phy.txt new file +0 -0

new file mode 100644
index 0000000..80d4148

This is a very generic name...

Documentation/devicetree/bindings/usb/usb-phy.txt line 6

Quoted 7 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +6 -0

@@ -0,0 +1,17 @@
+USB PHY
+
+OMAP USB2 PHY
+
+Required properties:
+ - compatible: Should be "ti,omap-usb2"

...for a specific phy. However, I do think a generic binding to describe
host ctrlr to phy connections is needed.

Quoted 4 lines

Documentation/devicetree/bindings/usb/usb-phy.txt new file +2 -0

+ - reg : Address and length of the register set for the device. Also
+add the address of control module dev conf register until a driver

for
+control module is added

The dts should describe the h/w, not what you need for the current driver. The 2nd reg field does not belong here.

Quoted 7 lines

Quoted 3 lines

Indeed. This was discussed and agreed upon as a interim solution till we have a control module driver in place to write to the control module register.

Discussed where and agreed by who? I for one do not agree.

Yeah, what was tolerated was the addition of that address inside hwmod data,
but I do agree that it should not go into DTS.

Quoted 4 lines

So how can we handle reg writes to control module until we have a control module driver. usb2 phy does not have a hwmod data for itself. Do you think we should add a new hwmod data for usb2 phy and use this in the usb2phy data node in the dts file?

Now, I'm confused... didn't you already do that? What was the hwmod you added?

All the PHY configuration other than VBUS, ID GND and OTG SRP are removed from twl6030. The phy configurations are taken care by the dedicated usb2 phy driver. So twl6030 is made as comparator driver for VBUS and ID detection.

Signed-off-by Kishon Vijay Abraham I <[email protected]>

2012/9/6 Kishon Vijay Abraham I <[email protected]>:

Quoted 5 lines

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.

Quoted 1 line

Signed-off-by Kishon Vijay Abraham I <[email protected]>

USB doesn't work on pandaboard on linux-next, and bisection shows this patch. Unfortunately, I can't provide a dmesg log because USB is the only way I currently have to get one out(!), but presumably it's because this omap-usb2 device is never registered? Looks like this breaks non-dt USB on pandaboard; is that intended?

Quoted 5 lines

USB doesn't work on pandaboard on linux-next, and bisection shows this patch. Unfortunately, I can't provide a dmesg log because USB is the only way I currently have to get one out(!), but presumably it's because this omap-usb2 device is never registered? Looks like this breaks non-dt USB on pandaboard; is that intended?

Yes. omap-usb2 is *only* dt supported (New drivers shouldn't have the old non-dt support).

Some patches are queued only for 3.7.

In case you want to use MUSB please use these patches on linux-next.. [PATCH v2] arm: omap: hwmod: make *phy_48m* as the main_clk of ocp2scp [PATCH] ARM: OMAP2+: hwmod data: Fix ocp2scp_usb_phy and usb_host_hs entries (from Benoit)
[PATCH 0/2] ARM: dts: Add subnode for ocp2scp (patch series) [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB (patch series)

2012/9/24 ABRAHAM, KISHON VIJAY <[email protected]>:

Quoted 9 lines · Rabin Vincent

Quoted 5 lines

USB doesn't work on pandaboard on linux-next, and bisection shows this patch. Unfortunately, I can't provide a dmesg log because USB is the only way I currently have to get one out(!), but presumably it's because this omap-usb2 device is never registered? Looks like this breaks non-dt USB on pandaboard; is that intended?

Yes. omap-usb2 is *only* dt supported (New drivers shouldn't have the old non-dt support).

Well, USB used to work fine on Pandaboard without DT before the introduction of "omap-usb2", so one would expected it to continue working (until the board file is completely removed).

Anyway, I've moved to DT now.

Quoted 8 lines

Some patches are queued only for 3.7.

In case you want to use MUSB please use these patches on linux-next.. [PATCH v2] arm: omap: hwmod: make *phy_48m* as the main_clk of ocp2scp [PATCH] ARM: OMAP2+: hwmod data: Fix ocp2scp_usb_phy and usb_host_hs entries (from Benoit)
[PATCH 0/2] ARM: dts: Add subnode for ocp2scp (patch series) [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB (patch series)

I got these by merging in Benoit's for_3.7/dts_part2 on top of next-20120921. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Hi Kishon & Benoit,

Quoted 26 lines · Rabin Vincent

2012/9/24 ABRAHAM, KISHON VIJAY <[email protected]>:

Quoted 9 lines · Rabin Vincent

Quoted 5 lines

USB doesn't work on pandaboard on linux-next, and bisection shows this patch. Unfortunately, I can't provide a dmesg log because USB is the only way I currently have to get one out(!), but presumably it's because this omap-usb2 device is never registered? Looks like this breaks non-dt USB on pandaboard; is that intended?

Yes. omap-usb2 is *only* dt supported (New drivers shouldn't have the old non-dt support).

Well, USB used to work fine on Pandaboard without DT before the introduction of "omap-usb2", so one would expected it to continue working (until the board file is completely removed).

Anyway, I've moved to DT now.

Quoted 8 lines

Some patches are queued only for 3.7.

In case you want to use MUSB please use these patches on linux-next.. [PATCH v2] arm: omap: hwmod: make *phy_48m* as the main_clk of ocp2scp [PATCH] ARM: OMAP2+: hwmod data: Fix ocp2scp_usb_phy and usb_host_hs entries (from Benoit)
[PATCH 0/2] ARM: dts: Add subnode for ocp2scp (patch series) [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB (patch series)

Quoted 7 lines

I got these by merging in Benoit's for_3.7/dts_part2 on top of next-20120921. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

I still can't get musb to work on 3.7-rc2. Apparently it is still missing the patches from Benoit's for_3.7/dts_part2.

Maybe I just need to wait for it to be merged?

Till then, where can I get a tree where musb works on Panda?

Benoit,

FYI, I get merge conflicts when merging 3.7-rc2 on top of Linus's kernel HEAD. Am I missing something?

Hi Roger,

Quoted 40 lines · Roger Quadros

Hi Kishon & Benoit,

Quoted 26 lines · Rabin Vincent

2012/9/24 ABRAHAM, KISHON VIJAY <[email protected]>:

Quoted 9 lines · Rabin Vincent

Quoted 5 lines

USB doesn't work on pandaboard on linux-next, and bisection shows this patch. Unfortunately, I can't provide a dmesg log because USB is the only way I currently have to get one out(!), but presumably it's because this omap-usb2 device is never registered? Looks like this breaks non-dt USB on pandaboard; is that intended?

Yes. omap-usb2 is *only* dt supported (New drivers shouldn't have the old non-dt support).

Well, USB used to work fine on Pandaboard without DT before the introduction of "omap-usb2", so one would expected it to continue working (until the board file is completely removed).

Anyway, I've moved to DT now.

Quoted 8 lines

Some patches are queued only for 3.7.

In case you want to use MUSB please use these patches on linux-next.. [PATCH v2] arm: omap: hwmod: make *phy_48m* as the main_clk of ocp2scp [PATCH] ARM: OMAP2+: hwmod data: Fix ocp2scp_usb_phy and usb_host_hs entries (from Benoit)
[PATCH 0/2] ARM: dts: Add subnode for ocp2scp (patch series) [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB (patch series)

Quoted 7 lines

I got these by merging in Benoit's for_3.7/dts_part2 on top of next-20120921. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

I still can't get musb to work on 3.7-rc2. Apparently it is still missing the patches from Benoit's for_3.7/dts_part2.

Quoted 1 line

Maybe I just need to wait for it to be merged?

They are now in a for_3.8/dts. Unfortunately, one patch that was adding ctrl_module address in the USB data was rejected and thus I'm not sure it will work without that.

I think Tony had an idea to map the ctrl_register to regulator fmwk or something like that.

Quoted 1 line

Till then, where can I get a tree where musb works on Panda?

Quoted 43 lines · Benoit Cousson

Hi Roger,

Quoted 40 lines · Roger Quadros

Hi Kishon & Benoit,

Quoted 26 lines · Rabin Vincent

2012/9/24 ABRAHAM, KISHON VIJAY <[email protected]>:

Quoted 9 lines · Rabin Vincent

Quoted 5 lines

USB doesn't work on pandaboard on linux-next, and bisection shows this patch. Unfortunately, I can't provide a dmesg log because USB is the only way I currently have to get one out(!), but presumably it's because this omap-usb2 device is never registered? Looks like this breaks non-dt USB on pandaboard; is that intended?

Yes. omap-usb2 is *only* dt supported (New drivers shouldn't have the old non-dt support).

Well, USB used to work fine on Pandaboard without DT before the introduction of "omap-usb2", so one would expected it to continue working (until the board file is completely removed).

Anyway, I've moved to DT now.

Quoted 8 lines

Some patches are queued only for 3.7.

In case you want to use MUSB please use these patches on linux-next.. [PATCH v2] arm: omap: hwmod: make *phy_48m* as the main_clk of ocp2scp [PATCH] ARM: OMAP2+: hwmod data: Fix ocp2scp_usb_phy and usb_host_hs entries (from Benoit)
[PATCH 0/2] ARM: dts: Add subnode for ocp2scp (patch series) [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB (patch series)

Quoted 7 lines

I got these by merging in Benoit's for_3.7/dts_part2 on top of next-20120921. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

I still can't get musb to work on 3.7-rc2. Apparently it is still missing the patches from Benoit's for_3.7/dts_part2.

Quoted 8 lines

Quoted 1 line

Maybe I just need to wait for it to be merged?

They are now in a for_3.8/dts. Unfortunately, one patch that was adding ctrl_module address in the USB data was rejected and thus I'm not sure it will work without that.

I think Tony had an idea to map the ctrl_register to regulator fmwk or something like that.

For device tree, we may be eventually able to handle the ctrl_register using pinctrl-single.c and pinconf API. It probably does not make sense to set it up as a regulator as the comparator can trigger errors also for the pinconf related bits at least for MMC PBIAS.

Quoted 1 line

Quoted 1 line

Till then, where can I get a tree where musb works on Panda?

On panda, without using device tree, use v3.7-rc2 + the following patches:

ARM: OMAP: ocp2scp: create omap device for ocp2scp
ARM: OMAP4: add _dev_attr_ to ocp2scp for representing usb_phy
drivers: bus: ocp2scp: add pdata support

Also you need to enable CONFIG_OMAP_USB2. No idea what all is needed to use MUSB with device tree at this point.

Hi Tony,

Quoted 58 lines · Tony Lindgren

Quoted 43 lines · Benoit Cousson

Hi Roger,

Quoted 40 lines · Roger Quadros

Hi Kishon & Benoit,

Quoted 26 lines · Rabin Vincent

2012/9/24 ABRAHAM, KISHON VIJAY <[email protected]>:

Quoted 9 lines · Rabin Vincent

Quoted 5 lines

USB doesn't work on pandaboard on linux-next, and bisection shows this patch. Unfortunately, I can't provide a dmesg log because USB is the only way I currently have to get one out(!), but presumably it's because this omap-usb2 device is never registered? Looks like this breaks non-dt USB on pandaboard; is that intended?

Yes. omap-usb2 is *only* dt supported (New drivers shouldn't have the old non-dt support).

Well, USB used to work fine on Pandaboard without DT before the introduction of "omap-usb2", so one would expected it to continue working (until the board file is completely removed).

Anyway, I've moved to DT now.

Quoted 8 lines

Some patches are queued only for 3.7.

In case you want to use MUSB please use these patches on linux-next.. [PATCH v2] arm: omap: hwmod: make *phy_48m* as the main_clk of ocp2scp [PATCH] ARM: OMAP2+: hwmod data: Fix ocp2scp_usb_phy and usb_host_hs entries (from Benoit)
[PATCH 0/2] ARM: dts: Add subnode for ocp2scp (patch series) [PATCH v3 0/3] ARM: dts: omap: add dt data for MUSB (patch series)

Quoted 7 lines

I got these by merging in Benoit's for_3.7/dts_part2 on top of next-20120921. Thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

I still can't get musb to work on 3.7-rc2. Apparently it is still missing the patches from Benoit's for_3.7/dts_part2.

Quoted 8 lines

Quoted 1 line

Maybe I just need to wait for it to be merged?

They are now in a for_3.8/dts. Unfortunately, one patch that was adding ctrl_module address in the USB data was rejected and thus I'm not sure it will work without that.

I think Tony had an idea to map the ctrl_register to regulator fmwk or something like that.

For device tree, we may be eventually able to handle the ctrl_register using pinctrl-single.c and pinconf API. It probably does not make sense to set it up as a regulator as the comparator can trigger errors also for the pinconf related bits at least for MMC PBIAS.

Quoted 8 lines

Quoted 1 line

Quoted 1 line

Till then, where can I get a tree where musb works on Panda?

On panda, without using device tree, use v3.7-rc2 + the following patches:

ARM: OMAP: ocp2scp: create omap device for ocp2scp
ARM: OMAP4: add _dev_attr_ to ocp2scp for representing usb_phy
drivers: bus: ocp2scp: add pdata support

The above 3 patches got it to work for me. Thanks for the hint.

Quoted 3 lines

Also you need to enable CONFIG_OMAP_USB2. No idea what all is needed to use MUSB with device tree at this point.

Yes, you need to enable a bunch of other things which are not so easy to figure out for someone who has not worked with MUSB. Do you think we should enable musb and all dependencies in omap2plus_defconfig?

One more thing to note is that building CONFIG_OMAP_USB2 as module breaks the kernel build with the following error.

drivers/built-in.o: In function `twl4030_usb_irq':
/work/linux-2.6/drivers/usb/otg/twl4030-usb.c:518: undefined reference to `omap_musb_mailbox'
drivers/built-in.o: In function `twl4030_usb_phy_init':
/work/linux-2.6/drivers/usb/otg/twl4030-usb.c:540: undefined reference to `omap_musb_mailbox'
make: *** [vmlinux] Error 1

I bet the error would come while building twl6030-usb.c too.

Quoted 4 lines · Roger Quadros

I still can't get musb to work on 3.7-rc2. Apparently it is still missing the patches from Benoit's for_3.7/dts_part2.

Maybe I just need to wait for it to be merged?

They are now in a for_3.8/dts. Unfortunately, one patch that was adding ctrl_module address in the USB data was rejected and thus I'm not sure it will work without that.

Quoted 7 lines · Benoit Cousson

Quoted 4 lines · Roger Quadros

I still can't get musb to work on 3.7-rc2. Apparently it is still missing the patches from Benoit's for_3.7/dts_part2.

Maybe I just need to wait for it to be merged?

Quoted 3 lines

They are now in a for_3.8/dts. Unfortunately, one patch that was adding ctrl_module address in the USB data was rejected and thus I'm not sure it will work without that.

For v3.7-rc timeframe, looks like it's waiting on an ack from you:

http://www.spinics.net/lists/arm-kernel/msg201028.html

Hi Paul,

Quoted 13 lines · Paul Walmsley

Quoted 10 lines · Benoit Cousson

Quoted 4 lines · Roger Quadros

I still can't get musb to work on 3.7-rc2. Apparently it is still missing the patches from Benoit's for_3.7/dts_part2.

Maybe I just need to wait for it to be merged?

They are now in a for_3.8/dts. Unfortunately, one patch that was adding ctrl_module address in the USB data was rejected and thus I'm not sure it will work without that.

Quoted 3 lines

For v3.7-rc timeframe, looks like it's waiting on an ack from you:

http://www.spinics.net/lists/arm-kernel/msg201028.html

Oups, I missed that one. But I thought Roger was mentioning the DT patch and not that one.

Anyway, I will answer to Tony. Thanks for the reminder Paul.

Quoted 23 lines · Benoit Cousson

Hi Paul,

Quoted 9 lines · Paul Walmsley

Quoted 7 lines · Benoit Cousson

Quoted 4 lines · Roger Quadros

I still can't get musb to work on 3.7-rc2. Apparently it is still missing the patches from Benoit's for_3.7/dts_part2.

Maybe I just need to wait for it to be merged?

Quoted 7 lines

Quoted 3 lines

They are now in a for_3.8/dts. Unfortunately, one patch that was adding ctrl_module address in the USB data was rejected and thus I'm not sure it will work without that.

For v3.7-rc timeframe, looks like it's waiting on an ack from you:

http://www.spinics.net/lists/arm-kernel/msg201028.html

Oups, I missed that one. But I thought Roger was mentioning the DT patch and not that one.

Quoted 1 line

Anyway, I will answer to Tony. Thanks for the reminder Paul.

Well, in fact, I cannot even find the original email in my mailbox :-( I was banned again from linux-omap around that time, so that might be the reason.

So please take that hacky patch if it prevents the regression.