From patchwork Thu Apr 17 00:03:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Fernandes X-Patchwork-Id: 4004731 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 C55529F387 for ; Thu, 17 Apr 2014 00:06:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E57E3202F2 for ; Thu, 17 Apr 2014 00:06:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id F1A7B2028D for ; Thu, 17 Apr 2014 00:06:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756888AbaDQADv (ORCPT ); Wed, 16 Apr 2014 20:03:51 -0400 Received: from comal.ext.ti.com ([198.47.26.152]:35111 "EHLO comal.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754520AbaDQADu (ORCPT ); Wed, 16 Apr 2014 20:03:50 -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 s3H03Ro3013474; Wed, 16 Apr 2014 19:03:27 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s3H03R3u027471; Wed, 16 Apr 2014 19:03:27 -0500 Received: from dlep32.itg.ti.com (157.170.170.100) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Wed, 16 Apr 2014 19:03:27 -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 s3H03RqT016727; Wed, 16 Apr 2014 19:03:27 -0500 Received: from joel-laptop.itg.ti.com (j-172-22-137-46.vpn.ti.com [172.22.137.46]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id s3H03Qt25114; Wed, 16 Apr 2014 19:03:26 -0500 (CDT) From: Joel Fernandes To: Tony Lindgren CC: Rajendra Nayak , Linux OMAP List , Linux ARM Kernel List , Linux Kernel Mailing List , Joel Fernandes Subject: [PATCH 1/9] ARM: OMAP: dmtimer: Remove setting of clk parent indirectly through platform hook Date: Wed, 16 Apr 2014 19:03:11 -0500 Message-ID: <1397692999-7800-1-git-send-email-joelf@ti.com> X-Mailer: git-send-email 1.7.9.5 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.6 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 There is a platform specific hook just for OMAP1 to set its clk parent. Remove this hook and have OMAP1 set its parent in omap1_dm_timer_init. If OMAP1 is ever migrated to clock framework, the correct way to do this would be through clk_set_parent like other platforms. Signed-off-by: Joel Fernandes --- arch/arm/mach-omap1/timer.c | 8 +++++++- arch/arm/plat-omap/dmtimer.c | 8 +++----- include/linux/platform_data/dmtimer-omap.h | 2 -- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c index bde7a35..4b9c604 100644 --- a/arch/arm/mach-omap1/timer.c +++ b/arch/arm/mach-omap1/timer.c @@ -140,7 +140,13 @@ static int __init omap1_dm_timer_init(void) goto err_free_pdata; } - pdata->set_timer_src = omap1_dm_timer_set_src; + /* + * Since OMAP1 doesn't support clock framework, set timer clock + * source to 32KHz here instead of expecting it to be set by + * dmtimer code. + */ + omap1_dm_timer_set_src(pdev, 0x01); + pdata->timer_capability = OMAP_TIMER_ALWON | OMAP_TIMER_NEEDS_RESET | OMAP_TIMER_HAS_DSP_IRQ; diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c index 869254c..ecd3f97 100644 --- a/arch/arm/plat-omap/dmtimer.c +++ b/arch/arm/plat-omap/dmtimer.c @@ -494,12 +494,10 @@ int omap_dm_timer_set_source(struct omap_dm_timer *timer, int source) return -EINVAL; /* - * FIXME: Used for OMAP1 devices only because they do not currently - * use the clock framework to set the parent clock. To be removed - * once OMAP1 migrated to using clock framework for dmtimers + * For OMAP1, timer source is already set during omap1_dm_timer_init. */ - if (pdata && pdata->set_timer_src) - return pdata->set_timer_src(timer->pdev, source); + if (timer->capability & OMAP_TIMER_NEEDS_RESET) + return 0; if (IS_ERR(timer->fclk)) return -EINVAL; diff --git a/include/linux/platform_data/dmtimer-omap.h b/include/linux/platform_data/dmtimer-omap.h index a19b78d..9f42b06 100644 --- a/include/linux/platform_data/dmtimer-omap.h +++ b/include/linux/platform_data/dmtimer-omap.h @@ -21,8 +21,6 @@ #define __PLATFORM_DATA_DMTIMER_OMAP_H__ struct dmtimer_platform_data { - /* set_timer_src - Only used for OMAP1 devices */ - int (*set_timer_src)(struct platform_device *pdev, int source); u32 timer_capability; u32 timer_errata; int (*get_context_loss_count)(struct device *);