From: kishon@ti.com (Kishon Vijay Abraham I)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 4/5] drivers: usb: twl4030: Add device tree support for twl4030 usb
Date: Thu, 6 Sep 2012 20:27:09 +0530 [thread overview]
Message-ID: <1346943430-18236-5-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1346943430-18236-1-git-send-email-kishon@ti.com>
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
next prev parent reply other threads:[~2012-09-06 14:57 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-06 14:57 [PATCH 0/5] usb: phy/otg: add dt support Kishon Vijay Abraham I
2012-09-06 14:57 ` [PATCH 1/5] drivers: usb: phy: add a new driver for omap usb2 phy Kishon Vijay Abraham I
2012-09-24 13:15 ` Rob Herring
2012-09-25 10:06 ` ABRAHAM, KISHON VIJAY
2012-09-27 14:24 ` Rob Herring
2012-09-27 15:00 ` ABRAHAM, KISHON VIJAY
2012-09-27 22:48 ` Cousson, Benoit
2012-09-28 10:07 ` ABRAHAM, KISHON VIJAY
2012-09-28 15:12 ` Cousson, Benoit
2012-09-28 18:59 ` ABRAHAM, KISHON VIJAY
2012-09-06 14:57 ` [PATCH 2/5] drivers: usb: otg: make twl6030_usb as a comparator driver to omap_usb2 Kishon Vijay Abraham I
2012-09-21 21:33 ` Rabin Vincent
2012-09-24 8:43 ` ABRAHAM, KISHON VIJAY
2012-09-24 9:06 ` Rabin Vincent
2012-10-26 15:16 ` Roger Quadros
2012-10-26 15:21 ` Benoit Cousson
2012-10-26 16:36 ` Tony Lindgren
2012-10-29 9:01 ` Roger Quadros
2012-10-29 9:24 ` kishon
2012-10-26 17:54 ` Paul Walmsley
2012-10-26 17:57 ` Benoit Cousson
2012-10-26 18:09 ` Benoit Cousson
2012-10-26 19:01 ` Tony Lindgren
2012-09-06 14:57 ` [PATCH 3/5] drivers: usb: twl6030: Add dt support for twl6030 usb Kishon Vijay Abraham I
2012-09-06 14:57 ` Kishon Vijay Abraham I [this message]
2012-09-06 14:57 ` [PATCH 5/5] arm: omap: phy: remove unused functions from omap-phy-internal.c Kishon Vijay Abraham I
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=1346943430-18236-5-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).