linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lee Jones <lee.jones@linaro.org>
To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org
Cc: arnd@arndb.de, linus.walleij@stericsson.com,
	srinidhi.kasagar@stericsson.com, Lee Jones <lee.jones@linaro.org>,
	Felipe Balbi <balbi@ti.com>,
	Rob Herring <rob.herring@calxeda.com>,
	linux-usb@vger.kernel.org, devicetree-discuss@lists.ozlabs.org
Subject: [PATCH 49/63] usb: musb: ux500: add device tree probing support
Date: Fri,  3 May 2013 15:32:35 +0100	[thread overview]
Message-ID: <1367591569-32197-50-git-send-email-lee.jones@linaro.org> (raw)
In-Reply-To: <1367591569-32197-1-git-send-email-lee.jones@linaro.org>

This patch will allow ux500-musb to be probed and configured solely from
configuration found in Device Tree.

Cc: Felipe Balbi <balbi@ti.com>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: linux-usb@vger.kernel.org
Cc: devicetree-discuss@lists.ozlabs.org
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 .../devicetree/bindings/usb/ux500-usb.txt          |   50 +++++++++++++++++++
 drivers/usb/musb/ux500.c                           |   51 ++++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/usb/ux500-usb.txt

diff --git a/Documentation/devicetree/bindings/usb/ux500-usb.txt b/Documentation/devicetree/bindings/usb/ux500-usb.txt
new file mode 100644
index 0000000..330d6ec
--- /dev/null
+++ b/Documentation/devicetree/bindings/usb/ux500-usb.txt
@@ -0,0 +1,50 @@
+Ux500 MUSB
+
+Required properties:
+ - compatible : Should be "stericsson,db8500-musb"
+ - reg        : Offset and length of registers
+ - interrupts : Interrupt; mode, number and trigger
+ - dr_mode    : Dual-role; either host mode "host", peripheral mode "peripheral"
+                or both "otg"
+
+Optional properties:
+ - dmas       : A list of dma channels;
+                dma-controller, event-line, fixed-channel, flags
+ - dma-names  : An ordered list of channel names affiliated to the above
+
+Example:
+
+usb_per5@a03e0000 {
+	compatible = "stericsson,db8500-musb", "mentor,musb";
+	reg = <0xa03e0000 0x10000>;
+	interrupts = <0 23 0x4>;
+	interrupt-names = "mc";
+
+	dr_mode = "otg";
+
+	dmas = <&dma 38 0 0x2>, /* Logical - DevToMem */
+	       <&dma 38 0 0x0>, /* Logical - MemToDev */
+	       <&dma 37 0 0x2>, /* Logical - DevToMem */
+	       <&dma 37 0 0x0>, /* Logical - MemToDev */
+	       <&dma 36 0 0x2>, /* Logical - DevToMem */
+	       <&dma 36 0 0x0>, /* Logical - MemToDev */
+	       <&dma 19 0 0x2>, /* Logical - DevToMem */
+	       <&dma 19 0 0x0>, /* Logical - MemToDev */
+	       <&dma 18 0 0x2>, /* Logical - DevToMem */
+	       <&dma 18 0 0x0>, /* Logical - MemToDev */
+	       <&dma 17 0 0x2>, /* Logical - DevToMem */
+	       <&dma 17 0 0x0>, /* Logical - MemToDev */
+	       <&dma 16 0 0x2>, /* Logical - DevToMem */
+	       <&dma 16 0 0x0>, /* Logical - MemToDev */
+	       <&dma 39 0 0x2>, /* Logical - DevToMem */
+	       <&dma 39 0 0x0>; /* Logical - MemToDev */
+
+	dma-names = "iep_1_9",  "oep_1_9",
+		    "iep_2_10", "oep_2_10",
+		    "iep_3_11", "oep_3_11",
+		    "iep_4_12", "oep_4_12",
+		    "iep_5_13", "oep_5_13",
+		    "iep_6_14", "oep_6_14",
+		    "iep_7_15", "oep_7_15",
+		    "iep_8",    "oep_8";
+};
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c
index 7ddb132..5ff304c 100644
--- a/drivers/usb/musb/ux500.c
+++ b/drivers/usb/musb/ux500.c
@@ -25,6 +25,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/io.h>
+#include <linux/of.h>
 #include <linux/platform_device.h>
 
 #include "musb_core.h"
