Skip to contentSkip to conversation

usb: chipidea: add support for USB OTG controller on TI-NSPIRE

PATCH Applied [email protected] 2 participants 5 messages Nov 25, 2013 – Dec 6, 2013

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/1 usb: chipidea: add support for USB OTG controller on TI-NSPIRE

From: Daniel Tang <[email protected]>

The USB controller in TI-NSPIRE calculators are based off either Freescale's USB OTG controller or the USB controller found in the IMX233, both of which are Chipidea compatible.

This patch adds a device tree binding for the controller.

---

Changelog v3:
* Removed redundant module aliases

Changelog v2:
* Rename ci13xxx to ci_hdrc
* Fixed alignment issues

.../devicetree/bindings/usb/ci-hdrc-nspire.txt | 17 +++++

 drivers/usb/chipidea/Makefile                      |  1 +
 drivers/usb/chipidea/ci_hdrc_nspire.c              | 72 ++++++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/usb/ci-hdrc-nspire.txt
 create mode 100644 drivers/usb/chipidea/ci_hdrc_nspire.c
Documentation/devicetree/bindings/usb/ci-hdrc-nspire.txt new file +17 -0
new file mode 100644
index 0000000..5ba8e90
@@ -0,0 +1,17 @@
+* TI-Nspire USB OTG Controller
+
+Required properties:
+- compatible: Should be "zevio,nspire-usb"
+- reg: Should contain registers location and length
+- interrupts: Should contain controller interrupt
+
+Recommended properies:
+- vbus-supply: regulator for vbus
+
+Examples:
+		usb0: usb at B0000000 {
+			reg = <0xB0000000 0x1000>;
+			compatible = "zevio,nspire-usb";
+			interrupts = <8>;
+			vbus-supply = <&vbus_reg>;
+		};
drivers/usb/chipidea/Makefile +1 -0
index a99d980..245ea4d 100644
@@ -10,6 +10,7 @@ ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG)	+= debug.o
 # Glue/Bridge layers go here
 
 obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_msm.o
+obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_nspire.o
 
 # PCI doesn't provide stubs, need to check
 ifneq ($(CONFIG_PCI),)
drivers/usb/chipidea/ci_hdrc_nspire.c new file +72 -0

72 lines not on this page · raw message

--
1.8.1.3

Acked-by on v3 1/1
#1 lore raw
Quoted 138 lines

From: Daniel Tang <[email protected]>

The USB controller in TI-NSPIRE calculators are based off either Freescale's
USB OTG controller or the USB controller found in the IMX233, both of which
are Chipidea compatible.

This patch adds a device tree binding for the controller.

---

Changelog v3:
* Removed redundant module aliases

Changelog v2:
* Rename ci13xxx to ci_hdrc
* Fixed alignment issues

.../devicetree/bindings/usb/ci-hdrc-nspire.txt | 17 +++++

 drivers/usb/chipidea/Makefile                      |  1 +
 drivers/usb/chipidea/ci_hdrc_nspire.c              | 72
++++++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/usb/ci-hdrc-
nspire.txt
 create mode 100644 drivers/usb/chipidea/ci_hdrc_nspire.c
Documentation/devicetree/bindings/usb/ci-hdrc-nspire.txt new file +17 -0
new file mode 100644
index 0000000..5ba8e90
@@ -0,0 +1,17 @@
+* TI-Nspire USB OTG Controller
+
+Required properties:
+- compatible: Should be "zevio,nspire-usb"
+- reg: Should contain registers location and length
+- interrupts: Should contain controller interrupt
+
+Recommended properies:
+- vbus-supply: regulator for vbus
+
+Examples:
+		usb0: usb at B0000000 {
+			reg = <0xB0000000 0x1000>;
+			compatible = "zevio,nspire-usb";
+			interrupts = <8>;
+			vbus-supply = <&vbus_reg>;
+		};
drivers/usb/chipidea/Makefile +1 -0
index a99d980..245ea4d 100644
@@ -10,6 +10,7 @@ ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG)	+= debug.o
 # Glue/Bridge layers go here
 
 obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_msm.o
+obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_nspire.o
 
 # PCI doesn't provide stubs, need to check
 ifneq ($(CONFIG_PCI),)
