From patchwork Tue Nov 19 21:27:51 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 3204101 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 355469F243 for ; Tue, 19 Nov 2013 21:28:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3929520503 for ; Tue, 19 Nov 2013 21:28:37 +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 3E372204E2 for ; Tue, 19 Nov 2013 21:28:36 +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 1VisqU-0002Yw-LZ; Tue, 19 Nov 2013 21:28:30 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VisqS-0003NZ-9b; Tue, 19 Nov 2013 21:28:28 +0000 Received: from mail-wg0-f44.google.com ([74.125.82.44]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VisqQ-0003Lv-Ch for linux-arm-kernel@lists.infradead.org; Tue, 19 Nov 2013 21:28:27 +0000 Received: by mail-wg0-f44.google.com with SMTP id k14so8267245wgh.23 for ; Tue, 19 Nov 2013 13:27:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=clvQ/DzyUzoOT/Huqq8vz7HEe6vmYuWgLZd7aUY89Hs=; b=Szq5QqHH9Mbqfd3ahKcD5khkT4wsbRxfKg2YzqNxjJObI4DErxI+ytCvEBzgmFba0y Y+oL3NOVsSn8DSTq8Wu5SxkED9r0TJ6644MPn/7wvlEw8kuT8wlJ9bH6wE0hV4O1JQ3C L7VEqwUf2xoSnwJVGv1Yjlg75hNUJFwrJpWtG2qhzxtPLKY9ZU+iQ20BOd88Wb1N8l0n 7QO5clhkY+XUqjwPtEfXtQW9UMUpwF6gwT9TWiDiO1HQcTzsetuC+1YFlonWryArOGVB Bo8F6Ansm4pe9t46wc13xk4Wpno4MeF8FP9aPf1IuVmE0LNbBmQPtftrWAVFFU9NgfDR VTOQ== X-Gm-Message-State: ALoCoQnyMRX5aOijXgKyrLDhqUHPpSVB1eXHg4+j14OchRcqmcr600YkGm7ucMb9FuqbQbs1MmgH X-Received: by 10.180.12.179 with SMTP id z19mr22569003wib.24.1384896479372; Tue, 19 Nov 2013 13:27:59 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id pi6sm38347171wic.3.2013.11.19.13.27.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Nov 2013 13:27:58 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Lee Jones Subject: [PATCH 1/2] ARM: ux500: decomission the non-DT MTU init sequence Date: Tue, 19 Nov 2013 22:27:51 +0100 Message-Id: <1384896471-9384-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131119_162826_536291_CBE36F5E X-CRM114-Status: GOOD ( 15.74 ) X-Spam-Score: -2.6 (--) Cc: devicetree@vger.kernel.org, Thomas Gleixner , Daniel Lezcano , Linus Walleij 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=-4.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 The MTU is now only initialized using the native clocksource device tree matching. Signed-off-by: Linus Walleij Acked-by: Lee Jones --- arch/arm/mach-ux500/timer.c | 28 ++-------------------------- 1 file changed, 2 insertions(+), 26 deletions(-) diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index ca60bbd9361b..1a9051b6f932 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -10,7 +10,6 @@ #include #include #include -#include #include @@ -44,17 +43,14 @@ const static struct of_device_id prcmu_timer_of_match[] __initconst = { void __init ux500_timer_init(void) { - void __iomem *mtu_timer_base; void __iomem *prcmu_timer_base; void __iomem *tmp_base; struct device_node *np; - if (cpu_is_u8500_family() || cpu_is_ux540_family()) { - mtu_timer_base = __io_address(U8500_MTU0_BASE); + if (cpu_is_u8500_family() || cpu_is_ux540_family()) prcmu_timer_base = __io_address(U8500_PRCMU_TIMER_4_BASE); - } else { + else ux500_unknown_soc(); - } np = of_find_matching_node(NULL, prcmu_timer_of_match); if (!np) @@ -67,26 +63,6 @@ void __init ux500_timer_init(void) prcmu_timer_base = tmp_base; dt_fail: - /* Doing it the old fashioned way. */ - - /* - * Here we register the timerblocks active in the system. - * Localtimers (twd) is started when both cpu is up and running. - * MTU register a clocksource, clockevent and sched_clock. - * Since the MTU is located in the VAPE power domain - * it will be cleared in sleep which makes it unsuitable. - * We however need it as a timer tick (clockevent) - * during boot to calibrate delay until twd is started. - * RTC-RTT have problems as timer tick during boot since it is - * depending on delay which is not yet calibrated. RTC-RTT is in the - * always-on powerdomain and is used as clockevent instead of twd when - * sleeping. - * The PRCMU timer 4 register a clocksource and - * sched_clock with higher rating then MTU since is always-on. - * - */ - if (!of_have_populated_dt()) - nmdk_timer_init(mtu_timer_base, IRQ_MTU0); clksrc_dbx500_prcmu_init(prcmu_timer_base); ux500_twd_init(); }