From patchwork Thu Jan 5 03:11:13 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Zhao X-Patchwork-Id: 6053 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 0E7C423E16 for ; Thu, 5 Jan 2012 03:11:26 +0000 (UTC) Received: from mail-bk0-f52.google.com (mail-bk0-f52.google.com [209.85.214.52]) by fiordland.canonical.com (Postfix) with ESMTP id D5FF2A1823D for ; Thu, 5 Jan 2012 03:11:25 +0000 (UTC) Received: by bke17 with SMTP id 17so21534bke.11 for ; Wed, 04 Jan 2012 19:11:25 -0800 (PST) Received: by 10.205.141.78 with SMTP id jd14mr73278bkc.107.1325733085551; Wed, 04 Jan 2012 19:11:25 -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 ac16cs389216bkc; Wed, 4 Jan 2012 19:11:24 -0800 (PST) Received: by 10.229.136.77 with SMTP id q13mr68900qct.154.1325733082954; Wed, 04 Jan 2012 19:11:22 -0800 (PST) Received: from DB3EHSOBE003.bigfish.com (db3ehsobe003.messaging.microsoft.com. [213.199.154.141]) by mx.google.com with ESMTPS id c9si38294544qap.75.2012.01.04.19.11.22 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 04 Jan 2012 19:11:22 -0800 (PST) Received-SPF: neutral (google.com: 213.199.154.141 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) client-ip=213.199.154.141; Authentication-Results: mx.google.com; spf=neutral (google.com: 213.199.154.141 is neither permitted nor denied by best guess record for domain of richard.zhao@linaro.org) smtp.mail=richard.zhao@linaro.org Received: from mail104-db3-R.bigfish.com (10.3.81.246) by DB3EHSOBE003.bigfish.com (10.3.84.23) with Microsoft SMTP Server id 14.1.225.23; Thu, 5 Jan 2012 03:11:21 +0000 Received: from mail104-db3 (localhost [127.0.0.1]) by mail104-db3-R.bigfish.com (Postfix) with ESMTP id 2D96D3202B1; Thu, 5 Jan 2012 03:11:21 +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 mail104-db3 (localhost.localdomain [127.0.0.1]) by mail104-db3 (MessageSwitch) id 1325733080993662_1283; Thu, 5 Jan 2012 03:11:20 +0000 (UTC) Received: from DB3EHSMHS011.bigfish.com (unknown [10.3.81.241]) by mail104-db3.bigfish.com (Postfix) with ESMTP id ED33F6E003F; Thu, 5 Jan 2012 03:11:20 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by DB3EHSMHS011.bigfish.com (10.3.87.111) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 5 Jan 2012 03:11:20 +0000 Received: from az33smr01.freescale.net (10.64.34.199) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server id 14.1.355.3; Wed, 4 Jan 2012 21:11:19 -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 q053BGYL012013; Wed, 4 Jan 2012 21:11:17 -0600 (CST) From: Richard Zhao To: CC: , , , , Richard Zhao Subject: [PATCH 1/2] arm/mxc: make imx_dma_is_general_purpose more generic for sdma Date: Thu, 5 Jan 2012 11:11:13 +0800 Message-ID: <1325733074-10749-1-git-send-email-richard.zhao@linaro.org> X-Mailer: git-send-email 1.7.5.4 MIME-Version: 1.0 X-OriginatorOrg: sigmatel.com sdma device names var when use device tree. So we just check whether it includes "sdma" substring. Signed-off-by: Richard Zhao --- 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"); }