Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754256AbaDXVow (ORCPT ); Thu, 24 Apr 2014 17:44:52 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:38806 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752551AbaDXVos (ORCPT ); Thu, 24 Apr 2014 17:44:48 -0400 From: Joel Fernandes To: Linux OMAP List , Linux ARM Kernel List , Linux Kernel Mailing List CC: Tony Lindgren , Joel Fernandes Subject: [PATCH 17/26] ARM: OMAP2+: timer: Add fallback for of_clk_get Date: Thu, 24 Apr 2014 16:44:00 -0500 Message-ID: <1398375849-6017-18-git-send-email-joelf@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1398375849-6017-1-git-send-email-joelf@ti.com> References: <1398375849-6017-1-git-send-email-joelf@ti.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Not all platforms currently will support of_clk_get on timer because they may not have clock property in their DT nodes. Add code to handle this case so that things are kept working. Finally we can delete this code once all system timer nodes have a clock property. Signed-off-by: Joel Fernandes --- arch/arm/mach-omap2/timer.c | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 519ccfd..b3db1da 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -277,13 +277,19 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, if (!timer->io_base) return -ENXIO; - timer->fclk = of_clk_get(np, 0); - if (IS_ERR(timer->fclk)) - return PTR_ERR(timer->fclk); - r = omap_dmtimer_powerup(np); if (r) return r; + + timer->fclk = of_clk_get(np, 0); + if (IS_ERR(timer->fclk)) { + /* + * Support DT platforms temporarily that don't have + * clock property in their dts yet. Ultimately this + * fall back code is to be deleted and we're to return + * PTR_ERR(timer->fclk) here. + */ + } } else { if (omap_dm_timer_reserve_systimer(timer->id)) return -ENODEV; @@ -312,12 +318,17 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, if (!timer->io_base) return -ENXIO; + 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); - - omap_hwmod_setup_one(oh_name); - omap_hwmod_enable(oh); } /* -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/