From patchwork Thu Jul 9 15:00:14 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 34825 Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n69F0gj8023825 for ; Thu, 9 Jul 2009 15:00:42 GMT Received: from dlep36.itg.ti.com ([157.170.170.91]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id n69F0acl017643 for ; Thu, 9 Jul 2009 10:00:41 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id n69F0aWA011666 for ; Thu, 9 Jul 2009 10:00:36 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 2B05780649 for ; Thu, 9 Jul 2009 10:00:34 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id 6E48680627 for ; Thu, 9 Jul 2009 10:00:28 -0500 (CDT) Received: from white.ext.ti.com (localhost [127.0.0.1]) by dflp52.itg.ti.com (8.13.7/8.13.7) with ESMTP id n69F0SpV008538 for ; Thu, 9 Jul 2009 10:00:28 -0500 (CDT) Received: from mail189-va3-R.bigfish.com (mail-va3.bigfish.com [216.32.180.114]) by white.ext.ti.com (8.13.7/8.13.7) with ESMTP id n69F0Mo7012161 for ; Thu, 9 Jul 2009 10:00:27 -0500 Received: from mail189-va3 (localhost.localdomain [127.0.0.1]) by mail189-va3-R.bigfish.com (Postfix) with ESMTP id 683771D81E5 for ; Thu, 9 Jul 2009 15:00:22 +0000 (UTC) X-SpamScore: 3 X-BigFish: vps3(zz19c2kzz1202hzzz2dh61h) X-Spam-TCS-SCL: 0:0 X-FB-SS: 5, X-MS-Exchange-Organization-Antispam-Report: OrigIP: 209.85.222.181; Service: EHS Received: by mail189-va3 (MessageSwitch) id 124715162197698_16081; Thu, 9 Jul 2009 15:00:21 +0000 (UCT) Received: from mail-pz0-f181.google.com (mail-pz0-f181.google.com [209.85.222.181]) by mail189-va3.bigfish.com (Postfix) with ESMTP id E361A39005B for ; Thu, 9 Jul 2009 15:00:20 +0000 (UTC) Received: by mail-pz0-f181.google.com with SMTP id 11so137730pzk.4 for ; Thu, 09 Jul 2009 08:00:20 -0700 (PDT) Received: by 10.142.254.6 with SMTP id b6mr329566wfi.199.1247151620721; Thu, 09 Jul 2009 08:00:20 -0700 (PDT) Received: from localhost (deeprooted.net [216.254.16.51]) by mx.google.com with ESMTPS id 32sm2075166wfa.33.2009.07.09.08.00.19 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 09 Jul 2009 08:00:20 -0700 (PDT) From: Kevin Hilman To: davinci-linux-open-source@linux.davincidsp.com Date: Thu, 9 Jul 2009 08:00:14 -0700 Message-Id: <1247151614-31691-3-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1247151614-31691-2-git-send-email-khilman@deeprootsystems.com> References: <1247151614-31691-1-git-send-email-khilman@deeprootsystems.com> <1247151614-31691-2-git-send-email-khilman@deeprootsystems.com> Subject: [PATCH/RFT v2 2/2] davinci: da830: updates for mach-type name change X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.4 Precedence: list List-Id: davinci-linux-open-source.linux.davincidsp.com List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces+patchwork-davinci=patchwork.kernel.org@linux.davincidsp.com Signed-off-by: Kevin Hilman --- arch/arm/mach-davinci/board-da830-evm.c | 2 +- arch/arm/mach-davinci/include/mach/debug-macro.S | 2 +- arch/arm/mach-davinci/include/mach/uncompress.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c index 0409eb6..9185a70 100644 --- a/arch/arm/mach-davinci/board-da830-evm.c +++ b/arch/arm/mach-davinci/board-da830-evm.c @@ -116,7 +116,7 @@ static void __init da830_evm_map_io(void) da830_init(); } -MACHINE_START(DAVINCI_DA8XX_EVM, "DaVinci DA830/OMAP L137 EVM") +MACHINE_START(DAVINCI_DA830_EVM, "DaVinci DA830/OMAP L137 EVM") .phys_io = IO_PHYS, .io_pg_offst = (__IO_ADDRESS(IO_PHYS) >> 18) & 0xfffc, .boot_params = (DA8XX_DDR_BASE + 0x100), diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S index 69837a6..9d16277 100644 --- a/arch/arm/mach-davinci/include/mach/debug-macro.S +++ b/arch/arm/mach-davinci/include/mach/debug-macro.S @@ -26,7 +26,7 @@ movne \rx, #0xfe000000 @ virtual base #if defined(CONFIG_ARCH_DAVINCI_DA8XX) && defined(CONFIG_ARCH_DAVINCI_DMx) #error Cannot enable DaVinci and DA8XX platforms concurrently -#elif defined(CONFIG_MACH_DAVINCI_DA8XX_EVM) +#elif defined(CONFIG_MACH_DAVINCI_DA830_EVM) orr \rx, \rx, #0x00d00000 @ physical base address orr \rx, \rx, #0x0000d000 @ of UART 2 #else diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h index 0f1f12b..46a0c31 100644 --- a/arch/arm/mach-davinci/include/mach/uncompress.h +++ b/arch/arm/mach-davinci/include/mach/uncompress.h @@ -21,7 +21,7 @@ static u32 *uart; static u32 *get_uart_base(void) { - if (__machine_arch_type == MACH_TYPE_DAVINCI_DA8XX_EVM) + if (__machine_arch_type == MACH_TYPE_DAVINCI_DA830_EVM) return (u32 *)DA8XX_UART2_BASE; else return (u32 *)DAVINCI_UART0_BASE;