From patchwork Fri Apr 3 05:37:03 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Nikula X-Patchwork-Id: 16030 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n335akYd015472 for ; Fri, 3 Apr 2009 05:36:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751371AbZDCFgn (ORCPT ); Fri, 3 Apr 2009 01:36:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751590AbZDCFgn (ORCPT ); Fri, 3 Apr 2009 01:36:43 -0400 Received: from smtp.nokia.com ([192.100.105.134]:45415 "EHLO mgw-mx09.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751371AbZDCFgn (ORCPT ); Fri, 3 Apr 2009 01:36:43 -0400 Received: from vaebh105.NOE.Nokia.com (vaebh105.europe.nokia.com [10.160.244.31]) by mgw-mx09.nokia.com (Switch-3.2.6/Switch-3.2.6) with ESMTP id n335aLL0002162 for ; Fri, 3 Apr 2009 00:36:39 -0500 Received: from esebh102.NOE.Nokia.com ([172.21.138.183]) by vaebh105.NOE.Nokia.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 3 Apr 2009 08:36:23 +0300 Received: from mgw-int01.ntc.nokia.com ([172.21.143.96]) by esebh102.NOE.Nokia.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.3959); Fri, 3 Apr 2009 08:36:23 +0300 Received: from localhost.localdomain (esdhcp042162.research.nokia.com [172.21.42.162]) by mgw-int01.ntc.nokia.com (Switch-3.2.5/Switch-3.2.5) with ESMTP id n335aLOE011448; Fri, 3 Apr 2009 08:36:21 +0300 From: Jarkko Nikula To: linux-omap@vger.kernel.org Cc: Jarkko Nikula Subject: [linux-omap only][PATCH] ARM: OMAP: Partial revert for EAC IO address changes Date: Fri, 3 Apr 2009 08:37:03 +0300 Message-Id: <1238737024-14647-1-git-send-email-jarkko.nikula@nokia.com> X-Mailer: git-send-email 1.6.2.1 X-OriginalArrivalTime: 03 Apr 2009 05:36:23.0103 (UTC) FILETIME=[1FB95CF0:01C9B41E] X-Nokia-AV: Clean Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This is partial revert for commit 3a02c1ae56a61c5249594553735ff32557e2e7ed and only purpose is to sync these lines with mainline version and to have common cleanup patch for both linux-omap and mainline. Signed-off-by: Jarkko Nikula --- arch/arm/mach-omap2/devices.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 2568b0c..0bda713 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -369,12 +369,12 @@ static inline void omap_init_mcspi(void) {} #ifdef CONFIG_SND_OMAP24XX_EAC -#define OMAP2_EAC_BASE (L4_24XX_BASE + 0x90000) +#define OMAP2_EAC_BASE 0x48090000 static struct resource omap2_eac_resources[] = { { .start = OMAP2_EAC_BASE, - .end = OMAP2_EAC_BASE + 0xfff, + .end = OMAP2_EAC_BASE + 0x109, .flags = IORESOURCE_MEM, }, };