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 2/7] usb: dwc3-omap: use of_platform API to create dwc3 core pdev Date: Mon, 15 Oct 2012 18:57:55 +0530 [thread overview] Message-ID: <1350307680-24938-3-git-send-email-kishon@ti.com> (raw) In-Reply-To: <1350307680-24938-1-git-send-email-kishon@ti.com> Used of_platform_populate() to populate dwc3 core platform_device from device tree data. Since now the allocation of unique device id is handled by of_*, removed the call to dwc3_get_device_id. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- drivers/usb/dwc3/dwc3-omap.c | 50 +++++++++--------------------------------- 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index d51c69c..4aaeec4 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -47,6 +47,7 @@ #include <linux/ioport.h> #include <linux/io.h> #include <linux/of.h> +#include <linux/of_platform.h> #include <linux/usb/otg.h> #include <linux/usb/nop-usb-xceiv.h> @@ -133,7 +134,6 @@ struct dwc3_omap { /* device lock */ spinlock_t lock; - struct platform_device *dwc3; struct platform_device *usb2_phy; struct platform_device *usb3_phy; struct device *dev; @@ -276,12 +276,10 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev) struct dwc3_omap_data *pdata = pdev->dev.platform_data; struct device_node *node = pdev->dev.of_node; - struct platform_device *dwc3; struct dwc3_omap *omap; struct resource *res; struct device *dev = &pdev->dev; - int devid; int size; int ret = -ENOMEM; int irq; @@ -324,34 +322,19 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev) return ret; } - devid = dwc3_get_device_id(); - if (devid < 0) - return -ENODEV; - - dwc3 = platform_device_alloc("dwc3", devid); - if (!dwc3) { - dev_err(dev, "couldn't allocate dwc3 device\n"); - goto err1; - } - context = devm_kzalloc(dev, resource_size(res), GFP_KERNEL); if (!context) { dev_err(dev, "couldn't allocate dwc3 context memory\n"); - goto err2; + return -ENOMEM; } spin_lock_init(&omap->lock); - dma_set_coherent_mask(&dwc3->dev, dev->coherent_dma_mask); - dwc3->dev.parent = dev; - dwc3->dev.dma_mask = dev->dma_mask; - dwc3->dev.dma_parms = dev->dma_parms; omap->resource_size = resource_size(res); omap->context = context; omap->dev = dev; omap->irq = irq; omap->base = base; - omap->dwc3 = dwc3; reg = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS); @@ -396,7 +379,7 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev) if (ret) { dev_err(dev, "failed to request IRQ #%d --> %d\n", omap->irq, ret); - goto err2; + return ret; } /* enable all IRQs */ @@ -415,28 +398,16 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev) dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_SET_1, reg); - ret = platform_device_add_resources(dwc3, pdev->resource, - pdev->num_resources); - if (ret) { - dev_err(dev, "couldn't add resources to dwc3 device\n"); - goto err2; - } - - ret = platform_device_add(dwc3); - if (ret) { - dev_err(dev, "failed to register dwc3 device\n"); - goto err2; + if (node) { + ret = of_platform_populate(node, NULL, NULL, dev); + if (ret) { + dev_err(&pdev->dev, + "failed to add create dwc3 core\n"); + return ret; + } } return 0; - -err2: - platform_device_put(dwc3); - -err1: - dwc3_put_device_id(devid); - - return ret; } static int __devexit dwc3_omap_remove(struct platform_device *pdev) @@ -446,7 +417,6 @@ static int __devexit dwc3_omap_remove(struct platform_device *pdev) platform_device_unregister(omap->usb2_phy); platform_device_unregister(omap->usb3_phy); - dwc3_put_device_id(omap->dwc3->id); device_for_each_child(&pdev->dev, NULL, dwc3_omap_remove_core); return 0; -- 1.7.9.5
WARNING: multiple messages have this Message-ID (diff)
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 2/7] usb: dwc3-omap: use of_platform API to create dwc3 core pdev Date: Mon, 15 Oct 2012 18:57:55 +0530 [thread overview] Message-ID: <1350307680-24938-3-git-send-email-kishon@ti.com> (raw) In-Reply-To: <1350307680-24938-1-git-send-email-kishon@ti.com> Used of_platform_populate() to populate dwc3 core platform_device from device tree data. Since now the allocation of unique device id is handled by of_*, removed the call to dwc3_get_device_id. Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com> --- drivers/usb/dwc3/dwc3-omap.c | 50 +++++++++--------------------------------- 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/drivers/usb/dwc3/dwc3-omap.c b/drivers/usb/dwc3/dwc3-omap.c index d51c69c..4aaeec4 100644 --- a/drivers/usb/dwc3/dwc3-omap.c +++ b/drivers/usb/dwc3/dwc3-omap.c @@ -47,6 +47,7 @@ #include <linux/ioport.h> #include <linux/io.h> #include <linux/of.h> +#include <linux/of_platform.h> #include <linux/usb/otg.h> #include <linux/usb/nop-usb-xceiv.h> @@ -133,7 +134,6 @@ struct dwc3_omap { /* device lock */ spinlock_t lock; - struct platform_device *dwc3; struct platform_device *usb2_phy; struct platform_device *usb3_phy; struct device *dev; @@ -276,12 +276,10 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev) struct dwc3_omap_data *pdata = pdev->dev.platform_data; struct device_node *node = pdev->dev.of_node; - struct platform_device *dwc3; struct dwc3_omap *omap; struct resource *res; struct device *dev = &pdev->dev; - int devid; int size; int ret = -ENOMEM; int irq; @@ -324,34 +322,19 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev) return ret; } - devid = dwc3_get_device_id(); - if (devid < 0) - return -ENODEV; - - dwc3 = platform_device_alloc("dwc3", devid); - if (!dwc3) { - dev_err(dev, "couldn't allocate dwc3 device\n"); - goto err1; - } - context = devm_kzalloc(dev, resource_size(res), GFP_KERNEL); if (!context) { dev_err(dev, "couldn't allocate dwc3 context memory\n"); - goto err2; + return -ENOMEM; } spin_lock_init(&omap->lock); - dma_set_coherent_mask(&dwc3->dev, dev->coherent_dma_mask); - dwc3->dev.parent = dev; - dwc3->dev.dma_mask = dev->dma_mask; - dwc3->dev.dma_parms = dev->dma_parms; omap->resource_size = resource_size(res); omap->context = context; omap->dev = dev; omap->irq = irq; omap->base = base; - omap->dwc3 = dwc3; reg = dwc3_omap_readl(omap->base, USBOTGSS_UTMI_OTG_STATUS); @@ -396,7 +379,7 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev) if (ret) { dev_err(dev, "failed to request IRQ #%d --> %d\n", omap->irq, ret); - goto err2; + return ret; } /* enable all IRQs */ @@ -415,28 +398,16 @@ static int __devinit dwc3_omap_probe(struct platform_device *pdev) dwc3_omap_writel(omap->base, USBOTGSS_IRQENABLE_SET_1, reg); - ret = platform_device_add_resources(dwc3, pdev->resource, - pdev->num_resources); - if (ret) { - dev_err(dev, "couldn't add resources to dwc3 device\n"); - goto err2; - } - - ret = platform_device_add(dwc3); - if (ret) { - dev_err(dev, "failed to register dwc3 device\n"); - goto err2; + if (node) { + ret = of_platform_populate(node, NULL, NULL, dev); + if (ret) { + dev_err(&pdev->dev, + "failed to add create dwc3 core\n"); + return ret; + } } return 0; - -err2: - platform_device_put(dwc3); - -err1: - dwc3_put_device_id(devid); - - return ret; } static int __devexit dwc3_omap_remove(struct platform_device *pdev) @@ -446,7 +417,6 @@ static int __devexit dwc3_omap_remove(struct platform_device *pdev) platform_device_unregister(omap->usb2_phy); platform_device_unregister(omap->usb3_phy); - dwc3_put_device_id(omap->dwc3->id); device_for_each_child(&pdev->dev, NULL, dwc3_omap_remove_core); return 0; -- 1.7.9.5
next prev parent reply other threads:[~2012-10-15 13:29 UTC|newest] Thread overview: 28+ 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 ` 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 ` Kishon Vijay Abraham I 2012-10-15 13:27 ` Kishon Vijay Abraham I [this message] 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 2012-10-25 14:04 ` Benoit Cousson 2012-10-25 14:19 ` Felipe Balbi 2012-10-25 14:19 ` Felipe Balbi 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 ` 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:27 ` Kishon Vijay Abraham I 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 2012-10-15 13:27 ` [PATCH v4 6/7] usb: dwc3-omap: Minor fixes to get dt working Kishon Vijay Abraham I 2012-10-15 13:27 ` Kishon Vijay Abraham I 2012-10-25 13:41 ` Benoit Cousson 2012-10-25 13:41 ` Benoit Cousson 2012-10-25 14:54 ` kishon 2012-10-25 14:54 ` kishon 2012-11-06 11:40 ` Felipe Balbi 2012-11-06 11:40 ` Felipe Balbi 2012-10-15 13:28 ` [PATCH v4 7/7] usb: dwc3: core: add dt support for dwc3 core Kishon Vijay Abraham I 2012-10-15 13:28 ` Kishon Vijay Abraham I 2012-11-06 11:43 ` [PATCH v4 0/7] usb: dwc3-omap: add dt support Felipe Balbi 2012-11-06 11:43 ` 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-3-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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.