From patchwork Thu Jun 30 14:13:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 71248 Delivered-To: patch@linaro.org Received: by 10.140.28.4 with SMTP id 4csp417494qgy; Thu, 30 Jun 2016 07:14:39 -0700 (PDT) X-Received: by 10.66.232.136 with SMTP id to8mr22142349pac.130.1467296074756; Thu, 30 Jun 2016 07:14:34 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e62si4650665pfe.193.2016.06.30.07.14.34; Thu, 30 Jun 2016 07:14:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932210AbcF3OO3 (ORCPT + 3 others); Thu, 30 Jun 2016 10:14:29 -0400 Received: from bear.ext.ti.com ([198.47.19.11]:46205 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932202AbcF3OO2 (ORCPT ); Thu, 30 Jun 2016 10:14:28 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id u5UEE6Ow021826; Thu, 30 Jun 2016 09:14:06 -0500 Received: from DFLE72.ent.ti.com (dfle72.ent.ti.com [128.247.5.109]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id u5UEE6FP004753; Thu, 30 Jun 2016 09:14:06 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DFLE72.ent.ti.com (128.247.5.109) with Microsoft SMTP Server id 14.3.294.0; Thu, 30 Jun 2016 09:14:05 -0500 Received: from gomoku.home (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id u5UEDnVZ002253; Thu, 30 Jun 2016 09:14:03 -0500 From: Tero Kristo To: , , , , , CC: Subject: [PATCHv3 5/7] clk: ti: am33xx: fix timer3/6 init time setup for module clocks Date: Thu, 30 Jun 2016 17:13:36 +0300 Message-ID: <1467296018-25086-6-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1467296018-25086-1-git-send-email-t-kristo@ti.com> References: <1467296018-25086-1-git-send-email-t-kristo@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 timer*_fck are going to be renamed as timer*_mod_ck:s. Fix the init time configuration of timer3/timer6 to take this into account, and lookup for the module clock in case the lookup for fck fails. Signed-off-by: Tero Kristo --- drivers/clk/ti/clk-33xx.c | 6 ++++++ 1 file changed, 6 insertions(+) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/clk/ti/clk-33xx.c b/drivers/clk/ti/clk-33xx.c index ef2ec64..c69fed5 100644 --- a/drivers/clk/ti/clk-33xx.c +++ b/drivers/clk/ti/clk-33xx.c @@ -144,9 +144,15 @@ int __init am33xx_dt_clk_init(void) clk1 = clk_get_sys(NULL, "sys_clkin_ck"); clk2 = clk_get_sys(NULL, "timer3_fck"); + if (IS_ERR(clk2)) + clk2 = clk_get_sys(NULL, "timer3_mod_ck"); + clk_set_parent(clk2, clk1); clk2 = clk_get_sys(NULL, "timer6_fck"); + if (IS_ERR(clk2)) + clk2 = clk_get_sys(NULL, "timer6_mod_ck"); + clk_set_parent(clk2, clk1); /* * The On-Chip 32K RC Osc clock is not an accurate clock-source as per