drivers/usb/chipidea/ci_hdrc_nspire.c new file +63 -0
new file mode 100644
index 0000000..517ce41
@@ -0,0 +1,72 @@
+/*
+ *	Copyright (C) 2013 Daniel Tang <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * Based off drivers/usb/chipidea/ci_hdrc_msm.c
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/chipidea.h>
+
+#include "ci.h"
+
+static struct ci_hdrc_platform_data ci_hdrc_nspire_platdata = {
+	.name			= "ci_hdrc_nspire",
+	.flags			= CI_HDRC_REGS_SHARED,
+	.capoffset		= DEF_CAPOFFSET,
+};
+
+static int ci_hdrc_nspire_probe(struct platform_device *pdev)
+{
+	struct platform_device *ci_pdev;
+
+	dev_dbg(&pdev->dev, "ci_hdrc_nspire_probe\n");
+
+	ci_pdev = ci_hdrc_add_device(&pdev->dev,
+				pdev->resource, pdev->num_resources,
+				&ci_hdrc_nspire_platdata);
+
+	if (IS_ERR(ci_pdev)) {
+		dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n");
+		return PTR_ERR(ci_pdev);
+	}
+
+	platform_set_drvdata(pdev, ci_pdev);
+
+	return 0;
+}
+
+static int ci_hdrc_nspire_remove(struct platform_device *pdev)
+{
+	struct platform_device *ci_pdev = platform_get_drvdata(pdev);
+
+	ci_hdrc_remove_device(ci_pdev);
+
+	return 0;
+}
+
+static const struct of_device_id ci_hdrc_nspire_dt_ids[] = {
+	{ .compatible = "zevio,nspire-usb", },
+	{ /* sentinel */ }
+};
+
+static struct platform_driver ci_hdrc_nspire_driver = {
+	.probe = ci_hdrc_nspire_probe,
+	.remove = ci_hdrc_nspire_remove,
+	.driver = {
+		.name = "nspire_usb",

drivers/usb/chipidea/ci_hdrc_nspire.c

Quoted 10 lines
drivers/usb/chipidea/ci_hdrc_nspire.c new file +9 -1
+		.owner = THIS_MODULE,
+		.of_match_table = ci_hdrc_nspire_dt_ids,
+	},
+};
+
+MODULE_DEVICE_TABLE(of, ci_hdrc_nspire_dt_ids);
+module_platform_driver(ci_hdrc_nspire_driver);
+
+MODULE_LICENSE("GPL v2");
--

You can decide to add module alias or not.

for driver part.

I haven't seen your dts patch.

Peter

#2 lore raw

Hi,

Quoted 142 lines · Peter Chen
Quoted 142 lines

From: Daniel Tang <[email protected]>

The USB controller in TI-NSPIRE calculators are based off either Freescale's
USB OTG controller or the USB controller found in the IMX233, both of which
are Chipidea compatible.

This patch adds a device tree binding for the controller.

---

Changelog v3:
* Removed redundant module aliases

Changelog v2:
* Rename ci13xxx to ci_hdrc
* Fixed alignment issues

.../devicetree/bindings/usb/ci-hdrc-nspire.txt     | 17 +++++
drivers/usb/chipidea/Makefile                      |  1 +
drivers/usb/chipidea/ci_hdrc_nspire.c              | 72
++++++++++++++++++++++
3 files changed, 90 insertions(+)

create mode 100644 Documentation/devicetree/bindings/usb/ci-hdrc- nspire.txt
create mode 100644 drivers/usb/chipidea/ci_hdrc_nspire.c

Documentation/devicetree/bindings/usb/ci-hdrc-nspire.txt new file +17 -0
new file mode 100644
index 0000000..5ba8e90
@@ -0,0 +1,17 @@
+* TI-Nspire USB OTG Controller
+
+Required properties:
+- compatible: Should be "zevio,nspire-usb"
+- reg: Should contain registers location and length
+- interrupts: Should contain controller interrupt
+
+Recommended properies:
+- vbus-supply: regulator for vbus
+
+Examples:
+		usb0: usb at B0000000 {
+			reg = <0xB0000000 0x1000>;
+			compatible = "zevio,nspire-usb";
+			interrupts = <8>;
+			vbus-supply = <&vbus_reg>;
+		};
drivers/usb/chipidea/Makefile +0 -0
index a99d980..245ea4d 100644
@@ -10,6 +10,7 @@ ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG)	+= debug.o
 # Glue/Bridge layers go here
 

obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_msm.o
+obj-$(CONFIG_USB_CHIPIDEA) += ci_hdrc_nspire.o

# PCI doesn't provide stubs, need to check
ifneq ($(CONFIG_PCI),)

drivers/usb/chipidea/ci_hdrc_nspire.c new file +67 -0
new file mode 100644
index 0000000..517ce41
@@ -0,0 +1,72 @@
+/*
+ *	Copyright (C) 2013 Daniel Tang <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * Based off drivers/usb/chipidea/ci_hdrc_msm.c
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/chipidea.h>
+
+#include "ci.h"
+
+static struct ci_hdrc_platform_data ci_hdrc_nspire_platdata = {
+	.name			= "ci_hdrc_nspire",
+	.flags			= CI_HDRC_REGS_SHARED,
+	.capoffset		= DEF_CAPOFFSET,
+};
+
+static int ci_hdrc_nspire_probe(struct platform_device *pdev)
+{
+	struct platform_device *ci_pdev;
+
+	dev_dbg(&pdev->dev, "ci_hdrc_nspire_probe\n");
+
+	ci_pdev = ci_hdrc_add_device(&pdev->dev,
+				pdev->resource, pdev->num_resources,
+				&ci_hdrc_nspire_platdata);
+
+	if (IS_ERR(ci_pdev)) {
+		dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n");
+		return PTR_ERR(ci_pdev);
+	}
+
+	platform_set_drvdata(pdev, ci_pdev);
+
+	return 0;
+}
+
+static int ci_hdrc_nspire_remove(struct platform_device *pdev)
+{
+	struct platform_device *ci_pdev = platform_get_drvdata(pdev);
+
+	ci_hdrc_remove_device(ci_pdev);
+
+	return 0;
+}
+
+static const struct of_device_id ci_hdrc_nspire_dt_ids[] = {
+	{ .compatible = "zevio,nspire-usb", },
+	{ /* sentinel */ }
+};
+
+static struct platform_driver ci_hdrc_nspire_driver = {
+	.probe = ci_hdrc_nspire_probe,
+	.remove = ci_hdrc_nspire_remove,
+	.driver = {
+		.name = "nspire_usb",
+		.owner = THIS_MODULE,
+		.of_match_table = ci_hdrc_nspire_dt_ids,
+	},
+};
Quoted 8 lines

drivers/usb/chipidea/ci_hdrc_nspire.c

Quoted 6 lines
drivers/usb/chipidea/ci_hdrc_nspire.c new file +5 -1
+
+MODULE_DEVICE_TABLE(of, ci_hdrc_nspire_dt_ids);
+module_platform_driver(ci_hdrc_nspire_driver);
+
+MODULE_LICENSE("GPL v2");
--

You can decide to add module alias or not.

It wasn't really required.

Quoted 5 lines

for driver part.

I haven't seen your dts patch.

If you mean the dts files for the platform, I'm still working on getting the regulator working so I'll probably send it in when it's all done.

Quoted 4 lines

Peter

Cheers,
Daniel Tang

Applied
#3 lore raw
In reply to [email protected]
Quoted 139 lines · dt.tangr at gmail.com

From: Daniel Tang <[email protected]>

The USB controller in TI-NSPIRE calculators are based off either Freescale's USB OTG controller or the USB controller found in the IMX233, both of which are Chipidea compatible.

This patch adds a device tree binding for the controller.

---

Changelog v3:
* Removed redundant module aliases

Changelog v2:
* Rename ci13xxx to ci_hdrc
* Fixed alignment issues

.../devicetree/bindings/usb/ci-hdrc-nspire.txt | 17 +++++

 drivers/usb/chipidea/Makefile                      |  1 +
 drivers/usb/chipidea/ci_hdrc_nspire.c              | 72 ++++++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/usb/ci-hdrc-nspire.txt
 create mode 100644 drivers/usb/chipidea/ci_hdrc_nspire.c
