From patchwork Fri Jan 6 03:25:38 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 6079 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 E2B4123E14 for ; Fri, 6 Jan 2012 03:26:07 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id D8AD9A183D9 for ; Fri, 6 Jan 2012 03:26:07 +0000 (UTC) Received: by mail-ey0-f180.google.com with SMTP id c11so1087490eaa.11 for ; Thu, 05 Jan 2012 19:26:07 -0800 (PST) Received: by 10.205.138.136 with SMTP id is8mr1901755bkc.35.1325820367691; Thu, 05 Jan 2012 19:26:07 -0800 (PST) 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.205.82.144 with SMTP id ac16cs418491bkc; Thu, 5 Jan 2012 19:26:07 -0800 (PST) Received: by 10.220.151.143 with SMTP id c15mr2863140vcw.12.1325820366620; Thu, 05 Jan 2012 19:26:06 -0800 (PST) Received: from ch1outboundpool.messaging.microsoft.com (ch1ehsobe006.messaging.microsoft.com. [216.32.181.186]) by mx.google.com with ESMTPS id x10si9465482vco.43.2012.01.05.19.26.06 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 05 Jan 2012 19:26:06 -0800 (PST) Received-SPF: neutral (google.com: 216.32.181.186 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=216.32.181.186; Authentication-Results: mx.google.com; spf=neutral (google.com: 216.32.181.186 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail72-ch1-R.bigfish.com (10.43.68.252) by CH1EHSOBE016.bigfish.com (10.43.70.66) with Microsoft SMTP Server id 14.1.225.23; Fri, 6 Jan 2012 03:26:05 +0000 Received: from mail72-ch1 (localhost [127.0.0.1]) by mail72-ch1-R.bigfish.com (Postfix) with ESMTP id 0964770033A; Fri, 6 Jan 2012 03:26:05 +0000 (UTC) X-SpamScore: 7 X-BigFish: VS7(z1039ozzz1202hzz8275dhz2dh87h2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-FB-SS: 13, X-FB-DOMAIN-IP-MATCH: fail Received: from mail72-ch1 (localhost.localdomain [127.0.0.1]) by mail72-ch1 (MessageSwitch) id 1325820352679119_16959; Fri, 6 Jan 2012 03:25:52 +0000 (UTC) Received: from CH1EHSMHS008.bigfish.com (snatpool1.int.messaging.microsoft.com [10.43.68.248]) by mail72-ch1.bigfish.com (Postfix) with ESMTP id 9F64B480049; Fri, 6 Jan 2012 03:25:52 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS008.bigfish.com (10.43.70.8) with Microsoft SMTP Server (TLS) id 14.1.225.23; Fri, 6 Jan 2012 03:25:53 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-003.039d.mgd.msft.net (10.84.1.16) with Microsoft SMTP Server id 14.1.355.3; Thu, 5 Jan 2012 21:25:52 -0600 Received: from b20223-02.ap.freescale.net (b20223-02.ap.freescale.net [10.192.242.124]) by az33smr01.freescale.net (8.13.1/8.13.0) with ESMTP id q063Pl6v021044; Thu, 5 Jan 2012 21:25:50 -0600 (CST) From: Richard Zhao To: CC: , , , , Richard Zhao Subject: [PATCH 1/6] ARM: mxc: make imx_dma_is_general_purpose more generic for sdma Date: Fri, 6 Jan 2012 11:25:38 +0800 Message-ID: <1325820343-11875-2-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1325820343-11875-1-git-send-email-richard.zhao@linaro.org> References: <1325820343-11875-1-git-send-email-richard.zhao@linaro.org> MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com sdma device names vary for different SoC. So we just check whether it includes "sdma" substring. Signed-off-by: Richard Zhao Acked-by: Sascha Hauer --- arch/arm/plat-mxc/include/mach/dma.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/arch/arm/plat-mxc/include/mach/dma.h b/arch/arm/plat-mxc/include/mach/dma.h index 233d0a5..1b90803 100644 --- a/arch/arm/plat-mxc/include/mach/dma.h +++ b/arch/arm/plat-mxc/include/mach/dma.h @@ -60,8 +60,7 @@ static inline int imx_dma_is_ipu(struct dma_chan *chan) static inline int imx_dma_is_general_purpose(struct dma_chan *chan) { - return !strcmp(dev_name(chan->device->dev), "imx31-sdma") || - !strcmp(dev_name(chan->device->dev), "imx35-sdma") || + return strstr(dev_name(chan->device->dev), "sdma") || !strcmp(dev_name(chan->device->dev), "imx-dma"); }