From mboxrd@z Thu Jan 1 00:00:00 1970 From: tomasz.figa@gmail.com (Tomasz Figa) Date: Sun, 10 Feb 2013 14:20:17 +0100 Subject: [PATCH 06/12] clocksource: samsung-time: Remove use of static register mapping In-Reply-To: <1360502423-2246-1-git-send-email-tomasz.figa@gmail.com> References: <1360502423-2246-1-git-send-email-tomasz.figa@gmail.com> Message-ID: <1360502423-2246-7-git-send-email-tomasz.figa@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org This patch brings the samsung-time driver one step closer to multiplatform by replacing references to statically mapped registers with dynamic mapping using ioremap. The helper struct samsung_timer_variant is extended with reg_base field, which is used to pass platform-specific base address to the driver. Signed-off-by: Tomasz Figa --- arch/arm/mach-exynos/mach-universal_c210.c | 1 + arch/arm/mach-s3c24xx/common.c | 1 + arch/arm/mach-s3c64xx/common.c | 1 + arch/arm/mach-s5p64x0/common.c | 1 + arch/arm/mach-s5pc100/common.c | 1 + arch/arm/mach-s5pv210/common.c | 1 + drivers/clocksource/samsung-time.c | 9 +++++++-- include/linux/samsung-time.h | 1 + 8 files changed, 14 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index 284b66b..50fe390 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c @@ -1091,6 +1091,7 @@ static struct platform_device *universal_devices[] __initdata = { }; static const struct samsung_timer_variant universal_timer_variant = { + .reg_base = EXYNOS4_PA_TIMER, .bits = 32, .prescale = 2, .divisor = 2, diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c index 40b3c8f..9a0584e 100644 --- a/arch/arm/mach-s3c24xx/common.c +++ b/arch/arm/mach-s3c24xx/common.c @@ -221,6 +221,7 @@ static void s3c24xx_default_idle(void) } static const struct samsung_timer_variant s3c24xx_timer_variant = { + .reg_base = S3C24XX_PA_TIMER, .bits = 16, .prescale = 25, .divisor = 50, diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c index 89129e9..eb36740e 100644 --- a/arch/arm/mach-s3c64xx/common.c +++ b/arch/arm/mach-s3c64xx/common.c @@ -150,6 +150,7 @@ static struct device s3c64xx_dev = { }; static const struct samsung_timer_variant s3c64xx_timer_variant = { + .reg_base = S3C_PA_TIMER, .bits = 32, .prescale = 2, .divisor = 2, diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c index a959d98..0158c22 100644 --- a/arch/arm/mach-s5p64x0/common.c +++ b/arch/arm/mach-s5p64x0/common.c @@ -158,6 +158,7 @@ static void s5p64x0_idle(void) } static const struct samsung_timer_variant s5p64x0_timer_variant = { + .reg_base = S5P_PA_TIMER, .bits = 32, .prescale = 2, .divisor = 2, diff --git a/arch/arm/mach-s5pc100/common.c b/arch/arm/mach-s5pc100/common.c index e63ff33..5ca2f53 100644 --- a/arch/arm/mach-s5pc100/common.c +++ b/arch/arm/mach-s5pc100/common.c @@ -133,6 +133,7 @@ static struct map_desc s5pc100_iodesc[] __initdata = { }; static const struct samsung_timer_variant s5pc100_timer_variant = { + .reg_base = S5P_PA_TIMER, .bits = 32, .prescale = 2, .divisor = 2, diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c index 2ab06ce..c80aa9c 100644 --- a/arch/arm/mach-s5pv210/common.c +++ b/arch/arm/mach-s5pv210/common.c @@ -150,6 +150,7 @@ void s5pv210_restart(char mode, const char *cmd) } static const struct samsung_timer_variant s5pv210_timer_variant = { + .reg_base = S5P_PA_TIMER, .bits = 32, .prescale = 2, .divisor = 2, diff --git a/drivers/clocksource/samsung-time.c b/drivers/clocksource/samsung-time.c index 985086e..d847036 100644 --- a/drivers/clocksource/samsung-time.c +++ b/drivers/clocksource/samsung-time.c @@ -23,10 +23,11 @@ #include #include -#include #include -#define S3C_TIMERREG(x) (S3C_VA_TIMER + (x)) +static void __iomem *timer_base; + +#define S3C_TIMERREG(x) (timer_base + (x)) #define S3C_TIMERREG2(tmr,reg) S3C_TIMERREG((reg)+0x0c+((tmr)*0x0c)) #define S3C2410_TCFG0 S3C_TIMERREG(0x00) @@ -473,6 +474,10 @@ static void __init samsung_timer_resources(void) unsigned long source_id = timer_source.source_id; char devname[15]; + timer_base = ioremap_nocache(timer_variant.reg_base, SZ_4K); + if (!timer_base) + panic("failed to map timer registers"); + timerclk = clk_get(NULL, "timers"); if (IS_ERR(timerclk)) panic("failed to get timers clock for timer"); diff --git a/include/linux/samsung-time.h b/include/linux/samsung-time.h index 68432af..526ff99 100644 --- a/include/linux/samsung-time.h +++ b/include/linux/samsung-time.h @@ -28,6 +28,7 @@ struct samsung_timer_source { }; struct samsung_timer_variant { + unsigned long reg_base; int bits; u16 prescale; u16 divisor; -- 1.8.1.2