From patchwork Mon Oct 4 08:18:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 228011 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o948IOKW001593 for ; Mon, 4 Oct 2010 08:18:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753113Ab0JDISY (ORCPT ); Mon, 4 Oct 2010 04:18:24 -0400 Received: from mgw-sa02.nokia.com ([147.243.1.48]:58231 "EHLO mgw-sa02.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753038Ab0JDISX (ORCPT ); Mon, 4 Oct 2010 04:18:23 -0400 Received: from cseresznye.nmp.nokia.com (cseresznye.nmp.nokia.com [172.22.211.20]) by mgw-sa02.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id o948IAYY002964; Mon, 4 Oct 2010 11:18:11 +0300 From: Peter Ujfalusi To: Tony Lindgren Cc: linux-omap@vger.kernel.org, Jarkko Nikula , linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 2/4] OMAP: DMA: Introduce errata handling variable, and macro Date: Mon, 4 Oct 2010 11:18:12 +0300 Message-Id: <1286180294-32618-3-git-send-email-peter.ujfalusi@nokia.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1286180294-32618-1-git-send-email-peter.ujfalusi@nokia.com> References: <1286180294-32618-1-git-send-email-peter.ujfalusi@nokia.com> X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Mon, 04 Oct 2010 08:18:25 +0000 (UTC) diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c index 6914ccf..ae0ff64 100644 --- a/arch/arm/plat-omap/dma.c +++ b/arch/arm/plat-omap/dma.c @@ -146,6 +146,10 @@ static const u8 omap1_dma_irq[OMAP1_LOGICAL_DMA_CH_COUNT] = { INT_1610_DMA_CH14, INT_1610_DMA_CH15, INT_DMA_LCD }; +/* Errata handling */ +static u16 dma_errata; +#define IS_DMA_ERRATA(id) (dma_errata & (id)) + static inline void disable_lnk(int lch); static void omap_disable_channel_irq(int lch); static inline void omap_enable_channel_irq(int lch); @@ -2042,6 +2046,10 @@ void omap_dma_global_context_restore(void) /*----------------------------------------------------------------------------*/ +static void dma_errata_configure(void) +{ +} + static int __init omap_init_dma(void) { unsigned long base; @@ -2064,6 +2072,8 @@ static int __init omap_init_dma(void) return -ENODEV; } + dma_errata_configure(); + omap_dma_base = ioremap(base, SZ_4K); BUG_ON(!omap_dma_base);