From patchwork Mon Apr 1 22:21:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 2373151 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id DDA153FDDA for ; Mon, 1 Apr 2013 22:25:54 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UMn82-0003uz-K5; Mon, 01 Apr 2013 22:23:03 +0000 Received: from mail-qe0-f45.google.com ([209.85.128.45]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UMn6k-0003QJ-70 for linux-arm-kernel@lists.infradead.org; Mon, 01 Apr 2013 22:21:47 +0000 Received: by mail-qe0-f45.google.com with SMTP id b4so1514373qen.32 for ; Mon, 01 Apr 2013 15:21:41 -0700 (PDT) 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=Yg4ls308DAXf0pmdOF1TJx094o2yu0czQmbCYW/r6R4=; b=TSwjRXJxkePcWmCg8QPQkoJxDtmvTVxd1tNrLv22XDFWo0ldmYQfxEedICFEV4od5M XLwMo710kt5aiohaWqdtS0V9dsq5H2qB4e/6yRvwvo5qsePngxMxjDH8OcBN4Y4pDRzX FNH07QLDPZpojoCtrRwX4yHPyIZZIvXtd80YV1tI0SiUCcIvBlNkAH+k33ZPlzzwnRTD TlCdN0+bNHByBoZK6JcNPp4jTgraqWUGxEb6LGPOeL+rRCxoo+BjdGxuZdegmPYAe6eE BWTK7Kj+13P3fuwpfWdz2nbe01EFLcKRmJOawjpIAXgMn+W2CPMtkEWTUfYRwDCPavjX wgHQ== X-Received: by 10.49.132.72 with SMTP id os8mr15516802qeb.52.1364854900964; Mon, 01 Apr 2013 15:21:40 -0700 (PDT) Received: from rob-laptop.calxeda.com ([173.226.190.126]) by mx.google.com with ESMTPS id eb7sm24361064qab.11.2013.04.01.15.21.39 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 01 Apr 2013 15:21:40 -0700 (PDT) From: Rob Herring To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 05/13] ARM: highbank: use OF init for sp804 timer Date: Mon, 1 Apr 2013 17:21:15 -0500 Message-Id: <1364854883-5961-6-git-send-email-robherring2@gmail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1364854883-5961-1-git-send-email-robherring2@gmail.com> References: <1364854883-5961-1-git-send-email-robherring2@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130401_182142_356462_6D6163C2 X-CRM114-Status: GOOD ( 10.81 ) X-Spam-Score: -2.5 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.128.45 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (robherring2[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (robherring2[at]gmail.com) -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: Mark Rutland , Russell King , Marc Zyngier , Linus Walleij , Rob Herring , arm@kernel.org, John Stultz , Thomas Gleixner X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Rob Herring Remove the highbank specific setup for the sp804 timer now that clocksource_of_init will do it. Signed-off-by: Rob Herring --- arch/arm/mach-highbank/highbank.c | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index 758150e..e7df2dd 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -32,8 +32,6 @@ #include #include #include -#include -#include #include #include #include @@ -90,33 +88,16 @@ static void __init highbank_init_irq(void) #endif } -static struct clk_lookup lookup = { - .dev_id = "sp804", - .con_id = NULL, -}; - static void __init highbank_timer_init(void) { - int irq; struct device_node *np; - void __iomem *timer_base; /* Map system registers */ np = of_find_compatible_node(NULL, NULL, "calxeda,hb-sregs"); sregs_base = of_iomap(np, 0); WARN_ON(!sregs_base); - np = of_find_compatible_node(NULL, NULL, "arm,sp804"); - timer_base = of_iomap(np, 0); - WARN_ON(!timer_base); - irq = irq_of_parse_and_map(np, 0); - of_clk_init(NULL); - lookup.clk = of_clk_get(np, 0); - clkdev_add(&lookup); - - sp804_clocksource_and_sched_clock_init(timer_base + 0x20, "timer1"); - sp804_clockevents_init(timer_base, irq, "timer0"); clocksource_of_init(); }