From patchwork Wed Apr 23 01:27:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 4038041 Return-Path: X-Original-To: patchwork-linux-omap@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 5164CBFF02 for ; Wed, 23 Apr 2014 01:31:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B64CF201ED for ; Wed, 23 Apr 2014 01:31:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B062420219 for ; Wed, 23 Apr 2014 01:31:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756626AbaDWB2B (ORCPT ); Tue, 22 Apr 2014 21:28:01 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:46794 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755207AbaDWB17 (ORCPT ); Tue, 22 Apr 2014 21:27:59 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id s3N1Rao9030744; Tue, 22 Apr 2014 20:27:36 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3N1RawN022667; Tue, 22 Apr 2014 20:27:36 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.174.1; Tue, 22 Apr 2014 20:27:36 -0500 Received: from legion.dal.design.ti.com (legion.dal.design.ti.com [128.247.22.53]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3N1RaXX013861; Tue, 22 Apr 2014 20:27:36 -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 s3N1RZt27849; Tue, 22 Apr 2014 20:27:35 -0500 (CDT) From: Joel Fernandes To: Tony Lindgren , Rob Herring , Linux OMAP List , Linux ARM Kernel List , Linux Kernel Mailing List CC: Joel Fernandes Subject: [PATCH 8/8] ARM: OMAP2+: timer: Add legacy code for old way of getting fclk Date: Tue, 22 Apr 2014 20:27:09 -0500 Message-ID: <1398216429-4681-9-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 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 Separate out legacy code for getting timer->fclk and reuse it for the DT-case as a fallback. All DT users should ideally be specifying a clock property with a phandle of its clock node. Till the migration is complete, add a legacy function to keep things working. Signed-off-by: Joel Fernandes --- arch/arm/mach-omap2/timer.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index b3db1da..81a29b1 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -248,6 +248,19 @@ static u32 __init omap_dm_timer_get_errata(void) return OMAP_TIMER_ERRATA_I103_I767; } +static int legacy_hwmod_clkget(struct omap_dm_timer *timer, const char *oh_name) +{ + struct omap_hwmod *oh; + + oh = omap_hwmod_lookup(oh_name); + if (!oh) + return -ENODEV; + + timer->fclk = clk_get(NULL, omap_hwmod_get_main_clk(oh)); + if (IS_ERR(timer->fclk)) + return PTR_ERR(timer->fclk); +} + static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, const char *fck_source, const char *property, @@ -289,6 +302,14 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, * fall back code is to be deleted and we're to return * PTR_ERR(timer->fclk) here. */ + of_property_read_string_index(np, "ti,hwmods", 0, + &oh_name); + if (!oh_name) + return -ENODEV; + + r = legacy_hwmod_clkget(timer, oh_name); + if (r) + return r; } } else { if (omap_dm_timer_reserve_systimer(timer->id)) @@ -320,15 +341,10 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, omap_hwmod_setup_one(oh_name); omap_hwmod_enable(oh); - } - if (!timer->fclk || IS_ERR(timer->fclk)) { - oh = omap_hwmod_lookup(oh_name); - if (!oh) - return -ENODEV; - timer->fclk = clk_get(NULL, omap_hwmod_get_main_clk(oh)); - if (IS_ERR(timer->fclk)) - return PTR_ERR(timer->fclk); + r = legacy_hwmod_clkget(timer, oh_name); + if (r) + return r; } /*