From patchwork Wed Sep 18 12:14:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 20413 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 44E0A246E9 for ; Wed, 18 Sep 2013 12:15:16 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id a41sf7306811yho.6 for ; Wed, 18 Sep 2013 05:15:16 -0700 (PDT) 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=nHDFBnR2YxZzaZtIDrdu6bjzU8tBheGE8atkERYgqgw=; b=froI92eK1HcydOaoIYYNk373oYf+Rva4OiW77xYO4xSV+Yj/mIkgNOiNUA0NEOfxjN bsybiHUZ9krMSqJ7HbrogAdZEhzchMiJe8ni3XCv2DdnV6H1UQkv+I4zfzPrLFyvEVEu DGuJhgzY97bI6KxLW10LnndwLyKE4wlYVi7tzrhccLUmeIXd03oqV45wL7G/BX55mZS9 /9PahX8TdPs0vs+rLT+BAwQaWZ11q8+VLU9uO0cdqXvUlpwQaVJAvxY1g0lkPJDEVBUs oWIyBOltyuRjWGcgMOwJa0Y1oHiHu2U18wGh8P7AOz4h9zqy+2PNc9zaXFLd/4MEWRnh ZIcQ== X-Gm-Message-State: ALoCoQmvpQG04csXBiHf6PWePJ0P1zfxq8LWfZwj2OYGu6xqJnp+BWTk6af8gAGeiywUxpNMMDch X-Received: by 10.236.63.165 with SMTP id a25mr6048295yhd.43.1379506516098; Wed, 18 Sep 2013 05:15:16 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.58.244 with SMTP id u20ls3191586qeq.74.gmail; Wed, 18 Sep 2013 05:15:16 -0700 (PDT) X-Received: by 10.221.51.206 with SMTP id vj14mr37765197vcb.17.1379506516014; Wed, 18 Sep 2013 05:15:16 -0700 (PDT) Received: from mail-vc0-f175.google.com (mail-vc0-f175.google.com [209.85.220.175]) by mx.google.com with ESMTPS id tt2si431401vcb.77.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Sep 2013 05:15:16 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.175 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.175; Received: by mail-vc0-f175.google.com with SMTP id ia10so5172506vcb.34 for ; Wed, 18 Sep 2013 05:15:15 -0700 (PDT) X-Received: by 10.58.198.13 with SMTP id iy13mr37791861vec.11.1379506515939; Wed, 18 Sep 2013 05:15:15 -0700 (PDT) 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 u4csp214504vcz; Wed, 18 Sep 2013 05:15:15 -0700 (PDT) X-Received: by 10.15.98.9 with SMTP id bi9mr2514583eeb.67.1379506513159; Wed, 18 Sep 2013 05:15:13 -0700 (PDT) Received: from mail-ea0-f170.google.com (mail-ea0-f170.google.com [209.85.215.170]) by mx.google.com with ESMTPS id x43si1452121eep.340.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Sep 2013 05:15:09 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.170 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.215.170; Received: by mail-ea0-f170.google.com with SMTP id h14so3414146eak.15 for ; Wed, 18 Sep 2013 05:15:07 -0700 (PDT) X-Received: by 10.15.100.198 with SMTP id bn46mr58410161eeb.11.1379506507631; Wed, 18 Sep 2013 05:15:07 -0700 (PDT) Received: from localhost.localdomain (cpc15-aztw25-2-0-cust493.aztw.cable.virginmedia.com. [92.233.57.238]) by mx.google.com with ESMTPSA id b45sm2382210eef.4.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Sep 2013 05:15:07 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@linaro.org, Lee Jones Subject: [PATCH 20/41] ARM: ux500: Don't attempt to enable the Nomadik System Timer twice Date: Wed, 18 Sep 2013 13:14:17 +0100 Message-Id: <1379506478-16625-21-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1379506478-16625-1-git-send-email-lee.jones@linaro.org> References: <1379506478-16625-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.220.175 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: , When booting with DT enabled we already call clocksource_of_init(), which in turn calls the OF version of nmdk_timer_init(). Signed-off-by: Lee Jones --- arch/arm/mach-ux500/timer.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index b6bd0ef..05a4ff7 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -97,8 +97,8 @@ dt_fail: * sched_clock with higher rating then MTU since is always-on. * */ - - nmdk_timer_init(mtu_timer_base, IRQ_MTU0); + if (!of_have_populated_dt()) + nmdk_timer_init(mtu_timer_base, IRQ_MTU0); clksrc_dbx500_prcmu_init(prcmu_timer_base); ux500_twd_init(); }