From patchwork Tue Nov 19 21:39:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21639 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f200.google.com (mail-ve0-f200.google.com [209.85.128.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 7F25923A4E for ; Tue, 19 Nov 2013 21:39:18 +0000 (UTC) Received: by mail-ve0-f200.google.com with SMTP id jw12sf4650666veb.11 for ; Tue, 19 Nov 2013 13:39:17 -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=I8nGF0gs2dbyykh/hZHHQl+6qzWXHAjaCB56elYwmDU=; b=Vnutiv8B0Ff4B/Umdo/93UlIDi1exxr5WRpFO1UwtYTO5ufwSJhuejDLpZN58rdk6q Wr3m+JjlUTXwT4wvF0Tc/RM1EFvU8NAMPdiATqQRBaSP+1Pxfu+YdjVLF2YfcQb8qEeG L1EQxWLn9eSY4+Q0/Egh2ELBxvc8t/XNA7a1E1aGipYcyKTypBB/347G4vAvps7VaHjn b6CYDb8hAvqjnBeWUNNslujqqJiKCqZmo4XPlYSa23Kvk6Fl61tdKJt359qac37Ghy+w SBzJ00EBDTU992pjEUYdXR5SQ4x3j9f8WbR3ZnjgdM2tAZwspF5Te9v3vxPNTB3Jg/sa bQow== X-Gm-Message-State: ALoCoQnIwn0BrL1TZt+22BFPh1mvztyZ/hMOlt8I+gPhVJsHRGblT5v1kk8LqYfRzEyXsSBifoEu X-Received: by 10.236.111.73 with SMTP id v49mr6337697yhg.46.1384897157946; Tue, 19 Nov 2013 13:39:17 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.131.162 with SMTP id on2ls780740qeb.73.gmail; Tue, 19 Nov 2013 13:39:17 -0800 (PST) X-Received: by 10.220.196.66 with SMTP id ef2mr23428593vcb.7.1384897157818; Tue, 19 Nov 2013 13:39:17 -0800 (PST) Received: from mail-vb0-f45.google.com (mail-vb0-f45.google.com [209.85.212.45]) by mx.google.com with ESMTPS id we7si5429064vcb.7.2013.11.19.13.39.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Nov 2013 13:39:17 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.45 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.45; Received: by mail-vb0-f45.google.com with SMTP id x13so3738095vbb.4 for ; Tue, 19 Nov 2013 13:39:17 -0800 (PST) X-Received: by 10.52.157.232 with SMTP id wp8mr19347082vdb.4.1384897157498; Tue, 19 Nov 2013 13:39:17 -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 u4csp308705vcz; Tue, 19 Nov 2013 13:39:17 -0800 (PST) X-Received: by 10.180.80.163 with SMTP id s3mr22661997wix.51.1384897156673; Tue, 19 Nov 2013 13:39:16 -0800 (PST) Received: from mail-wg0-f46.google.com (mail-wg0-f46.google.com [74.125.82.46]) by mx.google.com with ESMTPS id as2si8355249wjc.137.2013.11.19.13.39.16 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Nov 2013 13:39:16 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.46 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.46; Received: by mail-wg0-f46.google.com with SMTP id x12so8151438wgg.13 for ; Tue, 19 Nov 2013 13:39:16 -0800 (PST) X-Received: by 10.180.160.212 with SMTP id xm20mr8850498wib.33.1384897156139; Tue, 19 Nov 2013 13:39:16 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id gg20sm1386364wic.1.2013.11.19.13.39.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 19 Nov 2013 13:39:15 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Lee Jones Cc: devicetree@vger.kernel.org, Linus Walleij Subject: [PATCH] ARM: ux500: decomission custom SMP TWD timer init Date: Tue, 19 Nov 2013 22:39:10 +0100 Message-Id: <1384897150-16830-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.212.45 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: , Rely solely on device tree matching to detect and probe the SMP TWD timer and remove this custom hack. Signed-off-by: Linus Walleij --- arch/arm/mach-ux500/timer.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index 1a9051b6f932..87efda0aa348 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -11,31 +11,11 @@ #include #include -#include - #include "setup.h" -#include "irqs.h" #include "db8500-regs.h" #include "id.h" -#ifdef CONFIG_HAVE_ARM_TWD -static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer, - U8500_TWD_BASE, IRQ_LOCALTIMER); - -static void __init ux500_twd_init(void) -{ - struct twd_local_timer *twd_local_timer; - - /* Use this to switch local timer base if changed in new ASICs */ - twd_local_timer = &u8500_twd_local_timer; - - clocksource_of_init(); -} -#else -#define ux500_twd_init() do { } while(0) -#endif - const static struct of_device_id prcmu_timer_of_match[] __initconst = { { .compatible = "stericsson,db8500-prcmu-timer-4", }, { }, @@ -64,5 +44,5 @@ void __init ux500_timer_init(void) dt_fail: clksrc_dbx500_prcmu_init(prcmu_timer_base); - ux500_twd_init(); + clocksource_of_init(); }