From patchwork Fri Sep 20 21:37:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sebastian Hesselbarth X-Patchwork-Id: 2921701 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 184F09F1E2 for ; Fri, 20 Sep 2013 21:37:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 46CA920462 for ; Fri, 20 Sep 2013 21:37:56 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 534BA20461 for ; Fri, 20 Sep 2013 21:37:55 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VN8OV-0002ix-PY; Fri, 20 Sep 2013 21:37:43 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VN8OT-0006Lb-DG; Fri, 20 Sep 2013 21:37:41 +0000 Received: from mail-bk0-f48.google.com ([209.85.214.48]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VN8OQ-0006Kp-0g for linux-arm-kernel@lists.infradead.org; Fri, 20 Sep 2013 21:37:39 +0000 Received: by mail-bk0-f48.google.com with SMTP id my13so401890bkb.35 for ; Fri, 20 Sep 2013 14:37:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=16Gl8RVcMV4xhjjvyQwF3n0/Fantp6nb4ZQYdFs/QyE=; b=zCppQqhmlz4k+P/AOC0TYWU9kX+h5x5OleEJasHDx7ccbD+EJMzMnb+VvDRDdHJdm0 zEfRktdfSu+3o8E9cDWWoJx3ASyjfWcyi2XHK0pCfhYGMM51DwQUOJhkFmLO5XT/2Vj6 39lHQFFHyUiscLDwNzbSGRw4c8oAxcLC67GG9ulVBDfopWrXvuvOt7sDQAfsQMHA1iJL fFO+9oETomcw+eqhsg4G06cFWUG53pRvOPQmZp/yx3VBUdZkCs4n1rT42y+PtIp49fL2 zUMGtL6wJCQKw6Ol6ku47t47wCooLXk+vn93zhwAT8+DH+qO0dOmjMSfWjKDXgQYz1VB HlPw== X-Received: by 10.204.168.197 with SMTP id v5mr6943890bky.24.1379713030477; Fri, 20 Sep 2013 14:37:10 -0700 (PDT) Received: from topkick.lan (dslc-082-083-247-252.pools.arcor-ip.net. [82.83.247.252]) by mx.google.com with ESMTPSA id a4sm5252948bko.11.1969.12.31.16.00.00 (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 20 Sep 2013 14:37:09 -0700 (PDT) From: Sebastian Hesselbarth To: Sebastian Hesselbarth Subject: [PATCH v2 01/26] ARM: nomadik: remove mtu initalization from .init_time Date: Fri, 20 Sep 2013 23:37:00 +0200 Message-Id: <1379713020-7287-1-git-send-email-sebastian.hesselbarth@gmail.com> In-Reply-To: <1379526839-14798-2-git-send-email-sebastian.hesselbarth@gmail.com> References: <1379526839-14798-2-git-send-email-sebastian.hesselbarth@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130920_173738_207379_BF0A8A68 X-CRM114-Status: GOOD ( 13.11 ) X-Spam-Score: 0.8 (/) Cc: Russell King , Arnd Bergmann , Linus Walleij , Daniel Lezcano , linux-kernel@vger.kernel.org, STEricsson , Olof Johansson , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Alessandro Rubini 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 X-Spam-Status: No, score=-1.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, KHOP_BIG_TO_CC, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Nomadik clock initialization is properly done in clk-nomadik since patch "clk: nomadik: set all timers to use 2.4 MHz TIMCLK". Therefore, this patch removes now redundant mtu initialization from .init_time callback. Signed-off-by: Sebastian Hesselbarth --- Changelog: v1->v2: - adapt to clk-nomadik changes and just remove mtu init (Suggested by Linus Walleij - reword commit message and description accordingly Cc: Olof Johansson Cc: Arnd Bergmann Cc: Alessandro Rubini Cc: Linus Walleij Cc: STEricsson Cc: Russell King Cc: Daniel Lezcano Cc: Thomas Gleixner Cc: linux-arm-kernel@lists.infradead.org Cc: linux-kernel@vger.kernel.org --- arch/arm/mach-nomadik/cpu-8815.c | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/arch/arm/mach-nomadik/cpu-8815.c b/arch/arm/mach-nomadik/cpu-8815.c index 13e0df9..0fcb149 100644 --- a/arch/arm/mach-nomadik/cpu-8815.c +++ b/arch/arm/mach-nomadik/cpu-8815.c @@ -113,36 +113,10 @@ static void cpu8815_restart(enum reboot_mode mode, const char *cmd) writel(1, srcbase + 0x18); } -/* Initial value for SRC control register: all timers use MXTAL/8 source */ -#define SRC_CR_INIT_MASK 0x00007fff -#define SRC_CR_INIT_VAL 0x2aaa8000 - static void __init cpu8815_timer_init_of(void) { - struct device_node *mtu; - void __iomem *base; - int irq; - u32 src_cr; - /* We need this to be up now */ nomadik_clk_init(); - - mtu = of_find_node_by_path("/mtu@101e2000"); - if (!mtu) - return; - base = of_iomap(mtu, 0); - if (WARN_ON(!base)) - return; - irq = irq_of_parse_and_map(mtu, 0); - - pr_info("Remapped MTU @ %p, irq: %d\n", base, irq); - - /* Configure timer sources in "system reset controller" ctrl reg */ - src_cr = readl(base); - src_cr &= SRC_CR_INIT_MASK; - src_cr |= SRC_CR_INIT_VAL; - writel(src_cr, base); - clocksource_of_init(); }