@@ -88,14 +89,57 @@ static const struct musb_platform_ops ux500_ops = {
 	.exit		= ux500_musb_exit,
 };
 
+static struct musb_hdrc_platform_data *
+ux500_of_probe(struct platform_device *pdev, struct device_node *np)
+{
+	struct musb_hdrc_platform_data *pdata;
+	const char *mode;
+	int strlen;
+
+	pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL);
+	if (!pdata)
+		return NULL;
+
+	mode = of_get_property(np, "dr_mode", &strlen);
+	if (!mode) {
+		dev_err(&pdev->dev, "No 'dr_mode' property found\n");
+		return NULL;
+	}
+
+	if (strlen > 0) {
+		if (!strcmp(mode, "host"))
+			pdata->mode = MUSB_HOST;
+		if (!strcmp(mode, "otg"))
+			pdata->mode = MUSB_OTG;
+		if (!strcmp(mode, "peripheral"))
+			pdata->mode = MUSB_PERIPHERAL;
+	}
+
+	return pdata;
+}
+
 static int ux500_probe(struct platform_device *pdev)
 {
 	struct musb_hdrc_platform_data	*pdata = pdev->dev.platform_data;
+	struct device_node		*np = pdev->dev.of_node;
 	struct platform_device		*musb;
 	struct ux500_glue		*glue;
 	struct clk			*clk;
 	int				ret = -ENOMEM;
 
+	if (!pdata) {
+		if (np) {
+			pdata = ux500_of_probe(pdev, np);
+			if (!pdata)
+				goto err0;
+
+			pdev->dev.platform_data = pdata;
+		} else {
+			dev_err(&pdev->dev, "no pdata or device tree found\n");
+			goto err0;
+		}
+	}
+
 	glue = kzalloc(sizeof(*glue), GFP_KERNEL);
 	if (!glue) {
 		dev_err(&pdev->dev, "failed to allocate glue context\n");
@@ -124,6 +168,7 @@ static int ux500_probe(struct platform_device *pdev)
 	musb->dev.parent		= &pdev->dev;
 	musb->dev.dma_mask		= &pdev->dev.coherent_dma_mask;
 	musb->dev.coherent_dma_mask	= pdev->dev.coherent_dma_mask;
+	musb->dev.of_node		= pdev->dev.of_node;
 
 	glue->dev			= &pdev->dev;
 	glue->musb			= musb;
@@ -222,12 +267,18 @@ static const struct dev_pm_ops ux500_pm_ops = {
 #define DEV_PM_OPS	NULL
 #endif
 
+static const struct of_device_id ux500_match[] = {
+        { .compatible = "stericsson,db8500-musb", },
+        {}
+};
+
 static struct platform_driver ux500_driver = {
 	.probe		= ux500_probe,
 	.remove		= ux500_remove,
 	.driver		= {
 		.name	= "musb-ux500",
 		.pm	= DEV_PM_OPS,
+		.of_match_table = ux500_match,
 	},
 };
 
-- 
1.7.10.4


  parent reply	other threads:[~2013-05-03 14:39 UTC|newest]

Thread overview: 119+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-03 14:31 [PATCH 00/63] dmaengine: Convert to correct API & Device Tree handling Lee Jones
2013-05-03 14:31 ` [PATCH 01/63] ARM: ux500: Supply address location names for the DMA40 DMA controller Lee Jones
2013-05-03 19:27   ` Linus Walleij
2013-05-03 14:31 ` [PATCH 02/63] ARM: ux500: Setup the DMA40 driver's DT node using the new DMA API Lee Jones
2013-05-03 19:29   ` Linus Walleij
2013-05-03 14:31 ` [PATCH 03/63] ARM: ux500: Supply UART's DMA configuration via Device Tree Lee Jones
2013-05-03 19:33   ` Linus Walleij
2013-05-03 14:31 ` [PATCH 04/63] ARM: ux500: Supply MMC " Lee Jones
2013-05-03 19:33   ` Linus Walleij
2013-05-03 14:31 ` [PATCH 05/63] ARM: ux500: Populate the ux500-musb Device Tree entry Lee Jones
2013-05-03 19:35   ` Linus Walleij
2013-05-03 14:31 ` [PATCH 06/63] ARM: ux500: Pass DMA memcpy channels though Device Tree Lee Jones
2013-05-03 19:37   ` Linus Walleij
2013-05-03 14:31 ` [PATCH 07/63] dmaengine: ste_dma40: Assign memcpy channels in the driver Lee Jones
2013-05-03 19:40   ` Linus Walleij
2013-05-03 19:51   ` Linus Walleij
2013-05-03 14:31 ` [PATCH 08/63] dmaengine: ste_dma40: Move default memcpy configs into " Lee Jones
2013-05-03 19:53   ` Linus Walleij
2013-05-03 14:31 ` [PATCH 09/63] dmaengine: ste_dma40: Rectify incorrect configuration validation checking Lee Jones
2013-05-03 19:58   ` Linus Walleij
2013-05-20 12:36   ` Linus Walleij
2013-05-03 14:31 ` [PATCH 10/63] dmaengine: ste_dma40: Amalgamate DMA source and destination channel numbers Lee Jones
2013-05-03 20:00   ` Linus Walleij
2013-05-20 12:35   ` Linus Walleij
2013-05-23 10:46     ` Vinod Koul
2013-05-03 14:31 ` [PATCH 11/63] ARM: ux500: Strip out duplicate USB DMA configuration Lee Jones
2013-05-03 20:02   ` Linus Walleij
2013-05-03 14:31 ` [PATCH 12/63] dmaengine: ste_dma40: Remove home-brew MAX() macro Lee Jones
2013-05-03 20:04   ` Linus Walleij
2013-05-20 12:32   ` Linus Walleij
2013-05-03 14:31 ` [PATCH 13/63] ARM: ux500: Remove unused 'data_width' attributes from SDI DMA configs Lee Jones
2013-05-03 20:07   ` Linus Walleij
2013-05-03 14:32 ` [PATCH 14/63] ARM: ux500: Remove unused 'data_width' attributes from SSP " Lee Jones
2013-05-03 20:09   ` Linus Walleij
2013-05-03 14:32 ` [PATCH 15/63] ARM: ux500: Remove unused 'data_width' attributes from UART " Lee Jones
2013-05-03 20:11   ` Linus Walleij
2013-05-03 14:32 ` [PATCH 16/63] ARM: ux500: Remove superfluous 'psize' attribute from Audio platform data Lee Jones
2013-05-03 20:13   ` Linus Walleij
2013-05-03 20:59     ` Fabio Baltieri
2013-05-03 21:04       ` Linus Walleij
2013-05-03 14:32 ` [PATCH 17/63] dmaengine: ste_dma40: Calculate number of logical channels from physical ones Lee Jones
2013-05-03 20:15   ` Linus Walleij
2013-05-03 14:32 ` [PATCH 18/63] dmaengine: ste_dma40: Remove 'always true' checking Lee Jones
2013-05-03 20:17   ` Linus Walleij
2013-05-03 14:32 ` [PATCH 19/63] dmaengine: ste_dma40: Separate Logical Global Interrupt Mask (GIM) unmasking Lee Jones
2013-05-03 20:23   ` Linus Walleij
2013-05-08 15:02     ` Lee Jones
2013-05-03 14:32 ` [PATCH 20/63] dmaengine: ste_dma40: Remove unnecessary call to d40_phy_cfg() Lee Jones
2013-05-03 20:27   ` Linus Walleij
2013-05-08 15:20     ` Lee Jones
2013-05-03 14:32 ` [PATCH 21/63] dmaengine: ste_dma40: Don't configure runtime configurable setup during allocate Lee Jones
2013-05-03 20:41   ` Linus Walleij
2013-05-08 15:24     ` Lee Jones
2013-05-03 14:32 ` [PATCH 22/63] dmaengine: ste_dma40: Move rev error-check up to revision acquisition Lee Jones
2013-05-03 20:48   ` Linus Walleij
2013-05-03 14:32 ` [PATCH 23/63] dmaengine: ste_dma40: Also report the number of logical channels Lee Jones
2013-05-03 20:53   ` Linus Walleij
2013-05-20 12:29   ` Linus Walleij
2013-05-23 10:48   ` Vinod Koul
2013-05-03 14:32 ` [PATCH 24/63] dmaengine: ste_dma40: Allocate plat_data on declaration Lee Jones
2013-05-03 20:55   ` Linus Walleij
2013-05-03 14:32 ` [PATCH 25/63] dmaengine: ste_dma40: Allow driver to be probe()able when DT is enabled Lee Jones
2013-05-03 20:58   ` Linus Walleij
2013-05-03 14:32 ` [PATCH 26/63] dmaengine: ste_dma40: Supply full Device Tree parsing support Lee Jones
2013-05-03 20:59   ` Linus Walleij
2013-05-03 21:00     ` Linus Walleij
2013-05-23 10:54   ` Vinod Koul
2013-05-03 14:32 ` [PATCH 27/63] ARM: ux500: Pass remnant platform data though to DMA40 driver Lee Jones
2013-05-03 21:09   ` Linus Walleij
2013-05-03 14:32 ` [PATCH 28/63] ARM: ux500: Stop passing UART's platform data for Device Tree boots Lee Jones
2013-05-03 21:11   ` Linus Walleij
2013-05-08 15:28     ` Lee Jones
2013-05-09 13:01     ` Lee Jones
2013-05-03 14:32 ` [PATCH 29/63] ARM: ux500: Stop passing MMC's " Lee Jones
2013-05-03 21:12   ` Linus Walleij
2013-05-03 14:32 ` [PATCH 30/63] ARM: ux500: Move SDI (MMC) and UART devices under more descriptive heading Lee Jones
2013-05-03 21:12   ` Linus Walleij
2013-05-03 14:32 ` [PATCH 31/63] dmaengine: ste_dma40: Only use addresses passed as configuration information Lee Jones
2013-05-03 21:16   ` Linus Walleij
2013-05-03 14:32 ` [PATCH 32/63] dmaengine: ste_dma40: Remove redundant address fetching function Lee Jones
2013-05-03 14:32 ` [PATCH 33/63] ARM: ux500: Remove DMA address look-up table Lee Jones
2013-05-03 14:32 ` [PATCH 34/63] dmaengine: ste_dma40: Correct copy/paste error Lee Jones
2013-05-03 14:32 ` [PATCH 35/63] ARM: ux500: Remove unnecessary attributes from DMA channel request pdata Lee Jones
2013-05-03 14:32 ` [PATCH 36/63] crypto: ux500/hash - Prepare clock before enabling it Lee Jones
2013-05-08 13:59   ` Ulf Hansson
2013-05-03 14:32 ` [PATCH 37/63] crypto: ux500/hash - Set DMA configuration though dma_slave_config() Lee Jones
2013-05-03 14:32 ` [PATCH 38/63] ARM: ux500: Stop passing Hash DMA channel config information though pdata Lee Jones
2013-05-03 14:32 ` [PATCH 39/63] crypto: ux500/cryp - Prepare clock before enabling it Lee Jones
2013-05-08 13:59   ` Ulf Hansson
2013-05-03 14:32 ` [PATCH 40/63] crypto: ux500/cryp - Set DMA configuration though dma_slave_config() Lee Jones
2013-05-03 14:32 ` [PATCH 41/63] ARM: ux500: Stop passing Cryp DMA channel config information though pdata Lee Jones
2013-05-03 14:32 ` [PATCH 42/63] crypto: ux500/[cryp|hash] - Show successful start-up in the bootlog Lee Jones
2013-05-03 14:32 ` [PATCH 43/63] ARM: ux500: Register Cyrp and Hash platform drivers on Snowball Lee Jones
2013-05-03 14:32 ` [PATCH 44/63] usb: musb: ux500: move channel number knowledge into the driver Lee Jones
2013-05-03 14:32 ` [PATCH 45/63] usb: musb: ux500: move the MUSB HDRC configuration " Lee Jones
2013-05-03 14:32 ` [PATCH 46/63] usb: musb: ux500: take the dma_mask from coherent_dma_mask Lee Jones
2013-05-03 14:32 ` [PATCH 47/63] usb: musb: ux500: harden checks for platform data Lee Jones
2013-05-03 14:32 ` [PATCH 48/63] usb: musb: ux500: attempt to find channels by name before using pdata Lee Jones
2013-05-03 14:32 ` Lee Jones [this message]
2013-05-03 14:32 ` [PATCH 50/63] ARM: ux500: Add an auxdata entry for MUSB for clock-name look-up Lee Jones
2013-05-03 14:32 ` [PATCH 51/63] ARM: ux500: Remove ux500-musb platform registation when booting with DT Lee Jones
2013-05-03 14:32 ` [PATCH 52/63] ARM: ux500: Remove empty function u8500_of_init_devices() Lee Jones
2013-05-03 14:32 ` [PATCH 53/63] dmaengine: ste_dma40: Use the BIT macro to replace ugly '(1 << x)'s Lee Jones
2013-05-03 14:32 ` [PATCH 54/63] ARM: ux500: Replace ST-E's home-brew DMA direction definition with the generic one Lee Jones
2013-05-06  7:13   ` Srinidhi Kasagar
2013-05-07  7:39     ` Lee Jones
2013-05-07  9:42       ` Srinidhi Kasagar
2013-05-07  9:53         ` Lee Jones
2013-05-03 14:32 ` [PATCH 55/63] dmaengine: ste_dma40: Replace ST-E's home-brew DMA direction defs with generic ones Lee Jones
2013-05-03 14:32 ` [PATCH 56/63] ARM: ux500: Remove recently unused stedma40_xfer_dir enums Lee Jones
2013-05-06  7:17   ` Srinidhi Kasagar
2013-05-03 14:32 ` [PATCH 57/63] dmaengine: ste_dma40_ll: Use the BIT macro to replace ugly '(1 << x)'s Lee Jones
2013-05-03 14:32 ` [PATCH 58/63] dmaengine: ste_dma40: Convert data_width from register bit format to value Lee Jones
2013-05-03 14:32 ` [PATCH 59/63] dmaengine: ste_dma40_ll: Replace meaningless register set with comment Lee Jones
2013-05-03 14:32 ` [PATCH 60/63] dmaengine: ste_dma40: Allow memcpy channels to be configured from DT Lee Jones
2013-05-03 14:32 ` [PATCH 61/63] ARM: ux500: Stop passing DMA platform data though AUXDATA Lee Jones
2013-05-06  6:55   ` Srinidhi Kasagar
2013-05-03 14:32 ` [PATCH 62/63] dmaengine: ste_dma40: Fetch the number of physical channels from DT Lee Jones
2013-05-03 14:32 ` [PATCH 63/63] dmaengine: ste_dma40: Fetch disabled " Lee Jones

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=1367591569-32197-50-git-send-email-lee.jones@linaro.org \
    --to=lee.jones@linaro.org \
    --cc=arnd@arndb.de \
    --cc=balbi@ti.com \
    --cc=devicetree-discuss@lists.ozlabs.org \
    --cc=linus.walleij@stericsson.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=rob.herring@calxeda.com \
    --cc=srinidhi.kasagar@stericsson.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).