From patchwork Mon Jun 13 07:37:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 1835 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.47.109) by localhost6.localdomain6 with IMAP4-SSL; 14 Jun 2011 16:45:51 -0000 Delivered-To: patches@linaro.org Received: by 10.52.181.10 with SMTP id ds10cs438809vdc; Mon, 13 Jun 2011 00:29:01 -0700 (PDT) Received: by 10.100.16.17 with SMTP id 17mr4565048anp.56.1307950140651; Mon, 13 Jun 2011 00:29:00 -0700 (PDT) Received: from mail-pw0-f50.google.com (mail-pw0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id d29si8560031and.142.2011.06.13.00.29.00 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Jun 2011 00:29:00 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of shawn.guo@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 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-pw0-f50.google.com with SMTP id 3so2271336pwi.37 for ; Mon, 13 Jun 2011 00:29:00 -0700 (PDT) Received: by 10.68.36.195 with SMTP id s3mr1843079pbj.388.1307950140029; Mon, 13 Jun 2011 00:29:00 -0700 (PDT) Received: from localhost.localdomain ([114.216.159.33]) by mx.google.com with ESMTPS id y2sm4431178pbi.83.2011.06.13.00.28.52 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 13 Jun 2011 00:28:59 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Cc: kernel@pengutronix.de, Fabio Estevam , patches@linaro.org, Shawn Guo Subject: [PATCH 4/6] ARM: mxc: imx-dma on imx25 has no other TO version but TO1 Date: Mon, 13 Jun 2011 15:37:23 +0800 Message-Id: <1307950645-26529-5-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1307950645-26529-1-git-send-email-shawn.guo@linaro.org> References: <1307950645-26529-1-git-send-email-shawn.guo@linaro.org> The imx25 sdma script only gets TO1 version, so there is no need to encode "to1" in the variable name. Signed-off-by: Shawn Guo --- arch/arm/plat-mxc/devices/platform-imx-dma.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-mxc/devices/platform-imx-dma.c b/arch/arm/plat-mxc/devices/platform-imx-dma.c index c2712b7..c64f015 100644 --- a/arch/arm/plat-mxc/devices/platform-imx-dma.c +++ b/arch/arm/plat-mxc/devices/platform-imx-dma.c @@ -77,7 +77,7 @@ static struct platform_device __init __maybe_unused *imx_add_imx_dma(void) } #ifdef CONFIG_ARCH_MX25 -static struct sdma_script_start_addrs addr_imx25_to1 = { +static struct sdma_script_start_addrs addr_imx25 = { .ap_2_ap_addr = 729, .uart_2_mcu_addr = 904, .per_2_app_addr = 1255, @@ -165,7 +165,7 @@ static int __init imxXX_add_imx_dma(void) #if defined(CONFIG_SOC_IMX25) if (cpu_is_mx25()) { - imx25_imx_sdma_data.pdata.script_addrs = &addr_imx25_to1; + imx25_imx_sdma_data.pdata.script_addrs = &addr_imx25; ret = imx_add_imx_sdma(&imx25_imx_sdma_data); } else #endif