From patchwork Fri Jul 17 22:17:30 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 36127 Received: from arroyo.ext.ti.com (arroyo.ext.ti.com [192.94.94.40]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6HMMUpR007075 for ; Fri, 17 Jul 2009 22:22:31 GMT Received: from dlep35.itg.ti.com ([157.170.170.118]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id n6HMKP3e025624; Fri, 17 Jul 2009 17:20:30 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id n6HMKNrY017080; Fri, 17 Jul 2009 17:20:24 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id 786E38065A; Fri, 17 Jul 2009 17:20:12 -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 2F78980636 for ; Fri, 17 Jul 2009 17:18:09 -0500 (CDT) Received: from medina.ext.ti.com (localhost [127.0.0.1]) by dflp53.itg.ti.com (8.13.8/8.13.8) with ESMTP id n6HMI8pW005131 for ; Fri, 17 Jul 2009 17:18:09 -0500 (CDT) Received: from mail157-wa4-R.bigfish.com (mail-wa4.bigfish.com [216.32.181.114]) by medina.ext.ti.com (8.13.7/8.13.7) with ESMTP id n6HMI3VL024780 for ; Fri, 17 Jul 2009 17:18:08 -0500 Received: from mail157-wa4 (localhost.localdomain [127.0.0.1]) by mail157-wa4-R.bigfish.com (Postfix) with ESMTP id 90E5717C819A for ; Fri, 17 Jul 2009 22:18:03 +0000 (UTC) X-SpamScore: 0 X-BigFish: vps0(zzzz1202hzzz2dh62h) X-Spam-TCS-SCL: 1:0 X-FB-SS: 5, X-MS-Exchange-Organization-Antispam-Report: OrigIP: 209.85.221.174; Service: EHS Received: by mail157-wa4 (MessageSwitch) id 1247869081783051_32328; Fri, 17 Jul 2009 22:18:01 +0000 (UCT) Received: from mail-qy0-f174.google.com (mail-qy0-f174.google.com [209.85.221.174]) by mail157-wa4.bigfish.com (Postfix) with ESMTP id 898387A0054 for ; Fri, 17 Jul 2009 22:18:01 +0000 (UTC) Received: by mail-qy0-f174.google.com with SMTP id 4so947622qyk.4 for ; Fri, 17 Jul 2009 15:18:01 -0700 (PDT) Received: by 10.224.46.4 with SMTP id h4mr1141237qaf.86.1247869081373; Fri, 17 Jul 2009 15:18:01 -0700 (PDT) Received: from localhost (deeprooted.net [216.254.16.51]) by mx.google.com with ESMTPS id 6sm2324256qwk.54.2009.07.17.15.18.00 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 17 Jul 2009 15:18:01 -0700 (PDT) From: Kevin Hilman To: linux-arm-kernel@lists.arm.linux.org.uk Date: Fri, 17 Jul 2009 15:17:30 -0700 Message-Id: <1247869060-10719-8-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1247869060-10719-7-git-send-email-khilman@deeprootsystems.com> References: <1247869060-10719-1-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-2-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-3-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-4-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-5-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-6-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-7-git-send-email-khilman@deeprootsystems.com> Cc: davinci-linux-open-source@linux.davincidsp.com Subject: [PATCH 07/17] davinci: Move the da830/omap-l137 #defines to header file 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 From: Rajashekhara, Sudhakar With the introduction of TI da850/omap-l138, some of the macros defined for da830/omap-l137 will be needed in da850 source file. So, move the common macros to da8xx.h header file. Also, modify the macro names from DA830_... to DA8XX_. Signed-off-by: Sudhakar Rajashekhara Signed-off-by: Kevin Hilman --- arch/arm/mach-davinci/da830.c | 22 +++++++--------------- arch/arm/mach-davinci/include/mach/da8xx.h | 8 ++++++++ 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c index ab42428..999f69c 100644 --- a/arch/arm/mach-davinci/da830.c +++ b/arch/arm/mach-davinci/da830.c @@ -27,14 +27,6 @@ #include "clock.h" #include "mux.h" -#define DA830_PSC0_BASE 0x01c10000 -#define DA830_PLL0_BASE 0x01c11000 -#define DA830_JTAG_ID_REG 0x01c14018 -#define DA830_TIMER64P0_BASE 0x01c20000 -#define DA830_TIMER64P1_BASE 0x01c21000 -#define DA830_GPIO_BASE 0x01e26000 -#define DA830_PSC1_BASE 0x01e27000 - /* Offsets of the 8 compare registers on the da830 */ #define DA830_CMP12_0 0x60 #define DA830_CMP12_1 0x64 @@ -49,7 +41,7 @@ static struct pll_data pll0_data = { .num = 1, - .phys_base = DA830_PLL0_BASE, + .phys_base = DA8XX_PLL0_BASE, .flags = PLL_HAS_PREDIV | PLL_HAS_POSTDIV, }; @@ -1174,8 +1166,8 @@ static struct map_desc da830_io_desc[] = { }; static void __iomem *da830_psc_bases[] = { - IO_ADDRESS(DA830_PSC0_BASE), - IO_ADDRESS(DA830_PSC1_BASE), + IO_ADDRESS(DA8XX_PSC0_BASE), + IO_ADDRESS(DA8XX_PSC1_BASE), }; /* Contents of JTAG ID register used to identify exact cpu type */ @@ -1191,14 +1183,14 @@ static struct davinci_id da830_ids[] = { static struct davinci_timer_instance da830_timer_instance[2] = { { - .base = IO_ADDRESS(DA830_TIMER64P0_BASE), + .base = IO_ADDRESS(DA8XX_TIMER64P0_BASE), .bottom_irq = IRQ_DA8XX_TINT12_0, .top_irq = IRQ_DA8XX_TINT34_0, .cmp_off = DA830_CMP12_0, .cmp_irq = IRQ_DA830_T12CMPINT0_0, }, { - .base = IO_ADDRESS(DA830_TIMER64P1_BASE), + .base = IO_ADDRESS(DA8XX_TIMER64P1_BASE), .bottom_irq = IRQ_DA8XX_TINT12_1, .top_irq = IRQ_DA8XX_TINT34_1, .cmp_off = DA830_CMP12_0, @@ -1220,7 +1212,7 @@ static struct davinci_timer_info da830_timer_info = { static struct davinci_soc_info davinci_soc_info_da830 = { .io_desc = da830_io_desc, .io_desc_num = ARRAY_SIZE(da830_io_desc), - .jtag_id_base = IO_ADDRESS(DA830_JTAG_ID_REG), + .jtag_id_base = IO_ADDRESS(DA8XX_JTAG_ID_REG), .ids = da830_ids, .ids_num = ARRAY_SIZE(da830_ids), .cpu_clks = da830_clks, @@ -1234,7 +1226,7 @@ static struct davinci_soc_info davinci_soc_info_da830 = { .intc_irq_prios = da830_default_priorities, .intc_irq_num = DA830_N_CP_INTC_IRQ, .timer_info = &da830_timer_info, - .gpio_base = IO_ADDRESS(DA830_GPIO_BASE), + .gpio_base = IO_ADDRESS(DA8XX_GPIO_BASE), .gpio_num = 128, .gpio_irq = IRQ_DA8XX_GPIO0, .serial_dev = &da8xx_serial_device, diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index 084db27..65b4243 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h @@ -29,6 +29,14 @@ #define DA8XX_BOOT_CFG_BASE (IO_PHYS + 0x14000) +#define DA8XX_PSC0_BASE 0x01c10000 +#define DA8XX_PLL0_BASE 0x01c11000 +#define DA8XX_JTAG_ID_REG 0x01c14018 +#define DA8XX_TIMER64P0_BASE 0x01c20000 +#define DA8XX_TIMER64P1_BASE 0x01c21000 +#define DA8XX_GPIO_BASE 0x01e26000 +#define DA8XX_PSC1_BASE 0x01e27000 + void __init da830_init(void); int da8xx_register_edma(void);