Documentation/devicetree/bindings/usb/ci-hdrc-nspire.txt new file +17 -0
new file mode 100644
index 0000000..5ba8e90
@@ -0,0 +1,17 @@
+* TI-Nspire USB OTG Controller
+
+Required properties:
+- compatible: Should be "zevio,nspire-usb"
+- reg: Should contain registers location and length
+- interrupts: Should contain controller interrupt
+
+Recommended properies:
+- vbus-supply: regulator for vbus
+
+Examples:
+		usb0: usb at B0000000 {
+			reg = <0xB0000000 0x1000>;
+			compatible = "zevio,nspire-usb";
+			interrupts = <8>;
+			vbus-supply = <&vbus_reg>;
+		};
drivers/usb/chipidea/Makefile +1 -0
index a99d980..245ea4d 100644
@@ -10,6 +10,7 @@ ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG)	+= debug.o
 # Glue/Bridge layers go here
 
 obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_msm.o
+obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_nspire.o
 
 # PCI doesn't provide stubs, need to check
 ifneq ($(CONFIG_PCI),)
drivers/usb/chipidea/ci_hdrc_nspire.c new file +72 -1
new file mode 100644
index 0000000..517ce41
@@ -0,0 +1,72 @@
+/*
+ *	Copyright (C) 2013 Daniel Tang <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * Based off drivers/usb/chipidea/ci_hdrc_msm.c
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/chipidea.h>
+
+#include "ci.h"
+
+static struct ci_hdrc_platform_data ci_hdrc_nspire_platdata = {
+	.name			= "ci_hdrc_nspire",
+	.flags			= CI_HDRC_REGS_SHARED,
+	.capoffset		= DEF_CAPOFFSET,
+};
+
+static int ci_hdrc_nspire_probe(struct platform_device *pdev)
+{
+	struct platform_device *ci_pdev;
+
+	dev_dbg(&pdev->dev, "ci_hdrc_nspire_probe\n");
+
+	ci_pdev = ci_hdrc_add_device(&pdev->dev,
+				pdev->resource, pdev->num_resources,
+				&ci_hdrc_nspire_platdata);
+
+	if (IS_ERR(ci_pdev)) {
+		dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n");
+		return PTR_ERR(ci_pdev);
+	}
+
+	platform_set_drvdata(pdev, ci_pdev);
+
+	return 0;
+}
+
+static int ci_hdrc_nspire_remove(struct platform_device *pdev)
+{
+	struct platform_device *ci_pdev = platform_get_drvdata(pdev);
+
+	ci_hdrc_remove_device(ci_pdev);
+
+	return 0;
+}
+
+static const struct of_device_id ci_hdrc_nspire_dt_ids[] = {
+	{ .compatible = "zevio,nspire-usb", },
+	{ /* sentinel */ }
+};
+
+static struct platform_driver ci_hdrc_nspire_driver = {
+	.probe = ci_hdrc_nspire_probe,
+	.remove = ci_hdrc_nspire_remove,
+	.driver = {
+		.name = "nspire_usb",
+		.owner = THIS_MODULE,
+		.of_match_table = ci_hdrc_nspire_dt_ids,
+	},
+};
+
+MODULE_DEVICE_TABLE(of, ci_hdrc_nspire_dt_ids);
+module_platform_driver(ci_hdrc_nspire_driver);
+
+MODULE_LICENSE("GPL v2");
--
Quoted 3 lines

1.8.1.3

Applied, Thanks.

Signature · 2 lines
Best Regards,
Peter Chen
#4 lore raw
Quoted 137 lines · Peter Chen
Quoted 136 lines · dt.tangr at gmail.com

From: Daniel Tang <[email protected]>

The USB controller in TI-NSPIRE calculators are based off either Freescale's USB OTG controller or the USB controller found in the IMX233, both of which are Chipidea compatible.

This patch adds a device tree binding for the controller.

---

Changelog v3:
* Removed redundant module aliases

Changelog v2:
* Rename ci13xxx to ci_hdrc
* Fixed alignment issues

.../devicetree/bindings/usb/ci-hdrc-nspire.txt | 17 +++++

 drivers/usb/chipidea/Makefile                      |  1 +
 drivers/usb/chipidea/ci_hdrc_nspire.c              | 72 ++++++++++++++++++++++
 3 files changed, 90 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/usb/ci-hdrc-nspire.txt
 create mode 100644 drivers/usb/chipidea/ci_hdrc_nspire.c
