From: Kishon Vijay Abraham I <kishon@ti.com>
To: kishon@ti.com, grant.likely@secretlab.ca,
rob.herring@calxeda.com, rob@landley.net, linux@arm.linux.org.uk,
gregkh@linuxfoundation.org, b-cousson@ti.com, rnayak@ti.com,
tony@atomide.com, devicetree-discuss@lists.ozlabs.org,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, balbi@ti.com,
linux-omap@vger.kernel.org, linux-usb@vger.kernel.org
Cc: hvaibhav@ti.com
Subject: [PATCH v1 09/11] drivers: usb: musb: Add device tree support for omap musb glue
Date: Thu, 28 Jun 2012 17:21:05 +0530 [thread overview]
Message-ID: <1340884267-28908-10-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1340884267-28908-1-git-send-email-kishon@ti.com>
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 | 52 ++++++++++++++++++++
2 files changed, 85 insertions(+), 1 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/omap-usb.txt b/Documentation/devicetree/bindings/usb/omap-usb.txt
index 80a28c9..39cdffb 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
@@ -14,3 +14,35 @@ usb2phy@0x4a0ad080 {
compatible = "ti,omap-usb2";
reg = <0x4a0ad080 0x58>;
};
+
+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@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 a50bd73..c750f11 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,43 @@ 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, "mode", (u32 *)&pdata->mode);
+ 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 +638,23 @@ 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,musb-omap2430" },
+ {}
+};
+MODULE_DEVICE_TABLE(of, omap2430_id_table);
+#else
+#define omap2430_id_table NULL
+#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 = omap2430_id_table,
},
};
--
1.7.5.4
next prev parent reply other threads:[~2012-06-28 11:51 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-28 11:50 [PATCH v1 00/11] omap: musb: Add device tree support Kishon Vijay Abraham I
2012-06-28 11:50 ` [PATCH v1 01/11] drivers: usb: otg: add a new driver for omap usb2 phy Kishon Vijay Abraham I
2012-07-10 5:46 ` Rajendra Nayak
2012-07-10 6:03 ` Venu Byravarasu
[not found] ` <D958900912E20642BCBC71664EFECE3E6DDAD9FF96-QZ+emBqkIFBDw2glCA4ptUEOCMrvLtNR@public.gmane.org>
2012-07-10 6:48 ` ABRAHAM, KISHON VIJAY
2012-07-10 7:05 ` Rajendra Nayak
2012-07-10 7:05 ` Venu Byravarasu
[not found] ` <4FFBC1D0.5030506-l0cyMroinI0@public.gmane.org>
2012-07-10 6:37 ` ABRAHAM, KISHON VIJAY
[not found] ` <CAAe_U6L9qiBMXWeS2POeBod8uASCtmqDc4DigwBx1bJ-hhaNRQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2012-07-10 6:49 ` Rajendra Nayak
2012-06-28 11:50 ` [PATCH v1 02/11] arm/dts: omap: Add omap-usb2 dt data Kishon Vijay Abraham I
2012-06-28 11:50 ` [PATCH v1 03/11] drivers: usb: otg: make twl6030_usb as a comparator driver to omap_usb2 Kishon Vijay Abraham I
2012-06-28 11:51 ` [PATCH v1 04/11] arm: omap: hwmod: add a new addr space in otg for writing to control module Kishon Vijay Abraham I
2012-06-28 11:51 ` [PATCH v1 05/11] drivers: usb: twl6030: Add dt support for twl6030 usb Kishon Vijay Abraham I
[not found] ` <1340884267-28908-6-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
2012-07-10 5:58 ` Rajendra Nayak
2012-07-10 6:28 ` ABRAHAM, KISHON VIJAY
2012-07-10 6:44 ` Rajendra Nayak
[not found] ` <4FFBCF45.7000304-l0cyMroinI0@public.gmane.org>
2012-07-10 8:18 ` ABRAHAM, KISHON VIJAY
2012-06-28 11:51 ` [PATCH v1 06/11] arm/dts: Add twl6030-usb data Kishon Vijay Abraham I
2012-06-28 11:51 ` [PATCH v1 07/11] drivers: usb: twl4030: Add device tree support for twl4030 usb Kishon Vijay Abraham I
2012-07-10 6:02 ` Rajendra Nayak
2012-07-10 6:52 ` ABRAHAM, KISHON VIJAY
2012-07-10 7:02 ` Rajendra Nayak
2012-06-28 11:51 ` [PATCH v1 08/11] arm/dts: Add twl4030-usb data Kishon Vijay Abraham I
2012-07-10 6:13 ` Rajendra Nayak
2012-07-10 6:55 ` ABRAHAM, KISHON VIJAY
2012-06-28 11:51 ` Kishon Vijay Abraham I [this message]
2012-07-10 7:14 ` [PATCH v1 09/11] drivers: usb: musb: Add device tree support for omap musb glue Gupta, Ajay Kumar
2012-06-28 11:51 ` [PATCH v1 10/11] arm/dts: omap: Add usb_otg and glue data Kishon Vijay Abraham I
[not found] ` <1340884267-28908-11-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
2012-07-10 6:27 ` Rajendra Nayak
2012-07-10 8:13 ` ABRAHAM, KISHON VIJAY
2012-07-10 8:32 ` Rajendra Nayak
2012-06-28 11:51 ` [PATCH v1 11/11] arm: omap: phy: remove unused functions from omap-phy-internal.c Kishon Vijay Abraham I
2012-07-10 6:29 ` Rajendra Nayak
2012-07-10 8:16 ` ABRAHAM, KISHON VIJAY
2012-07-10 8:33 ` Rajendra Nayak
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1340884267-28908-10-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=b-cousson@ti.com \
--cc=balbi@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=gregkh@linuxfoundation.org \
--cc=hvaibhav@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=rnayak@ti.com \
--cc=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=tony@atomide.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).