From patchwork Fri Oct 24 19:37:41 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolin Chen X-Patchwork-Id: 402943 Return-Path: X-Original-To: incoming-dt@patchwork.ozlabs.org Delivered-To: patchwork-incoming-dt@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D59E8140077 for ; Sat, 25 Oct 2014 06:38:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752551AbaJXTiG (ORCPT ); Fri, 24 Oct 2014 15:38:06 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:49903 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751729AbaJXTiF (ORCPT ); Fri, 24 Oct 2014 15:38:05 -0400 Received: by mail-pa0-f49.google.com with SMTP id hz1so1678928pad.22 for ; Fri, 24 Oct 2014 12:38:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=aCfLcXxHgHhYXP79CZWsPC565BCB5iZL4ootVssA8Lg=; b=cK5TotPXC5OtRJNvWfrwNDnPt3HWSPFXVAiTQOcrNX/M+U0x1xZJR2zgUW7BFIxVmE OWSj5VhuIkkHpY2fe8GPE26QSpQkXffG3VS8+ci0lc5Qw2Po+Mgs/1zwxFxq8LH3rTB4 cQRDAWntv8hUf8/yRJfksTU7BuBwJgTaQDPABa45iqUXJga6aD1EmqjVCX9QS1TOMHG/ CRv9XWpqt5/WMvKmqinf0mFxxnDWpOyZqDisOp0ZJ2N/ql2xW6gkYi+gWKVNeC5kg3WX lojNPs3BcUCwnEFnRsm0LB2lFha1uStAI45SbzA9Nuv7d//LSV7RF64uM+sZFNpYb9Mx dZYg== X-Received: by 10.67.14.129 with SMTP id fg1mr6689394pad.114.1414179483904; Fri, 24 Oct 2014 12:38:03 -0700 (PDT) Received: from Alpha.attlocal.net (99-189-113-45.lightspeed.sntcca.sbcglobal.net. [99.189.113.45]) by mx.google.com with ESMTPSA id y16sm4532209pbt.17.2014.10.24.12.38.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 24 Oct 2014 12:38:03 -0700 (PDT) From: Nicolin Chen To: vinod.koul@intel.com Cc: robh+dt@kernel.org, pawel.moll@arm.com, mark.rutland@arm.com, ijc+devicetree@hellion.org.uk, galak@codeaurora.org, dan.j.williams@intel.com, s.hauer@pengutronix.de, shawn.guo@linaro.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org, b38343@freescale.com Subject: [PATCH] dma: imx-sdma: Add a new DMATYPE for SAI Date: Fri, 24 Oct 2014 12:37:41 -0700 Message-Id: <1414179461-3522-1-git-send-email-nicoleotsuka@gmail.com> X-Mailer: git-send-email 1.9.1 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This patch simply adds a new DMATYPE for SAI which's included in i.MX6 Solo X. Signed-off-by: Nicolin Chen Acked-by: Shawn Guo --- Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt | 1 + drivers/dma/imx-sdma.c | 1 + include/linux/platform_data/dma-imx.h | 1 + 3 files changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt index 4659fd9..dc8d3aa 100644 --- a/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt +++ b/Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt @@ -48,6 +48,7 @@ The full ID of peripheral types can be found below. 21 ESAI 22 SSI Dual FIFO (needs firmware ver >= 2) 23 Shared ASRC + 24 SAI The third cell specifies the transfer priority as below. diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 88afc48..05fd6b1 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c @@ -729,6 +729,7 @@ static void sdma_get_pc(struct sdma_channel *sdmac, case IMX_DMATYPE_CSPI: case IMX_DMATYPE_EXT: case IMX_DMATYPE_SSI: + case IMX_DMATYPE_SAI: per_2_emi = sdma->script_addrs->app_2_mcu_addr; emi_2_per = sdma->script_addrs->mcu_2_app_addr; break; diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h index 6a1357d..7d964e7 100644 --- a/include/linux/platform_data/dma-imx.h +++ b/include/linux/platform_data/dma-imx.h @@ -41,6 +41,7 @@ enum sdma_peripheral_type { IMX_DMATYPE_ESAI, /* ESAI */ IMX_DMATYPE_SSI_DUAL, /* SSI Dual FIFO */ IMX_DMATYPE_ASRC_SP, /* Shared ASRC */ + IMX_DMATYPE_SAI, /* SAI */ }; enum imx_dma_prio {