From patchwork Wed Nov 6 10:05:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 3145941 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 2AD17BEEB2 for ; Wed, 6 Nov 2013 10:09:31 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0DC5F20126 for ; Wed, 6 Nov 2013 10:09:30 +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 BC92C20108 for ; Wed, 6 Nov 2013 10:09:28 +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 1Ve01H-0006Yn-Sa; Wed, 06 Nov 2013 10:07:28 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ve00t-0001sd-Is; Wed, 06 Nov 2013 10:07:03 +0000 Received: from mail-ie0-f179.google.com ([209.85.223.179]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Ve00H-0001mF-Pq for linux-arm-kernel@lists.infradead.org; Wed, 06 Nov 2013 10:06:27 +0000 Received: by mail-ie0-f179.google.com with SMTP id aq17so16960792iec.38 for ; Wed, 06 Nov 2013 02:06:08 -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:in-reply-to :references; bh=xmX6GMmczoPTIYXrvns0Y28Se4ebK5sOjyUCfCj82PQ=; b=KE1rnnkY6MMD7fSowAMHOBk0PTg8Edzf4chOTqjx+JNRn+AfzxKlmvgaidIlqF0iE7 CLEXMqrsGi5ROFQNTruaMBaQQM9nUWuGbJeBijIv3Pg5qsj9m2f0dgAmYvsncJZcMIia R7lhOFjhEJvZIkNoImvbUeszAelyehFCOEcxMPGOwil7niJ3E/xIfhu9bsnsA4J9Gcdt PRzckyaT1N58nDJcv2eldTIvYi7kPjjf56gy8EVqTmEL4gBIvoBqdwIY40uH4GJY+KIb EJGbgaYSDvdFG0xUYF8CNhWvNCOIos5b65C6GaStzi3VcCBa+wp91kp1+KR1THF/kNsG 9EJw== X-Gm-Message-State: ALoCoQm/bBd/myVU6hZ1DYehjZVhHyt+pWCPASH7IhCm2xXaIFY9UUIdwhLdo3y2yqEfXN4DFG/1 X-Received: by 10.50.40.37 with SMTP id u5mr19676411igk.29.1383732368541; Wed, 06 Nov 2013 02:06:08 -0800 (PST) Received: from localhost.localdomain (cpc15-aztw25-2-0-cust493.aztw.cable.virginm.net. [92.233.57.238]) by mx.google.com with ESMTPSA id l7sm13291205igx.2.2013.11.06.02.06.07 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:06:08 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 7/7] ARM: ux500: Remove checking for DT during timer init as we are now DT only Date: Wed, 6 Nov 2013 10:05:48 +0000 Message-Id: <1383732348-18576-8-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1383732348-18576-1-git-send-email-lee.jones@linaro.org> References: <1383732348-18576-1-git-send-email-lee.jones@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131106_050626_024081_6F8139E4 X-CRM114-Status: GOOD ( 12.98 ) X-Spam-Score: -2.6 (--) Cc: linus.walleij@linaro.org, Lee Jones 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.2 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 Signed-off-by: Lee Jones --- arch/arm/mach-ux500/timer.c | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index 05a4ff7..ca60bbd 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -27,18 +27,11 @@ static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer, static void __init ux500_twd_init(void) { struct twd_local_timer *twd_local_timer; - int err; /* Use this to switch local timer base if changed in new ASICs */ twd_local_timer = &u8500_twd_local_timer; - if (of_have_populated_dt()) - clocksource_of_init(); - else { - err = twd_local_timer_register(twd_local_timer); - if (err) - pr_err("twd_local_timer_register failed %d\n", err); - } + clocksource_of_init(); } #else #define ux500_twd_init() do { } while(0) @@ -63,20 +56,15 @@ void __init ux500_timer_init(void) ux500_unknown_soc(); } - /* TODO: Once MTU has been DT:ed place code above into else. */ - if (of_have_populated_dt()) { -#ifdef CONFIG_OF - np = of_find_matching_node(NULL, prcmu_timer_of_match); - if (!np) -#endif - goto dt_fail; + np = of_find_matching_node(NULL, prcmu_timer_of_match); + if (!np) + goto dt_fail; - tmp_base = of_iomap(np, 0); - if (!tmp_base) - goto dt_fail; + tmp_base = of_iomap(np, 0); + if (!tmp_base) + goto dt_fail; - prcmu_timer_base = tmp_base; - } + prcmu_timer_base = tmp_base; dt_fail: /* Doing it the old fashioned way. */