From patchwork Sun Feb 10 13:20:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2122261 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 5185EDF23E for ; Sun, 10 Feb 2013 13:25:35 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U4Wrx-0004tw-FU; Sun, 10 Feb 2013 13:22:57 +0000 Received: from mail-ea0-f177.google.com ([209.85.215.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U4Wq4-0003uz-K8 for linux-arm-kernel@lists.infradead.org; Sun, 10 Feb 2013 13:21:04 +0000 Received: by mail-ea0-f177.google.com with SMTP id n13so2203176eaa.36 for ; Sun, 10 Feb 2013 05:20:58 -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=DZLiPNYe6f36Ol/mxkkwZujPbftRN8fE+gwvfaCm3Dk=; b=TPxk9ekdj2DJVcEwPM/NbBUZj/b/+H7oBOtQ6KCQtnKIsFsh20FCIVT+WAdvyNWx9I N94wo3aNLYOmF3AyuMYvQwyipHtqEAcMlNg2ygKjEViOi0klmA6YnRzHyoYc8Shys7Fz J+uTltNBVJWyC6gmFbIrFcn2YvCzMfKqcPLS7hJc+tH99r+iEXz1FfojWbZxI1BjetMF 0zDvSMaxKr0P1211idoILKLCX3GqiKwijJNZs7DPFWsF5HnVR9GAT8GchBp/DPEsRx+k M3M+OwdBBOa/IFy7P2jtq4xjOUx92u2NaQECKnyZ9bg2/K9pd8bqzms+kheHdmEVyCfF Mz3Q== X-Received: by 10.14.176.133 with SMTP id b5mr38829992eem.37.1360502458446; Sun, 10 Feb 2013 05:20:58 -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.55 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 10 Feb 2013 05:20:57 -0800 (PST) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 09/12] clocksource: samsung-time: Do not use static IRQ definition Date: Sun, 10 Feb 2013 14:20:20 +0100 Message-Id: <1360502423-2246-10-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_082100_823790_CF2FADAA X-CRM114-Status: GOOD ( 13.27 ) 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 [209.85.215.177 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 As another step towards multiplatform support, this patch modifies the samsung-time clocksource driver and its users to pass timer IRQ numbers through the samsung_timer_variant structure. Signed-off-by: Tomasz Figa --- arch/arm/mach-exynos/mach-universal_c210.c | 4 ++++ arch/arm/mach-s3c24xx/common.c | 3 +++ arch/arm/mach-s3c64xx/common.c | 4 ++++ arch/arm/mach-s5p64x0/common.c | 4 ++++ arch/arm/mach-s5pc100/common.c | 4 ++++ arch/arm/mach-s5pv210/common.c | 4 ++++ drivers/clocksource/samsung-time.c | 2 +- include/linux/samsung-time.h | 1 + 8 files changed, 25 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-exynos/mach-universal_c210.c b/arch/arm/mach-exynos/mach-universal_c210.c index 50fe390..0573db7 100644 --- a/arch/arm/mach-exynos/mach-universal_c210.c +++ b/arch/arm/mach-exynos/mach-universal_c210.c @@ -1092,6 +1092,10 @@ static struct platform_device *universal_devices[] __initdata = { static const struct samsung_timer_variant universal_timer_variant = { .reg_base = EXYNOS4_PA_TIMER, + .irqs = { + IRQ_TIMER0, IRQ_TIMER1, IRQ_TIMER2, + IRQ_TIMER3, IRQ_TIMER4 + }, .bits = 32, .prescale = 2, .divisor = 2, diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c index 9a0584e..3344c33 100644 --- a/arch/arm/mach-s3c24xx/common.c +++ b/arch/arm/mach-s3c24xx/common.c @@ -222,6 +222,9 @@ static void s3c24xx_default_idle(void) static const struct samsung_timer_variant s3c24xx_timer_variant = { .reg_base = S3C24XX_PA_TIMER, + .irqs = { + IRQ_TIMER0, IRQ_TIMER1, IRQ_TIMER2, IRQ_TIMER3, IRQ_TIMER4 + }, .bits = 16, .prescale = 25, .divisor = 50, diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c index eb36740e..345d08a 100644 --- a/arch/arm/mach-s3c64xx/common.c +++ b/arch/arm/mach-s3c64xx/common.c @@ -151,6 +151,10 @@ static struct device s3c64xx_dev = { static const struct samsung_timer_variant s3c64xx_timer_variant = { .reg_base = S3C_PA_TIMER, + .irqs = { + IRQ_TIMER0, IRQ_TIMER1, IRQ_TIMER2, + IRQ_TIMER3, IRQ_TIMER4 + }, .bits = 32, .prescale = 2, .divisor = 2, diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c index 0158c22..911122e 100644 --- a/arch/arm/mach-s5p64x0/common.c +++ b/arch/arm/mach-s5p64x0/common.c @@ -159,6 +159,10 @@ static void s5p64x0_idle(void) static const struct samsung_timer_variant s5p64x0_timer_variant = { .reg_base = S5P_PA_TIMER, + .irqs = { + IRQ_TIMER0, IRQ_TIMER1, IRQ_TIMER2, + IRQ_TIMER3, IRQ_TIMER4 + }, .bits = 32, .prescale = 2, .divisor = 2, diff --git a/arch/arm/mach-s5pc100/common.c b/arch/arm/mach-s5pc100/common.c index 5ca2f53..f45b1988 100644 --- a/arch/arm/mach-s5pc100/common.c +++ b/arch/arm/mach-s5pc100/common.c @@ -134,6 +134,10 @@ static struct map_desc s5pc100_iodesc[] __initdata = { static const struct samsung_timer_variant s5pc100_timer_variant = { .reg_base = S5P_PA_TIMER, + .irqs = { + IRQ_TIMER0, IRQ_TIMER1, IRQ_TIMER2, + IRQ_TIMER3, IRQ_TIMER4 + }, .bits = 32, .prescale = 2, .divisor = 2, diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c index c80aa9c..a3ad2cf 100644 --- a/arch/arm/mach-s5pv210/common.c +++ b/arch/arm/mach-s5pv210/common.c @@ -151,6 +151,10 @@ void s5pv210_restart(char mode, const char *cmd) static const struct samsung_timer_variant s5pv210_timer_variant = { .reg_base = S5P_PA_TIMER, + .irqs = { + IRQ_TIMER0, IRQ_TIMER1, IRQ_TIMER2, + IRQ_TIMER3, IRQ_TIMER4 + }, .bits = 32, .prescale = 2, .divisor = 2, diff --git a/drivers/clocksource/samsung-time.c b/drivers/clocksource/samsung-time.c index 29fc63f..3af3054 100644 --- a/drivers/clocksource/samsung-time.c +++ b/drivers/clocksource/samsung-time.c @@ -388,7 +388,7 @@ static void __init samsung_clockevent_init(void) time_event_device.cpumask = cpumask_of(0); clockevents_config_and_register(&time_event_device, clock_rate, 1, -1); - irq_number = timer_source.event_id + IRQ_TIMER0; + irq_number = timer_variant.irqs[timer_source.event_id]; setup_irq(irq_number, &samsung_clock_event_irq); } diff --git a/include/linux/samsung-time.h b/include/linux/samsung-time.h index 526ff99..8d8ffe8 100644 --- a/include/linux/samsung-time.h +++ b/include/linux/samsung-time.h @@ -29,6 +29,7 @@ struct samsung_timer_source { struct samsung_timer_variant { unsigned long reg_base; + unsigned int irqs[5]; int bits; u16 prescale; u16 divisor;