From patchwork Wed Jul 8 15:38:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 34642 Received: from bear.ext.ti.com (bear.ext.ti.com [192.94.94.41]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n68FgLgn010249 for ; Wed, 8 Jul 2009 15:42:21 GMT Received: from dlep33.itg.ti.com ([157.170.170.112]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id n68FdsVZ031716; Wed, 8 Jul 2009 10:39:59 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id n68FdrGa007953; Wed, 8 Jul 2009 10:39:53 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 087298071D; Wed, 8 Jul 2009 10:39:32 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp53.itg.ti.com (dflp53.itg.ti.com [128.247.5.6]) by linux.omap.com (Postfix) with ESMTP id 2FB0D80680 for ; Wed, 8 Jul 2009 10:39:12 -0500 (CDT) Received: from neches.ext.ti.com (localhost [127.0.0.1]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id n68FdBZS024569 for ; Wed, 8 Jul 2009 10:39:11 -0500 (CDT) Received: from mail104-sin-R.bigfish.com (mail-sin.bigfish.com [207.46.51.102]) by neches.ext.ti.com (8.13.7/8.13.7) with ESMTP id n68Fd5lK025164 for ; Wed, 8 Jul 2009 10:39:11 -0500 Received: from mail104-sin (localhost.localdomain [127.0.0.1]) by mail104-sin-R.bigfish.com (Postfix) with ESMTP id 219E673815C for ; Wed, 8 Jul 2009 15:39:08 +0000 (UTC) X-SpamScore: 3 X-BigFish: vps3(zz19c2kzz1202hzzz2dh61h) X-Spam-TCS-SCL: 0:0 X-MS-Exchange-Organization-Antispam-Report: OrigIP: 209.85.200.175; Service: EHS Received: by mail104-sin (MessageSwitch) id 124706754654186_26120; Wed, 8 Jul 2009 15:39:06 +0000 (UCT) Received: from wf-out-1314.google.com (wf-out-1314.google.com [209.85.200.175]) by mail104-sin.bigfish.com (Postfix) with ESMTP id B060A1668057 for ; Wed, 8 Jul 2009 15:39:05 +0000 (UTC) Received: by wf-out-1314.google.com with SMTP id 28so227966wff.31 for ; Wed, 08 Jul 2009 08:39:02 -0700 (PDT) Received: by 10.143.162.8 with SMTP id p8mr2313713wfo.296.1247067542143; Wed, 08 Jul 2009 08:39:02 -0700 (PDT) Received: from localhost ([216.254.16.51]) by mx.google.com with ESMTPS id 30sm4612769wfc.11.2009.07.08.08.39.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Wed, 08 Jul 2009 08:39:01 -0700 (PDT) From: Kevin Hilman To: davinci-linux-open-source@linux.davincidsp.com Date: Wed, 8 Jul 2009 08:38:55 -0700 Message-Id: <1247067535-7997-3-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1247067535-7997-2-git-send-email-khilman@deeprootsystems.com> References: <1247067535-7997-1-git-send-email-khilman@deeprootsystems.com> <1247067535-7997-2-git-send-email-khilman@deeprootsystems.com> Subject: [PATCH/RFT 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@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@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..642f000 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_ARCH_DAVINCI_DA8XX) 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;