Documentation/devicetree/bindings/usb/ci-hdrc-nspire.txt new file +17 -0
new file mode 100644
index 0000000..5ba8e90
@@ -0,0 +1,17 @@
+* TI-Nspire USB OTG Controller
+
+Required properties:
+- compatible: Should be "zevio,nspire-usb"
+- reg: Should contain registers location and length
+- interrupts: Should contain controller interrupt
+
+Recommended properies:
+- vbus-supply: regulator for vbus
+
+Examples:
+		usb0: usb at B0000000 {
+			reg = <0xB0000000 0x1000>;
+			compatible = "zevio,nspire-usb";
+			interrupts = <8>;
+			vbus-supply = <&vbus_reg>;
+		};
drivers/usb/chipidea/Makefile +1 -0
index a99d980..245ea4d 100644
@@ -10,6 +10,7 @@ ci_hdrc-$(CONFIG_USB_CHIPIDEA_DEBUG)	+= debug.o
 # Glue/Bridge layers go here
 
 obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_msm.o
+obj-$(CONFIG_USB_CHIPIDEA)	+= ci_hdrc_nspire.o
 
 # PCI doesn't provide stubs, need to check
 ifneq ($(CONFIG_PCI),)
drivers/usb/chipidea/ci_hdrc_nspire.c new file +70 -0
new file mode 100644
index 0000000..517ce41
@@ -0,0 +1,72 @@
+/*
+ *	Copyright (C) 2013 Daniel Tang <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ * Based off drivers/usb/chipidea/ci_hdrc_msm.c
+ *
+ */
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/chipidea.h>
+
+#include "ci.h"
+
+static struct ci_hdrc_platform_data ci_hdrc_nspire_platdata = {
+	.name			= "ci_hdrc_nspire",
+	.flags			= CI_HDRC_REGS_SHARED,
+	.capoffset		= DEF_CAPOFFSET,
+};
+
+static int ci_hdrc_nspire_probe(struct platform_device *pdev)
+{
+	struct platform_device *ci_pdev;
+
+	dev_dbg(&pdev->dev, "ci_hdrc_nspire_probe\n");
+
+	ci_pdev = ci_hdrc_add_device(&pdev->dev,
+				pdev->resource, pdev->num_resources,
+				&ci_hdrc_nspire_platdata);
+
+	if (IS_ERR(ci_pdev)) {
+		dev_err(&pdev->dev, "ci_hdrc_add_device failed!\n");
+		return PTR_ERR(ci_pdev);
+	}
+
+	platform_set_drvdata(pdev, ci_pdev);
+
+	return 0;
+}
+
+static int ci_hdrc_nspire_remove(struct platform_device *pdev)
+{
+	struct platform_device *ci_pdev = platform_get_drvdata(pdev);
+
+	ci_hdrc_remove_device(ci_pdev);
+
+	return 0;
+}
+
+static const struct of_device_id ci_hdrc_nspire_dt_ids[] = {
+	{ .compatible = "zevio,nspire-usb", },
+	{ /* sentinel */ }
+};
+
+static struct platform_driver ci_hdrc_nspire_driver = {
+	.probe = ci_hdrc_nspire_probe,
+	.remove = ci_hdrc_nspire_remove,
+	.driver = {
+		.name = "nspire_usb",
+		.owner = THIS_MODULE,
+		.of_match_table = ci_hdrc_nspire_dt_ids,
+	},
+};
+
+MODULE_DEVICE_TABLE(of, ci_hdrc_nspire_dt_ids);
+module_platform_driver(ci_hdrc_nspire_driver);
Quoted 19 lines
Quoted 6 lines
drivers/usb/chipidea/ci_hdrc_nspire.c new file +2 -1
+
+MODULE_LICENSE("GPL v2");
--

1.8.1.3

Applied, Thanks.

Signature · 7 lines
Best Regards,
Peter Chen

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

Hi Daniel,

I have reverted this patch from my tree, since your coming one just rename file and doc, and I have still not sent to Greg.

Please squash the two patches, and created a new one after your dts has been queued, I am chipidea maintainer, it is better I only queue driver patch, so please split your patchset like: driver patch, dts patch, and doc patch.

Signature · 2 lines
Best Regards,
Peter Chen