From patchwork Thu Mar 25 00:19:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cyril Chemparathy X-Patchwork-Id: 88108 Received: from comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o2P0MCX7006267 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 25 Mar 2010 00:22:48 GMT Received: from dlep33.itg.ti.com ([157.170.170.112]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id o2P0MCbF016481 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 24 Mar 2010 19:22:12 -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 o2P0MBgC009280 for ; Wed, 24 Mar 2010 19:22:11 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id AAB228062A for ; Wed, 24 Mar 2010 18:22:11 -0600 (CST) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dlep34.itg.ti.com (dlep34.itg.ti.com [157.170.170.115]) by linux.omap.com (Postfix) with ESMTP id E3AC58062E for ; Wed, 24 Mar 2010 18:19:13 -0600 (CST) Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep34.itg.ti.com (8.13.7/8.13.7) with ESMTP id o2P0JAtf015127; Wed, 24 Mar 2010 19:19:10 -0500 (CDT) Received: from gtloginvm01.gt.design.ti.com (gtloginvm01.gt.design.ti.com [158.218.108.144]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o2P0JAZ12294; Wed, 24 Mar 2010 19:19:10 -0500 (CDT) Received: from gtloginvm01.gt.design.ti.com (localhost.localdomain [127.0.0.1]) by gtloginvm01.gt.design.ti.com (8.13.1/8.13.1) with ESMTP id o2P0J91e016292; Wed, 24 Mar 2010 20:19:09 -0400 Received: (from a0875269@localhost) by gtloginvm01.gt.design.ti.com (8.13.1/8.13.1/Submit) id o2P0J98G016289; Wed, 24 Mar 2010 20:19:09 -0400 From: Cyril Chemparathy To: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 12/14] Davinci: tnetv107x decompresser uart definitions Date: Wed, 24 Mar 2010 20:19:03 -0400 Message-Id: <1269476345-16111-13-git-send-email-cyril@ti.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1269476345-16111-12-git-send-email-cyril@ti.com> References: <1269476345-16111-1-git-send-email-cyril@ti.com> <1269476345-16111-2-git-send-email-cyril@ti.com> <1269476345-16111-3-git-send-email-cyril@ti.com> <1269476345-16111-4-git-send-email-cyril@ti.com> <1269476345-16111-5-git-send-email-cyril@ti.com> <1269476345-16111-6-git-send-email-cyril@ti.com> <1269476345-16111-7-git-send-email-cyril@ti.com> <1269476345-16111-8-git-send-email-cyril@ti.com> <1269476345-16111-9-git-send-email-cyril@ti.com> <1269476345-16111-10-git-send-email-cyril@ti.com> <1269476345-16111-11-git-send-email-cyril@ti.com> <1269476345-16111-12-git-send-email-cyril@ti.com> X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 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 X-Greylist: Sender succeeded STARTTLS authentication, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 25 Mar 2010 00:22:49 +0000 (UTC) diff --git a/arch/arm/mach-davinci/include/mach/serial.h b/arch/arm/mach-davinci/include/mach/serial.h index a584697..7eacbc0 100644 --- a/arch/arm/mach-davinci/include/mach/serial.h +++ b/arch/arm/mach-davinci/include/mach/serial.h @@ -22,6 +22,10 @@ #define DA8XX_UART1_BASE (IO_PHYS + 0x10c000) #define DA8XX_UART2_BASE (IO_PHYS + 0x10d000) +#define TNETV107X_UART0_BASE (0x08108100) +#define TNETV107X_UART1_BASE (0x08088400) +#define TNETV107X_UART2_BASE (0x08108300) + /* DaVinci UART register offsets */ #define UART_DAVINCI_PWREMU 0x0c #define UART_DM646X_SCR 0x10 diff --git a/arch/arm/mach-davinci/include/mach/uncompress.h b/arch/arm/mach-davinci/include/mach/uncompress.h index 33796b4..e36c7fb 100644 --- a/arch/arm/mach-davinci/include/mach/uncompress.h +++ b/arch/arm/mach-davinci/include/mach/uncompress.h @@ -21,11 +21,17 @@ static u32 *uart; static u32 *get_uart_base(void) { - if (__machine_arch_type == MACH_TYPE_DAVINCI_DA830_EVM || - __machine_arch_type == MACH_TYPE_DAVINCI_DA850_EVM) + switch (__machine_arch_type) { + case MACH_TYPE_DAVINCI_DA830_EVM: + case MACH_TYPE_DAVINCI_DA850_EVM: return (u32 *)DA8XX_UART2_BASE; - else + + case MACH_TYPE_TNETV107X: + return (u32 *)TNETV107X_UART1_BASE; + + default: return (u32 *)DAVINCI_UART0_BASE; + } } /* PORT_16C550A, in polled non-fifo mode */