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: 21361 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 9125C20DB9 for ; Wed, 6 Nov 2013 10:06:10 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id i4sf5959944oah.5 for ; Wed, 06 Nov 2013 02:06:10 -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:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=xmX6GMmczoPTIYXrvns0Y28Se4ebK5sOjyUCfCj82PQ=; b=mlxvEbgFa/GKcJxy4Hr5c8JBOiQaHZFJgUAV7B0Zz9ri0g08tf3IDr+P3+DkfuihHv Xbt35L4VPyMbohg7gFUXFFrOjGutenc3BzeqDcjCcBNivM684+Yj28Tf4/uIsWhaFZQm CJqTTKqxezcASG4lpefYuB2Sm8w7jNz0QbNAbok25OX1jvJdArQlMZM3rvunOkXqC0rN Xz273yVldWYm0hM3afhRb9x2MH4K8rkfx76lVuKmAmXRuFg8vUua0N8fZOAoickgSOex ysuamUwRCg5ZHAmeJext908s4FqOqdV+SKNun3ssqsznmsbMWYe/Kd5GT+KaPJfF9dfW BeGQ== X-Gm-Message-State: ALoCoQmNducMwKgLadX3NucvsOQxn/IyNiSVDhpJGXfzeQQvotXEd8W+Z4oVeSezixLkEaFNBVwD X-Received: by 10.50.127.138 with SMTP id ng10mr9156699igb.1.1383732369937; Wed, 06 Nov 2013 02:06:09 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.74.198 with SMTP id w6ls588137qev.9.gmail; Wed, 06 Nov 2013 02:06:09 -0800 (PST) X-Received: by 10.58.161.231 with SMTP id xv7mr1737483veb.2.1383732369800; Wed, 06 Nov 2013 02:06:09 -0800 (PST) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id hr2si7577513vdb.24.2013.11.06.02.06.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:06:09 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.174 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id pa12so3435383veb.33 for ; Wed, 06 Nov 2013 02:06:09 -0800 (PST) X-Received: by 10.52.171.79 with SMTP id as15mr1425565vdc.1.1383732369726; Wed, 06 Nov 2013 02:06:09 -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 u4csp272604vcz; Wed, 6 Nov 2013 02:06:09 -0800 (PST) X-Received: by 10.42.94.208 with SMTP id c16mr1576712icn.18.1383732369168; Wed, 06 Nov 2013 02:06:09 -0800 (PST) Received: from mail-ie0-f176.google.com (mail-ie0-f176.google.com [209.85.223.176]) by mx.google.com with ESMTPS id zq8si2000662icb.28.2013.11.06.02.06.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:06:09 -0800 (PST) Received-SPF: neutral (google.com: 209.85.223.176 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.223.176; Received: by mail-ie0-f176.google.com with SMTP id u16so17400801iet.35 for ; Wed, 06 Nov 2013 02:06:08 -0800 (PST) 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 Cc: linus.walleij@linaro.org, Lee Jones 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-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.174 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: , 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. */