From patchwork Sun Feb 10 13:20:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2122241 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id DA340DF23E for ; Sun, 10 Feb 2013 13:24:57 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U4Wqj-00042Z-6N; Sun, 10 Feb 2013 13:21:41 +0000 Received: from mail-ee0-f46.google.com ([74.125.83.46]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U4Wpw-0003tu-JH for linux-arm-kernel@lists.infradead.org; Sun, 10 Feb 2013 13:20:55 +0000 Received: by mail-ee0-f46.google.com with SMTP id e49so2748034eek.19 for ; Sun, 10 Feb 2013 05:20:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=YXihwMul3PRCyFMdWeA9c9uyJVX/CGI8Q7whTaoiYkM=; b=ooZwJ3B5uKf4f2bfRZVbHQRt6WuySYLB55XYYTesHkHoly7I1qSwy9ejdSxgUHV1hN ftvRfSbsepcYzPaUOmSgVLXsILY8gH9qETcqXVGnIihuueu4SvLgbJ4iEMsHQtEjNFT/ N5Zpidy0sp4lKzL0jKKryD9U8BmHWpMRLIUKqIX8j9uqRii5cBm2ZvKn+Fbv5BeUKHFN gHNTLAE+HrzLubX00r8UkobVCJhUd3odkCttYqJvP1YjEkqhYq4XBAzFHHQPWl7FaK9Z ibNnLnuXb2mM91BIo0VLX6m0UrjCoPvICnX4Tq7zMOLlLtkzUHztvNdzTUttSw92z0My juxA== X-Received: by 10.14.176.133 with SMTP id b5mr38828866eem.37.1360502450692; Sun, 10 Feb 2013 05:20:50 -0800 (PST) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPS id 44sm57225596eek.5.2013.02.10.05.20.47 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 10 Feb 2013 05:20:49 -0800 (PST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 06/12] clocksource: samsung-time: Remove use of static register mapping Date: Sun, 10 Feb 2013 14:20:17 +0100 Message-Id: <1360502423-2246-7-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1360502423-2246-1-git-send-email-tomasz.figa@gmail.com> References: <1360502423-2246-1-git-send-email-tomasz.figa@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130210_082052_892189_008445D1 X-CRM114-Status: GOOD ( 14.98 ) X-Spam-Score: 0.3 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.83.46 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomasz.figa[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: arhuaco@freaks-unidos.net, Kukjin Kim , linux@arm.linux.org.uk, kwangwoo.lee@gmail.com, guillaume.gourat@nexvision.tv, bhmin@samsung.com, broonie@opensource.wolfsonmicro.com, mcuelenaere@gmail.com, Tomasz Figa , christer@weinigel.se, danders@amltd.com, kyungmin.park@samsung.com, linux-samsung-soc@vger.kernel.org, buserror@gmail.com, augulis.darius@gmail.com, jacmet@sunsite.dk, Sylwester Nawrocki , ghcstop@gmail.com, linux@simtec.co.uk, jekhor@gmail.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@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;