From patchwork Thu Apr 24 21:43:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 4056551 Return-Path: X-Original-To: patchwork-linux-omap@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 E4D479F1F4 for ; Thu, 24 Apr 2014 22:56:48 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 236DF2025A for ; Thu, 24 Apr 2014 22:56:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 491D1201F7 for ; Thu, 24 Apr 2014 22:56:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754890AbaDXW4a (ORCPT ); Thu, 24 Apr 2014 18:56:30 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:38812 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753619AbaDXVot (ORCPT ); Thu, 24 Apr 2014 17:44:49 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s3OLiR3Y027109; Thu, 24 Apr 2014 16:44:27 -0500 Received: from DFLE73.ent.ti.com (dfle73.ent.ti.com [128.247.5.110]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3OLiROj009674; Thu, 24 Apr 2014 16:44:27 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE73.ent.ti.com (128.247.5.110) with Microsoft SMTP Server id 14.3.174.1; Thu, 24 Apr 2014 16:44:26 -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 s3OLiRJD004184; Thu, 24 Apr 2014 16:44:27 -0500 Received: from joel-laptop.am.dhcp.ti.com (joel-laptop.am.dhcp.ti.com [10.247.29.57]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id s3OLiQt29797; Thu, 24 Apr 2014 16:44:26 -0500 (CDT) From: Joel Fernandes To: Linux OMAP List , Linux ARM Kernel List , Linux Kernel Mailing List CC: Tony Lindgren , Joel Fernandes Subject: [PATCH 14/26] ARM: OMAP2+: timer: Remove hwmod look-up dependency for DT-boot Date: Thu, 24 Apr 2014 16:43:57 -0500 Message-ID: <1398375849-6017-15-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 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 hwmod look ups should no longer directly happen for dmtimer users of DT-boot platforms. We separate out the code for platforms that are still non-DT. Ultimately this code should be deleted if all platforms are converted to DT-boot. We use omap_dmtimer_powerup introduced earlier in the series to abstract out the hwmod dependency for the same. This will help us move the generic DT specific code out into drivers/clocksource/ later. Signed-off-by: Joel Fernandes --- arch/arm/mach-omap2/timer.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 9fdff5b..ea91ef9 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -266,10 +266,6 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, if (!np) return -ENODEV; - of_property_read_string_index(np, "ti,hwmods", 0, &oh_name); - if (!oh_name) - return -ENODEV; - timer->irq = irq_of_parse_and_map(np, 0); if (!timer->irq) return -ENXIO; @@ -277,19 +273,24 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, timer->io_base = of_iomap(np, 0); of_node_put(np); + + if (!timer->io_base) + return -ENXIO; + + r = omap_dmtimer_powerup(np); + if (r) + return r; } else { if (omap_dm_timer_reserve_systimer(timer->id)) return -ENODEV; sprintf(name, "timer%d", timer->id); oh_name = name; - } - oh = omap_hwmod_lookup(oh_name); - if (!oh) - return -ENODEV; + oh = omap_hwmod_lookup(oh_name); + if (!oh) + return -ENODEV; - if (!of_have_populated_dt()) { r = omap_hwmod_get_resource_byname(oh, IORESOURCE_IRQ, NULL, &irq); if (r) @@ -303,11 +304,14 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, /* Static mapping, never released */ timer->io_base = ioremap(mem.start, mem.end - mem.start); - } - if (!timer->io_base) - return -ENXIO; + if (!timer->io_base) + return -ENXIO; + + omap_hwmod_setup_one(oh_name); + omap_hwmod_enable(oh); + } /* After the dmtimer is using hwmod these clocks won't be needed */ timer->fclk = clk_get(NULL, omap_hwmod_get_main_clk(oh)); if (IS_ERR(timer->fclk)) @@ -333,10 +337,7 @@ static int __init omap_dm_timer_init_one(struct omap_dm_timer *timer, clk_put(src); - omap_hwmod_setup_one(oh_name); - omap_hwmod_enable(oh); __omap_dm_timer_init_regs(timer); - if (posted) __omap_dm_timer_enable_posted(timer);