From patchwork Wed Apr 23 01:27:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 4038441 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 258CF9F1F4 for ; Wed, 23 Apr 2014 01:40:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4EEB420142 for ; Wed, 23 Apr 2014 01:40:33 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B51DB2021F for ; Wed, 23 Apr 2014 01:40:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wcm7y-0001oo-8Z; Wed, 23 Apr 2014 01:37:34 +0000 Received: from arroyo.ext.ti.com ([192.94.94.40]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Wclyf-0001VB-Jw for linux-arm-kernel@lists.infradead.org; Wed, 23 Apr 2014 01:27:58 +0000 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s3N1RYvD030737; Tue, 22 Apr 2014 20:27:34 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3N1RYL3022633; Tue, 22 Apr 2014 20:27:34 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Tue, 22 Apr 2014 20:27:33 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep32.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3N1RX3x017342; Tue, 22 Apr 2014 20:27:33 -0500 Received: from joel-laptop.itg.ti.com (j-172-22-138-39.vpn.ti.com [172.22.138.39]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id s3N1RXt27831; Tue, 22 Apr 2014 20:27:33 -0500 (CDT) From: Joel Fernandes To: Tony Lindgren , Rob Herring , Linux OMAP List , Linux ARM Kernel List , Linux Kernel Mailing List Subject: [PATCH 3/8] ARM: OMAP2+: timer: Add comment on timer clk parenting Date: Tue, 22 Apr 2014 20:27:04 -0500 Message-ID: <1398216429-4681-4-git-send-email-joelf@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398216429-4681-1-git-send-email-joelf@ti.com> References: <1398216429-4681-1-git-send-email-joelf@ti.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140422_182757_773176_095FEE84 X-CRM114-Status: GOOD ( 11.81 ) X-Spam-Score: -5.7 (-----) Cc: Joel Fernandes 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,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 Add a comment describing the state of system timer clock parenting. The code following the comment should be deleted once all platforms can do DT boot, and specially should not be executed for DT platforms once we can specify default clock parents through DT. Signed-off-by: Joel Fernandes --- arch/arm/mach-omap2/timer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index f192a41..9fdff5b 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -313,6 +313,10 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, if (IS_ERR(timer->fclk)) return PTR_ERR(timer->fclk); + /* + * Clock reparenting code, goes away for DT-boot atleast, + * once clock layer can do it through DT. + */ src = clk_get(NULL, fck_source); if (IS_ERR(src)) return PTR_ERR(src);