From: Kishon Vijay Abraham I <kishon@ti.com>
To: grant.likely@secretlab.ca, rob.herring@calxeda.com,
rob@landley.net, balbi@ti.com, gregkh@linuxfoundation.org,
kishon@ti.com, devicetree-discuss@lists.ozlabs.org,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-usb@vger.kernel.org, linux-omap@vger.kernel.org
Cc: sshtylyov@mvista.com
Subject: [PATCH v4 6/7] usb: dwc3-omap: Minor fixes to get dt working
Date: Mon, 15 Oct 2012 18:57:59 +0530 [thread overview]
Message-ID: <1350307680-24938-7-git-send-email-kishon@ti.com> (raw)
In-Reply-To: <1350307680-24938-1-git-send-email-kishon@ti.com>
Includes few minor fixes in dwc3-omap like populating the compatible
string in a correct way, extracting the utmi-mode property properly and
changing the index of get_irq since irq of core is removed from hwmod
entry.
Also updated the documentation with dwc3-omap device tree binding
information.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
drivers/usb/dwc3/dwc3-omap.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c
index b84ddf3..10aad46 100644
--- a/drivers/usb/dwc3/dwc3-omap.c
+++ b/drivers/usb/dwc3/dwc3-omap.c
@@ -318,11 +318,10 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev)
struct resource *res;
struct device *dev = &pdev->dev;
- int size;
int ret = -ENOMEM;
int irq;
- const u32 *utmi_mode;
+ u32 utmi_mode;
u32 reg;
void __iomem *base;
@@ -336,13 +335,13 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, omap);
- irq = platform_get_irq(pdev, 1);
+ irq = platform_get_irq(pdev, 0);
if (irq < 0) {
dev_err(dev, "missing IRQ resource\n");
return -EINVAL;
}
- res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(dev, "missing memory base resource\n");
return -EINVAL;
@@ -389,9 +388,8 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev)
reg = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS);
- utmi_mode = of_get_property(node, "utmi-mode", &size);
- if (utmi_mode && size == sizeof(*utmi_mode)) {
- reg |= *utmi_mode;
+ if (!of_property_read_u32(node, "utmi-mode", &utmi_mode)) {
+ reg |= utmi_mode;
} else {
if (!pdata) {
dev_dbg(dev, "missing platform data\n");
@@ -469,7 +467,7 @@ static int __devexit dwc3_omap_remove(struct platform_device *pdev)
static const struct of_device_id of_dwc3_matach[] = {
{
- "ti,dwc3",
+ .compatible = "ti,dwc3"
},
{ },
};
--
1.7.9.5
next prev parent reply other threads:[~2012-10-15 13:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-15 13:27 [PATCH v4 0/7] usb: dwc3-omap: add dt support Kishon Vijay Abraham I
2012-10-15 13:27 ` [PATCH v4 1/7] usb: dwc3-omap: use device_for_each_child to handle child removal Kishon Vijay Abraham I
2012-10-15 13:27 ` [PATCH v4 2/7] usb: dwc3-omap: use of_platform API to create dwc3 core pdev Kishon Vijay Abraham I
2012-10-25 14:04 ` Benoit Cousson
[not found] ` <508946FC.7090704-l0cyMroinI0@public.gmane.org>
2012-10-25 14:19 ` Felipe Balbi
2012-10-15 13:27 ` [PATCH v4 5/7] usb: dwc3-omap: Add an API to write to dwc mailbox Kishon Vijay Abraham I
2012-10-15 13:27 ` Kishon Vijay Abraham I [this message]
[not found] ` <1350307680-24938-7-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
2012-10-25 13:41 ` [PATCH v4 6/7] usb: dwc3-omap: Minor fixes to get dt working Benoit Cousson
[not found] ` <50894198.40003-l0cyMroinI0@public.gmane.org>
2012-10-25 14:54 ` kishon
2012-11-06 11:40 ` Felipe Balbi
[not found] ` <1350307680-24938-1-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
2012-10-15 13:27 ` [PATCH v4 3/7] usb: dwc3-omap: use runtime API's to enable clocks Kishon Vijay Abraham I
2012-10-15 13:27 ` [PATCH v4 4/7] usb: dwc3-omap: Remove explicit writes to SYSCONFIG register Kishon Vijay Abraham I
2012-10-15 13:28 ` [PATCH v4 7/7] usb: dwc3: core: add dt support for dwc3 core Kishon Vijay Abraham I
2012-11-06 11:43 ` [PATCH v4 0/7] usb: dwc3-omap: add dt support Felipe Balbi
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=1350307680-24938-7-git-send-email-kishon@ti.com \
--to=kishon@ti.com \
--cc=balbi@ti.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=grant.likely@secretlab.ca \
--cc=gregkh@linuxfoundation.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=rob.herring@calxeda.com \
--cc=rob@landley.net \
--cc=sshtylyov@mvista.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).