Skip to content

L
linux
Commit 8c27e6f3 authored by David Brown's avatar David Brown
Browse files
Options

msm: Generalize timer register mappings 

Allow the timer register to be determined dynamically instead of at
compile time.  Use common virtual addresses for the registers across
all MSM chips, and select the register mappings based on the detected
CPU.
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent 87fa28e9
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 70 deletions
arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
View file @ 8c27e6f3
/* arch/arm/mach-msm/include/mach/msm_iomap.h /* arch/arm/mach-msm/include/mach/msm_iomap.h
* *
* Copyright (C) 2007 Google, Inc. * Copyright (C) 2007 Google, Inc.
* Copyright (c) 2011, Code Aurora Forum. All rights reserved.
* Author: Brian Swetland <swetland@google.com> * Author: Brian Swetland <swetland@google.com>
* *
* This software is licensed under the terms of the GNU General Public * This software is licensed under the terms of the GNU General Public
...@@ -47,13 +48,8 @@ ...@@ -47,13 +48,8 @@
#define MSM_VIC_PHYS 0xC0000000 #define MSM_VIC_PHYS 0xC0000000
#define MSM_VIC_SIZE SZ_4K #define MSM_VIC_SIZE SZ_4K
#define MSM_CSR_BASE IOMEM(0xE0001000) #define MSM7X00_CSR_PHYS 0xC0100000
#define MSM_CSR_PHYS 0xC0100000 #define MSM7X00_CSR_SIZE SZ_4K
#define MSM_CSR_SIZE SZ_4K
#define MSM_GPT_PHYS MSM_CSR_PHYS
#define MSM_GPT_BASE MSM_CSR_BASE
#define MSM_GPT_SIZE SZ_4K
#define MSM_DMOV_BASE IOMEM(0xE0002000) #define MSM_DMOV_BASE IOMEM(0xE0002000)
#define MSM_DMOV_PHYS 0xA9700000 #define MSM_DMOV_PHYS 0xA9700000
......
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
View file @ 8c27e6f3
/* /*
* Copyright (C) 2007 Google, Inc. * Copyright (C) 2007 Google, Inc.
* Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved. * Copyright (c) 2008-2011 Code Aurora Forum. All rights reserved.
* Author: Brian Swetland <swetland@google.com> * Author: Brian Swetland <swetland@google.com>
* *
* This software is licensed under the terms of the GNU General Public * This software is licensed under the terms of the GNU General Public
...@@ -39,16 +39,8 @@ ...@@ -39,16 +39,8 @@
#define MSM_VIC_PHYS 0xC0080000 #define MSM_VIC_PHYS 0xC0080000
#define MSM_VIC_SIZE SZ_4K #define MSM_VIC_SIZE SZ_4K
#define MSM_CSR_BASE IOMEM(0xE0001000) #define MSM7X30_CSR_PHYS 0xC0100000
#define MSM_CSR_PHYS 0xC0100000 #define MSM7X30_CSR_SIZE SZ_4K
#define MSM_CSR_SIZE SZ_4K
#define MSM_TMR_PHYS MSM_CSR_PHYS
#define MSM_TMR_BASE MSM_CSR_BASE
#define MSM_TMR_SIZE SZ_4K
#define MSM_GPT_BASE (MSM_TMR_BASE + 0x4)
#define MSM_DGT_BASE (MSM_TMR_BASE + 0x24)
#define MSM_DMOV_BASE IOMEM(0xE0002000) #define MSM_DMOV_BASE IOMEM(0xE0002000)
#define MSM_DMOV_PHYS 0xAC400000 #define MSM_DMOV_PHYS 0xAC400000
......
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
View file @ 8c27e6f3
/* /*
* Copyright (C) 2007 Google, Inc. * Copyright (C) 2007 Google, Inc.
* Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved. * Copyright (c) 2008-2011 Code Aurora Forum. All rights reserved.
* Author: Brian Swetland <swetland@google.com> * Author: Brian Swetland <swetland@google.com>
* *
* This software is licensed under the terms of the GNU General Public * This software is licensed under the terms of the GNU General Public
...@@ -39,16 +39,8 @@ ...@@ -39,16 +39,8 @@
#define MSM_VIC_PHYS 0xAC000000 #define MSM_VIC_PHYS 0xAC000000
#define MSM_VIC_SIZE SZ_4K #define MSM_VIC_SIZE SZ_4K
#define MSM_CSR_BASE IOMEM(0xE0001000) #define QSD8X50_CSR_PHYS 0xAC100000
#define MSM_CSR_PHYS 0xAC100000 #define QSD8X50_CSR_SIZE SZ_4K
#define MSM_CSR_SIZE SZ_4K
#define MSM_TMR_PHYS MSM_CSR_PHYS
#define MSM_TMR_BASE MSM_CSR_BASE
#define MSM_TMR_SIZE SZ_4K
#define MSM_GPT_BASE MSM_TMR_BASE
#define MSM_DGT_BASE (MSM_TMR_BASE + 0x10)
#define MSM_DMOV_BASE IOMEM(0xE0002000) #define MSM_DMOV_BASE IOMEM(0xE0002000)
#define MSM_DMOV_PHYS 0xA9700000 #define MSM_DMOV_PHYS 0xA9700000
......
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
View file @ 8c27e6f3
/* /*
* Copyright (C) 2007 Google, Inc. * Copyright (C) 2007 Google, Inc.
* Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved. * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
* Author: Brian Swetland <swetland@google.com> * Author: Brian Swetland <swetland@google.com>
* *
* This software is licensed under the terms of the GNU General Public * This software is licensed under the terms of the GNU General Public
...@@ -58,16 +58,11 @@ ...@@ -58,16 +58,11 @@
#define MSM_SHARED_RAM_BASE IOMEM(0xF0100000) #define MSM_SHARED_RAM_BASE IOMEM(0xF0100000)
#define MSM_SHARED_RAM_SIZE SZ_1M #define MSM_SHARED_RAM_SIZE SZ_1M
#define MSM_TMR_BASE IOMEM(0xF0200000) #define MSM8X60_TMR_PHYS 0x02000000
#define MSM_TMR_PHYS 0x02000000 #define MSM8X60_TMR_SIZE SZ_4K
#define MSM_TMR_SIZE SZ_4K
#define MSM_TMR0_BASE IOMEM(0xF0201000) #define MSM8X60_TMR0_PHYS 0x02040000
#define MSM_TMR0_PHYS 0x02040000 #define MSM8X60_TMR0_SIZE SZ_4K
#define MSM_TMR0_SIZE SZ_4K
#define MSM_GPT_BASE (MSM_TMR_BASE + 0x4)
#define MSM_DGT_BASE (MSM_TMR_BASE + 0x24)
#define MSM_IOMMU_JPEGD_PHYS 0x07300000 #define MSM_IOMMU_JPEGD_PHYS 0x07300000
#define MSM_IOMMU_JPEGD_SIZE SZ_1M #define MSM_IOMMU_JPEGD_SIZE SZ_1M
......
arch/arm/mach-msm/include/mach/msm_iomap.h
View file @ 8c27e6f3
/* /*
* Copyright (C) 2007 Google, Inc. * Copyright (C) 2007 Google, Inc.
* Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved. * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
* Author: Brian Swetland <swetland@google.com> * Author: Brian Swetland <swetland@google.com>
* *
* This software is licensed under the terms of the GNU General Public * This software is licensed under the terms of the GNU General Public
...@@ -53,6 +53,9 @@ ...@@ -53,6 +53,9 @@
#include "msm_iomap-7x00.h" #include "msm_iomap-7x00.h"
#endif #endif
/* Virtual addressses shared across all MSM targets. */
#define MSM_CSR_BASE IOMEM(0xE0001000)
#define MSM_TMR_BASE IOMEM(0xF0200000)
#define MSM_TMR0_BASE IOMEM(0xF0201000)
#endif #endif
arch/arm/mach-msm/io.c
View file @ 8c27e6f3
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* MSM7K, QSD io support * MSM7K, QSD io support
* *
* Copyright (C) 2007 Google, Inc. * Copyright (C) 2007 Google, Inc.
* Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved. * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
* Author: Brian Swetland <swetland@google.com> * Author: Brian Swetland <swetland@google.com>
* *
* This software is licensed under the terms of the GNU General Public * This software is licensed under the terms of the GNU General Public
...@@ -28,18 +28,20 @@ ...@@ -28,18 +28,20 @@
#include <mach/board.h> #include <mach/board.h>
#define MSM_DEVICE(name) { \ #define MSM_CHIP_DEVICE(name, chip) { \
.virtual = (unsigned long) MSM_##name##_BASE, \ .virtual = (unsigned long) MSM_##name##_BASE, \
.pfn = __phys_to_pfn(MSM_##name##_PHYS), \ .pfn = __phys_to_pfn(chip##_##name##_PHYS), \
.length = MSM_##name##_SIZE, \ .length = chip##_##name##_SIZE, \
.type = MT_DEVICE_NONSHARED, \ .type = MT_DEVICE_NONSHARED, \
} }
#define MSM_DEVICE(name) MSM_CHIP_DEVICE(name, MSM)
#if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_MSM7X27) \ #if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_MSM7X27) \
|| defined(CONFIG_ARCH_MSM7X25) || defined(CONFIG_ARCH_MSM7X25)
static struct map_desc msm_io_desc[] __initdata = { static struct map_desc msm_io_desc[] __initdata = {
MSM_DEVICE(VIC), MSM_DEVICE(VIC),
MSM_DEVICE(CSR), MSM_CHIP_DEVICE(CSR, MSM7X00),
MSM_DEVICE(GPT), MSM_DEVICE(GPT),
MSM_DEVICE(DMOV), MSM_DEVICE(DMOV),
MSM_DEVICE(GPIO1), MSM_DEVICE(GPIO1),
...@@ -73,8 +75,7 @@ void __init msm_map_common_io(void) ...@@ -73,8 +75,7 @@ void __init msm_map_common_io(void)
#ifdef CONFIG_ARCH_QSD8X50 #ifdef CONFIG_ARCH_QSD8X50
static struct map_desc qsd8x50_io_desc[] __initdata = { static struct map_desc qsd8x50_io_desc[] __initdata = {
MSM_DEVICE(VIC), MSM_DEVICE(VIC),
MSM_DEVICE(CSR), MSM_CHIP_DEVICE(CSR, QSD8X50),
MSM_DEVICE(TMR),
MSM_DEVICE(DMOV), MSM_DEVICE(DMOV),
MSM_DEVICE(GPIO1), MSM_DEVICE(GPIO1),
MSM_DEVICE(GPIO2), MSM_DEVICE(GPIO2),
...@@ -104,8 +105,8 @@ void __init msm_map_qsd8x50_io(void) ...@@ -104,8 +105,8 @@ void __init msm_map_qsd8x50_io(void)
static struct map_desc msm8x60_io_desc[] __initdata = { static struct map_desc msm8x60_io_desc[] __initdata = {
MSM_DEVICE(QGIC_DIST), MSM_DEVICE(QGIC_DIST),
MSM_DEVICE(QGIC_CPU), MSM_DEVICE(QGIC_CPU),
MSM_DEVICE(TMR), MSM_CHIP_DEVICE(TMR, MSM8X60),
MSM_DEVICE(TMR0), MSM_CHIP_DEVICE(TMR0, MSM8X60),
MSM_DEVICE(ACC), MSM_DEVICE(ACC),
MSM_DEVICE(GCC), MSM_DEVICE(GCC),
}; };
...@@ -119,8 +120,7 @@ void __init msm_map_msm8x60_io(void) ...@@ -119,8 +120,7 @@ void __init msm_map_msm8x60_io(void)
#ifdef CONFIG_ARCH_MSM7X30 #ifdef CONFIG_ARCH_MSM7X30
static struct map_desc msm7x30_io_desc[] __initdata = { static struct map_desc msm7x30_io_desc[] __initdata = {
MSM_DEVICE(VIC), MSM_DEVICE(VIC),
MSM_DEVICE(CSR), MSM_CHIP_DEVICE(CSR, MSM7X30),
MSM_DEVICE(TMR),
MSM_DEVICE(DMOV), MSM_DEVICE(DMOV),
MSM_DEVICE(GPIO1), MSM_DEVICE(GPIO1),
MSM_DEVICE(GPIO2), MSM_DEVICE(GPIO2),
......
arch/arm/mach-msm/timer.c
View file @ 8c27e6f3
...@@ -24,10 +24,7 @@ ...@@ -24,10 +24,7 @@
#include <asm/mach/time.h> #include <asm/mach/time.h>
#include <mach/msm_iomap.h> #include <mach/msm_iomap.h>
#include <mach/cpu.h>
#ifndef MSM_DGT_BASE
#define MSM_DGT_BASE (MSM_GPT_BASE + 0x10)
#endif
#define TIMER_MATCH_VAL 0x0000 #define TIMER_MATCH_VAL 0x0000
#define TIMER_COUNT_VAL 0x0004 #define TIMER_COUNT_VAL 0x0004
...@@ -52,14 +49,9 @@ enum timer_location { ...@@ -52,14 +49,9 @@ enum timer_location {
GLOBAL_TIMER = 1, GLOBAL_TIMER = 1,
}; };
#ifdef MSM_TMR0_BASE
#define MSM_TMR_GLOBAL (MSM_TMR0_BASE - MSM_TMR_BASE)
#else
#define MSM_TMR_GLOBAL 0
#endif
#define MSM_GLOBAL_TIMER MSM_CLOCK_DGT #define MSM_GLOBAL_TIMER MSM_CLOCK_DGT
/* TODO: Remove these ifdefs */
#if defined(CONFIG_ARCH_QSD8X50) #if defined(CONFIG_ARCH_QSD8X50)
#define DGT_HZ (19200000 / 4) /* 19.2 MHz / 4 by default */ #define DGT_HZ (19200000 / 4) /* 19.2 MHz / 4 by default */
#define MSM_DGT_SHIFT (0) #define MSM_DGT_SHIFT (0)
...@@ -177,11 +169,7 @@ static struct msm_clock msm_clocks[] = { ...@@ -177,11 +169,7 @@ static struct msm_clock msm_clocks[] = {
.dev_id = &msm_clocks[0].clockevent, .dev_id = &msm_clocks[0].clockevent,
.irq = INT_GP_TIMER_EXP .irq = INT_GP_TIMER_EXP
}, },
.regbase = MSM_GPT_BASE,
.freq = GPT_HZ, .freq = GPT_HZ,
.local_counter = MSM_GPT_BASE + TIMER_COUNT_VAL,
.global_counter = MSM_GPT_BASE + TIMER_COUNT_VAL +
MSM_TMR_GLOBAL,
}, },
[MSM_CLOCK_DGT] = { [MSM_CLOCK_DGT] = {
.clockevent = { .clockevent = {
...@@ -206,12 +194,8 @@ static struct msm_clock msm_clocks[] = { ...@@ -206,12 +194,8 @@ static struct msm_clock msm_clocks[] = {
.dev_id = &msm_clocks[1].clockevent, .dev_id = &msm_clocks[1].clockevent,
.irq = INT_DEBUG_TIMER_EXP .irq = INT_DEBUG_TIMER_EXP
}, },
.regbase = MSM_DGT_BASE,
.freq = DGT_HZ >> MSM_DGT_SHIFT, .freq = DGT_HZ >> MSM_DGT_SHIFT,
.shift = MSM_DGT_SHIFT, .shift = MSM_DGT_SHIFT,
.local_counter = MSM_DGT_BASE + TIMER_COUNT_VAL,
.global_counter = MSM_DGT_BASE + TIMER_COUNT_VAL +
MSM_TMR_GLOBAL,
} }
}; };
...@@ -219,6 +203,25 @@ static void __init msm_timer_init(void) ...@@ -219,6 +203,25 @@ static void __init msm_timer_init(void)
{ {
int i; int i;
int res; int res;
int global_offset = 0;
if (cpu_is_msm7x01()) {
msm_clocks[MSM_CLOCK_GPT].regbase = MSM_CSR_BASE;
msm_clocks[MSM_CLOCK_DGT].regbase = MSM_CSR_BASE + 0x10;
} else if (cpu_is_msm7x30()) {
msm_clocks[MSM_CLOCK_GPT].regbase = MSM_CSR_BASE + 0x04;
msm_clocks[MSM_CLOCK_DGT].regbase = MSM_CSR_BASE + 0x24;
} else if (cpu_is_qsd8x50()) {
msm_clocks[MSM_CLOCK_GPT].regbase = MSM_CSR_BASE;
msm_clocks[MSM_CLOCK_DGT].regbase = MSM_CSR_BASE + 0x10;
} else if (cpu_is_msm8x60()) {
msm_clocks[MSM_CLOCK_GPT].regbase = MSM_TMR_BASE + 0x04;
msm_clocks[MSM_CLOCK_DGT].regbase = MSM_TMR_BASE + 0x24;
/* Use CPU0's timer as the global timer. */
global_offset = MSM_TMR0_BASE - MSM_TMR_BASE;
} else
BUG();
#ifdef CONFIG_ARCH_MSM_SCORPIONMP #ifdef CONFIG_ARCH_MSM_SCORPIONMP
writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL); writel(DGT_CLK_CTL_DIV_4, MSM_TMR_BASE + DGT_CLK_CTL);
...@@ -228,6 +231,10 @@ static void __init msm_timer_init(void) ...@@ -228,6 +231,10 @@ static void __init msm_timer_init(void)
struct msm_clock *clock = &msm_clocks[i]; struct msm_clock *clock = &msm_clocks[i];
struct clock_event_device *ce = &clock->clockevent; struct clock_event_device *ce = &clock->clockevent;
struct clocksource *cs = &clock->clocksource; struct clocksource *cs = &clock->clocksource;
clock->local_counter = clock->regbase + TIMER_COUNT_VAL;
clock->global_counter = clock->local_counter + global_offset;
writel(0, clock->regbase + TIMER_ENABLE); writel(0, clock->regbase + TIMER_ENABLE);
writel(0, clock->regbase + TIMER_CLEAR); writel(0, clock->regbase + TIMER_CLEAR);
writel(~0, clock->regbase + TIMER_MATCH_VAL); writel(~0, clock->regbase + TIMER_MATCH_VAL);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7