From: s.hauer@pengutronix.de (Sascha Hauer)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 3/6] USB: chipidea: ci13xxx-imx: create dynamic platformdata
Date: Thu, 31 Jan 2013 10:01:10 +0100 [thread overview]
Message-ID: <1359622873-23345-4-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1359622873-23345-1-git-send-email-s.hauer@pengutronix.de>
From: Michael Grzeschik <m.grzeschik@pengutronix.de>
This patch removes the limitation of having only one instance of the
ci13xxx-imx platformdata and makes different configurations possible.
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/usb/chipidea/ci13xxx_imx.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/drivers/usb/chipidea/ci13xxx_imx.c b/drivers/usb/chipidea/ci13xxx_imx.c
index 8c29122..69024e0 100644
--- a/drivers/usb/chipidea/ci13xxx_imx.c
+++ b/drivers/usb/chipidea/ci13xxx_imx.c
@@ -85,17 +85,10 @@ EXPORT_SYMBOL_GPL(usbmisc_get_init_data);
/* End of common functions shared by usbmisc drivers*/
-static struct ci13xxx_platform_data ci13xxx_imx_platdata = {
- .name = "ci13xxx_imx",
- .flags = CI13XXX_REQUIRE_TRANSCEIVER |
- CI13XXX_PULLUP_ON_VBUS |
- CI13XXX_DISABLE_STREAMING,
- .capoffset = DEF_CAPOFFSET,
-};
-
static int ci13xxx_imx_probe(struct platform_device *pdev)
{
struct ci13xxx_imx_data *data;
+ struct ci13xxx_platform_data *pdata;
struct platform_device *plat_ci, *phy_pdev;
struct device_node *phy_np;
struct resource *res;
@@ -107,6 +100,18 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)
&& !usbmisc_ops)
return -EPROBE_DEFER;
+ pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+ if (!pdata) {
+ dev_err(&pdev->dev, "Failed to allocate CI13xxx-IMX pdata!\n");
+ return -ENOMEM;
+ }
+
+ pdata->name = "ci13xxx_imx";
+ pdata->capoffset = DEF_CAPOFFSET;
+ pdata->flags = CI13XXX_REQUIRE_TRANSCEIVER |
+ CI13XXX_PULLUP_ON_VBUS |
+ CI13XXX_DISABLE_STREAMING;
+
data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
if (!data) {
dev_err(&pdev->dev, "Failed to allocate CI13xxx-IMX data!\n");
@@ -168,7 +173,7 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)
reg_vbus = NULL;
}
- ci13xxx_imx_platdata.phy = data->phy;
+ pdata->phy = data->phy;
if (!pdev->dev.dma_mask) {
pdev->dev.dma_mask = devm_kzalloc(&pdev->dev,
@@ -193,7 +198,7 @@ static int ci13xxx_imx_probe(struct platform_device *pdev)
plat_ci = ci13xxx_add_device(&pdev->dev,
pdev->resource, pdev->num_resources,
- &ci13xxx_imx_platdata);
+ pdata);
if (IS_ERR(plat_ci)) {
ret = PTR_ERR(plat_ci);
dev_err(&pdev->dev,
--
1.7.10.4
next prev parent reply other threads:[~2013-01-31 9:01 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-31 9:01 [PATCH v2] Add USB of helpers and use them in the chipidea driver Sascha Hauer
2013-01-31 9:01 ` [PATCH 1/6] USB: move bulk of otg/otg.c to phy/phy.c Sascha Hauer
2013-01-31 9:16 ` kishon
2013-01-31 9:01 ` [PATCH 2/6] USB: add devicetree helpers for determining dr_mode and phy_type Sascha Hauer
2013-01-31 9:12 ` kishon
2013-01-31 9:28 ` Sascha Hauer
2013-01-31 9:30 ` kishon
2013-01-31 9:20 ` Greg KH
2013-01-31 9:26 ` Sascha Hauer
2013-01-31 10:01 ` Peter Chen
2013-01-31 10:12 ` Sascha Hauer
2013-01-31 9:01 ` Sascha Hauer [this message]
2013-01-31 9:44 ` [PATCH 3/6] USB: chipidea: ci13xxx-imx: create dynamic platformdata Peter Chen
2013-01-31 9:01 ` [PATCH 4/6] USB: chipidea: add PTW and PTS handling Sascha Hauer
2013-01-31 9:46 ` Peter Chen
2013-01-31 9:01 ` [PATCH 5/6] USB chipidea: introduce dual role mode pdata flags Sascha Hauer
2013-01-31 9:01 ` [PATCH 6/6] USB chipidea i.MX: introduce dr_mode property Sascha Hauer
2013-01-31 9:47 ` Peter Chen
-- strict thread matches above, loose matches on Subject: below --
2013-01-30 15:29 [PATCH] Add USB of helpers and use them in the chipidea driver Sascha Hauer
2013-01-30 15:29 ` [PATCH 3/6] usb: chipidea: ci13xxx-imx: create dynamic platformdata Sascha Hauer
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=1359622873-23345-4-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--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).