From patchwork Thu May 15 07:57:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Bolle X-Patchwork-Id: 4179821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 31CC0BFF02 for ; Thu, 15 May 2014 08:00:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 6500520380 for ; Thu, 15 May 2014 08:00:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4722B2037E for ; Thu, 15 May 2014 08:00:40 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WkqYs-0007eU-1g; Thu, 15 May 2014 07:58:42 +0000 Received: from cpsmtpb-ews08.kpnxchange.com ([213.75.39.13]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WkqYn-00075c-VP for linux-arm-kernel@lists.infradead.org; Thu, 15 May 2014 07:58:39 +0000 Received: from cpsps-ews01.kpnxchange.com ([10.94.84.168]) by cpsmtpb-ews08.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 15 May 2014 09:57:52 +0200 Received: from CPSMTPM-TLF104.kpnxchange.com ([195.121.3.7]) by cpsps-ews01.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 15 May 2014 09:57:52 +0200 Received: from [192.168.10.106] ([195.240.213.44]) by CPSMTPM-TLF104.kpnxchange.com with Microsoft SMTPSVC(7.5.7601.17514); Thu, 15 May 2014 09:57:52 +0200 Message-ID: <1400140671.20469.7.camel@x220> Subject: [PATCH] ARM: imx: remove check for CONFIG_SDMA_IRAM From: Paul Bolle To: Shawn Guo , Sascha Hauer , Russell King Date: Thu, 15 May 2014 09:57:51 +0200 X-Mailer: Evolution 3.10.4 (3.10.4-2.fc20) Mime-Version: 1.0 X-OriginalArrivalTime: 15 May 2014 07:57:52.0183 (UTC) FILETIME=[5F412C70:01CF7013] X-RcptDomain: lists.infradead.org X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140515_005838_174952_DD23B9DB X-CRM114-Status: UNSURE ( 6.65 ) X-CRM114-Notice: Please train this message. X-Spam-Score: 0.8 (/) Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP A check for CONFIG_SDMA_IRAM was added in v2.6.34. But the Kconfig symbol SDMA_IRAM was never added. Remove this check. Signed-off-by: Paul Bolle --- Untested. Note that none of the MX51_MXC_DMA_CHANNEL_* macros are actually used. Why are they needed? arch/arm/mach-imx/mx51.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/mach-imx/mx51.h b/arch/arm/mach-imx/mx51.h index af844f76261a..f2604098fd06 100644 --- a/arch/arm/mach-imx/mx51.h +++ b/arch/arm/mach-imx/mx51.h @@ -160,11 +160,7 @@ #define MX51_MXC_DMA_CHANNEL_SSI1_RX MXC_DMA_DYNAMIC_CHANNEL #define MX51_MXC_DMA_CHANNEL_SSI1_TX MXC_DMA_DYNAMIC_CHANNEL #define MX51_MXC_DMA_CHANNEL_SSI2_RX MXC_DMA_DYNAMIC_CHANNEL -#ifdef CONFIG_SDMA_IRAM -#define MX51_MXC_DMA_CHANNEL_SSI2_TX (MX51_MXC_DMA_CHANNEL_IRAM + 1) -#else /*CONFIG_SDMA_IRAM */ #define MX51_MXC_DMA_CHANNEL_SSI2_TX MXC_DMA_DYNAMIC_CHANNEL -#endif /*CONFIG_SDMA_IRAM */ #define MX51_MXC_DMA_CHANNEL_CSPI1_RX MXC_DMA_DYNAMIC_CHANNEL #define MX51_MXC_DMA_CHANNEL_CSPI1_TX MXC_DMA_DYNAMIC_CHANNEL #define MX51_MXC_DMA_CHANNEL_CSPI2_RX MXC_DMA_DYNAMIC_CHANNEL