From patchwork Thu Jul 14 16:14:17 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 2702 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id CECBD24352 for ; Thu, 14 Jul 2011 16:03:35 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 881CDA1847F for ; Thu, 14 Jul 2011 16:03:35 +0000 (UTC) Received: by qwb8 with SMTP id 8so267156qwb.11 for ; Thu, 14 Jul 2011 09:03:35 -0700 (PDT) Received: by 10.229.217.3 with SMTP id hk3mr2054010qcb.38.1310659414986; Thu, 14 Jul 2011 09:03:34 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.229.217.78 with SMTP id hl14cs19730qcb; Thu, 14 Jul 2011 09:03:34 -0700 (PDT) Received: by 10.43.46.196 with SMTP id up4mr2787267icb.344.1310659414263; Thu, 14 Jul 2011 09:03:34 -0700 (PDT) Received: from mail-iw0-f178.google.com (mail-iw0-f178.google.com [209.85.214.178]) by mx.google.com with ESMTPS id o10si1155196icc.13.2011.07.14.09.03.33 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jul 2011 09:03:34 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.214.178 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.214.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.214.178 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) smtp.mail=shawn.guo@linaro.org Received: by mail-iw0-f178.google.com with SMTP id 10so371519iwc.37 for ; Thu, 14 Jul 2011 09:03:33 -0700 (PDT) Received: by 10.42.144.65 with SMTP id a1mr2206638icv.456.1310659413819; Thu, 14 Jul 2011 09:03:33 -0700 (PDT) Received: from localhost.localdomain ([117.82.20.93]) by mx.google.com with ESMTPS id o10sm408460icc.12.2011.07.14.09.03.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 14 Jul 2011 09:03:33 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Cc: devicetree-discuss@lists.ozlabs.org, patches@linaro.org, Shawn Guo , Grant Likely , Vinod Koul , Sascha Hauer Subject: [PATCH 2/2] dmaengine: imx-sdma: add device tree probe support Date: Fri, 15 Jul 2011 00:14:17 +0800 Message-Id: <1310660057-17953-3-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1310660057-17953-1-git-send-email-shawn.guo@linaro.org> References: <1310660057-17953-1-git-send-email-shawn.guo@linaro.org> It adds device tree probe support for imx-sdma driver. Signed-off-by: Shawn Guo Cc: Grant Likely Cc: Vinod Koul Cc: Sascha Hauer --- .../devicetree/bindings/dma/fsl-imx-sdma.txt | 55 ++++++++++++++++++++ drivers/dma/imx-sdma.c | 29 +++++++++- 2 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt new file mode 100644 index 0000000..71f4525 --- /dev/null +++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt @@ -0,0 +1,55 @@ +* Freescale Smart Direct Memory Access (SDMA) Controller for i.MX + +Required properties: +- compatible : Should be "fsl,-sdma" +- reg : Should contain SDMA registers location and length +- interrupts : Should contain SDMA interrupt +- fsl,sdma-script-name : Should contain the full path of SDMA RAM scripts + firmware +- fsl,sdma-script-address : Should be an array giving entry address for each + script. The address should be 0 in case that the specified script is not + included in the firmware. See example below for the array details. + +Examples: + +sdma@83fb0000 { + compatible = "fsl,imx51-sdma", "fsl,imx35-sdma"; + reg = <0x83fb0000 0x4000>; + interrupts = <6>; + fsl,sdma-script-name = "sdma-imx51.bin"; + fsl,sdma-script-address = <642>, /* ap_2_ap */ + <0>, /* ap_2_bp */ + <0>, /* ap_2_ap_fixed */ + <0>, /* bp_2_ap */ + <0>, /* loopback_on_dsp_side */ + <0>, /* mcu_interrupt_only */ + <0>, /* firi_2_per */ + <0>, /* firi_2_mcu */ + <0>, /* per_2_firi */ + <0>, /* mcu_2_firi */ + <0>, /* uart_2_per */ + <817>, /* uart_2_mcu */ + <0>, /* per_2_app */ + <747>, /* mcu_2_app */ + <0>, /* per_2_per */ + <0>, /* uartsh_2_per */ + <0>, /* uartsh_2_mcu */ + <0>, /* per_2_shp */ + <961>, /* mcu_2_shp */ + <1473>, /* ata_2_mcu */ + <1392>, /* mcu_2_ata */ + <1033>, /* app_2_per */ + <683>, /* app_2_mcu */ + <1251>, /* shp_2_per */ + <892>, /* shp_2_mcu */ + <0>, /* mshc_2_mcu */ + <0>, /* mcu_2_mshc */ + <0>, /* spdif_2_mcu */ + <0>, /* mcu_2_spdif */ + <0>, /* asrc_2_mcu */ + <0>, /* ext_mem_2_ipu */ + <0>, /* descrambler */ + <0>, /* dptc_dvfs */ + <0>, /* utra_addr */ + <0>; /* ram_code_start */ +}; diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 4a7aa72..664f7bc 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -32,6 +32,8 @@ #include #include #include +#include +#include #include #include @@ -331,6 +333,12 @@ static struct platform_device_id sdma_devtypes[] = { } }; +static const struct of_device_id sdma_dt_ids[] = { + { .compatible = "fsl,imx31-sdma", .data = &sdma_devtypes[IMX31_SDMA], }, + { .compatible = "fsl,imx35-sdma", .data = &sdma_devtypes[IMX35_SDMA], }, + { /* sentinel */ } +}; + #define SDMA_H_CONFIG_DSPDMA (1 << 12) /* indicates if the DSPDMA is used */ #define SDMA_H_CONFIG_RTD_PINS (1 << 11) /* indicates if Real-Time Debug pins are enabled */ #define SDMA_H_CONFIG_ACR (1 << 4) /* indicates if AHB freq /core freq = 2 or 1 */ @@ -1257,6 +1265,10 @@ err_dma_alloc: static int __init sdma_probe(struct platform_device *pdev) { + const struct of_device_id *of_id = + of_match_device(sdma_dt_ids, &pdev->dev); + struct device_node *np = pdev->dev.of_node; + const char *fw_name; int ret; int irq; struct resource *iores; @@ -1272,7 +1284,7 @@ static int __init sdma_probe(struct platform_device *pdev) iores = platform_get_resource(pdev, IORESOURCE_MEM, 0); irq = platform_get_irq(pdev, 0); - if (!iores || irq < 0 || !pdata) { + if (!iores || irq < 0) { ret = -EINVAL; goto err_irq; } @@ -1302,6 +1314,8 @@ static int __init sdma_probe(struct platform_device *pdev) if (!sdma->script_addrs) goto err_alloc; + if (of_id) + pdev->id_entry = of_id->data; sdma->devtype = pdev->id_entry->driver_data; dma_cap_set(DMA_SLAVE, sdma->dma_device.cap_mask); @@ -1332,10 +1346,18 @@ static int __init sdma_probe(struct platform_device *pdev) if (ret) goto err_init; - if (pdata->script_addrs) + ret = of_property_read_u32_array(np, "fsl,sdma-script-address", + (u32 *) sdma->script_addrs, + sizeof(*sdma->script_addrs) / sizeof(u32)); + if (ret < 0 && pdata && pdata->script_addrs) sdma_add_scripts(sdma, pdata->script_addrs); - sdma_get_firmware(sdma, pdata->fw_name); + ret = of_property_read_string(np, "fsl,sdma-script-name", + &fw_name); + if (!ret) + sdma_get_firmware(sdma, fw_name); + else if (pdata) + sdma_get_firmware(sdma, pdata->fw_name); sdma->dma_device.dev = &pdev->dev; @@ -1383,6 +1405,7 @@ static int __exit sdma_remove(struct platform_device *pdev) static struct platform_driver sdma_driver = { .driver = { .name = "imx-sdma", + .of_match_table = sdma_dt_ids, }, .id_table = sdma_devtypes, .remove = __exit_p(sdma_remove),