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: 21637 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8125023FB4 for ; Tue, 19 Nov 2013 21:28:02 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id lx4sf6452836iec.10 for ; Tue, 19 Nov 2013 13:28:01 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=clvQ/DzyUzoOT/Huqq8vz7HEe6vmYuWgLZd7aUY89Hs=; b=UiiwhqEBJjfoOXRflYAfbXg/rvRLvO9OtJ9n0IeP6MliPMkkV0QIgEj9GjQExfO8Po AlN8gyq2/nYoLitplohiw1ASVYgezJKwFKiYHahK7OilJny06yNh399nN3N3sGVYhMH5 Ke/VCb+wUpkwCwaU2MxEy/F96eBjAux6Tv2GZn29nBP5Ix6LlUXHFCkENeW9YJiNPsDZ SQM7GeY8/Jn8IgCYFDYliBcnD0lJSj80sulURZ1rJJJXfusOKX9gMtovuCUIfkzGm4hy 5wFO+VoCbMdSSvsMfODM/TRG9vpux0Iw/f6NP7R1Vk1rh7K4APxtOTjlwD0xnwUF3+Dc NKWw== X-Gm-Message-State: ALoCoQmC4psmRjQPJq9+N+NKsQ/STyR91uFt8pFRp//65OV5NePW3KIBqr9VDRr9nwNlh+3VMRDa X-Received: by 10.42.100.13 with SMTP id y13mr1122579icn.32.1384896481449; Tue, 19 Nov 2013 13:28:01 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.131.233 with SMTP id op9ls3007620qeb.60.gmail; Tue, 19 Nov 2013 13:28:01 -0800 (PST) X-Received: by 10.58.136.231 with SMTP id qd7mr22763588veb.1.1384896481117; Tue, 19 Nov 2013 13:28:01 -0800 (PST) Received: from mail-vc0-f170.google.com (mail-vc0-f170.google.com [209.85.220.170]) by mx.google.com with ESMTPS id nh5si8429238vec.106.2013.11.19.13.28.01 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Nov 2013 13:28:01 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.170; Received: by mail-vc0-f170.google.com with SMTP id ht10so2581568vcb.1 for ; Tue, 19 Nov 2013 13:28:01 -0800 (PST) X-Received: by 10.58.207.15 with SMTP id ls15mr22975991vec.17.1384896480994; Tue, 19 Nov 2013 13:28:00 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp308087vcz; Tue, 19 Nov 2013 13:28:00 -0800 (PST) X-Received: by 10.194.78.141 with SMTP id b13mr22844019wjx.32.1384896479901; Tue, 19 Nov 2013 13:27:59 -0800 (PST) Received: from mail-we0-f173.google.com (mail-we0-f173.google.com [74.125.82.173]) by mx.google.com with ESMTPS id ez4si8375635wjd.25.2013.11.19.13.27.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Nov 2013 13:27:59 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.173 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.173; Received: by mail-we0-f173.google.com with SMTP id t61so1637412wes.18 for ; Tue, 19 Nov 2013 13:27:59 -0800 (PST) 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 Cc: devicetree@vger.kernel.org, Thomas Gleixner , Daniel Lezcano , Linus Walleij 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.170 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The MTU is now only initialized using the native clocksource device tree matching. Signed-off-by: Linus Walleij --- 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(); }