devicetree.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/2] usb: chipidea: add xilinx zynq platform data
@ 2015-08-26 15:27 Nathan Sullivan
  2015-08-26 15:27 ` [PATCH 2/2] Documentation: bindings: add doc for zynq USB Nathan Sullivan
                   ` (2 more replies)
  0 siblings, 3 replies; 15+ messages in thread
From: Nathan Sullivan @ 2015-08-26 15:27 UTC (permalink / raw)
  To: Peter.Chen, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
	galak, gregkh
  Cc: devicetree, linux-kernel, linux-usb, Nathan Sullivan

The Xilinx Zynq udc does not need the CI_HDRC_DISABLE_STREAMING flag,
unlike the default platform data.  Add platform data specific to the
Zynq udc.

Based on a patch by the same name from the Xilinx vendor tree.

Signed-off-by: Nathan Sullivan <nathan.sullivan@ni.com>
---
 drivers/usb/chipidea/ci_hdrc_usb2.c |   25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/drivers/usb/chipidea/ci_hdrc_usb2.c b/drivers/usb/chipidea/ci_hdrc_usb2.c
index 9eae1a1..4456d2c 100644
--- a/drivers/usb/chipidea/ci_hdrc_usb2.c
+++ b/drivers/usb/chipidea/ci_hdrc_usb2.c
@@ -12,6 +12,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/module.h>
 #include <linux/of.h>
+#include <linux/of_platform.h>
 #include <linux/phy/phy.h>
 #include <linux/platform_device.h>
 #include <linux/usb/chipidea.h>
@@ -30,18 +31,36 @@ static const struct ci_hdrc_platform_data ci_default_pdata = {
 	.flags		= CI_HDRC_DISABLE_STREAMING,
 };
 
+static struct ci_hdrc_platform_data ci_zynq_pdata = {
+	.capoffset	= DEF_CAPOFFSET,
+};
+
+static const struct of_device_id ci_hdrc_usb2_of_match[] = {
+	{ .compatible = "chipidea,usb2"},
+	{ .compatible = "xlnx,zynq-usb-2.20a", .data = &ci_zynq_pdata},
+	{ }
+};
+MODULE_DEVICE_TABLE(of, ci_hdrc_usb2_of_match);
+
 static int ci_hdrc_usb2_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
 	struct ci_hdrc_usb2_priv *priv;
 	struct ci_hdrc_platform_data *ci_pdata = dev_get_platdata(dev);
 	int ret;
+	const struct of_device_id *match;
 
 	if (!ci_pdata) {
 		ci_pdata = devm_kmalloc(dev, sizeof(*ci_pdata), GFP_KERNEL);
 		*ci_pdata = ci_default_pdata;	/* struct copy */
 	}
 
+	match = of_match_device(ci_hdrc_usb2_of_match, &pdev->dev);
+	if (match && match->data) {
+		/* struct copy */
+		*ci_pdata = *(struct ci_hdrc_platform_data *)match->data;
+	}
+
 	priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
 	if (!priv)
 		return -ENOMEM;
@@ -96,12 +115,6 @@ static int ci_hdrc_usb2_remove(struct platform_device *pdev)
 	return 0;
 }
 
-static const struct of_device_id ci_hdrc_usb2_of_match[] = {
-	{ .compatible = "chipidea,usb2" },
-	{ }
-};
-MODULE_DEVICE_TABLE(of, ci_hdrc_usb2_of_match);
-
 static struct platform_driver ci_hdrc_usb2_driver = {
 	.probe	= ci_hdrc_usb2_probe,
 	.remove	= ci_hdrc_usb2_remove,
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2015-09-23  7:01 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-08-26 15:27 [PATCH 1/2] usb: chipidea: add xilinx zynq platform data Nathan Sullivan
2015-08-26 15:27 ` [PATCH 2/2] Documentation: bindings: add doc for zynq USB Nathan Sullivan
     [not found] ` <1440602865-30468-1-git-send-email-nathan.sullivan-acOepvfBmUk@public.gmane.org>
2015-08-27  5:29   ` [PATCH 1/2] usb: chipidea: add xilinx zynq platform data sundeep subbaraya
     [not found]     ` <CALHRZuqFtaRFNd9D=a+x2rZ2848ZOGYbTkSWCHxNPcW_NvocxA-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-08-27  4:33       ` Peter Chen
2015-08-27  7:41         ` punnaiah choudary kalluri
     [not found]           ` <CAGnW=BYMnOFTaMQJtLXZ9ckCEHs+gCOCQR0VQFfO4HP=SMHBDQ-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-08-27 14:33             ` Nathan Sullivan
2015-08-28  1:30               ` Peter Chen
2015-08-28 14:42                 ` Nathan Sullivan
2015-08-31  0:40                   ` Peter Chen
2015-08-31  3:31                     ` punnaiah choudary kalluri
2015-08-31  2:28                       ` Peter Chen
2015-09-01  6:51                         ` Subbaraya Sundeep Bhatta
2015-09-23  6:58                         ` Subbaraya Sundeep Bhatta
2015-09-23  7:01                         ` Subbaraya Sundeep Bhatta
2015-08-31  2:36 ` Peter Chen

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).