From patchwork Thu Apr 14 11:08:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tero Kristo X-Patchwork-Id: 65802 Delivered-To: patch@linaro.org Received: by 10.140.93.198 with SMTP id d64csp529985qge; Thu, 14 Apr 2016 04:09:54 -0700 (PDT) X-Received: by 10.66.221.167 with SMTP id qf7mr20181863pac.94.1460632172224; Thu, 14 Apr 2016 04:09:32 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b5si7243168pat.133.2016.04.14.04.09.32; Thu, 14 Apr 2016 04:09:32 -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 S1755009AbcDNLJb (ORCPT + 3 others); Thu, 14 Apr 2016 07:09:31 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:54404 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754904AbcDNLJ1 (ORCPT ); Thu, 14 Apr 2016 07:09:27 -0400 Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id u3EB8w7A014857; Thu, 14 Apr 2016 06:08:58 -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 u3EB8wIx002629; Thu, 14 Apr 2016 06:08:58 -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.224.2; Thu, 14 Apr 2016 06:08:57 -0500 Received: from sokoban.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id u3EB86JV005701; Thu, 14 Apr 2016 06:08:56 -0500 From: Tero Kristo To: , , , , CC: , , Subject: [PATCHv2 21/28] clk: ti: am33xx: fix timer3/6 init time setup for module clocks Date: Thu, 14 Apr 2016 14:08:10 +0300 Message-ID: <1460632097-25727-22-git-send-email-t-kristo@ti.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1460632097-25727-1-git-send-email-t-kristo@ti.com> References: <1460632097-25727-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.7.9.5 -- 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 43847bc..2343a22 100644 --- a/drivers/clk/ti/clk-33xx.c +++ b/drivers/clk/ti/clk-33xx.c @@ -66,9 +66,15 @@ int __init am33xx_dt_clk_init(void) clk1 = ti_clk_get("sys_clkin_ck"); clk2 = ti_clk_get("timer3_fck"); + if (IS_ERR(clk2)) + clk2 = ti_clk_get("timer3_mod_ck"); + clk_set_parent(clk2, clk1); clk2 = ti_clk_get("timer6_fck"); + if (IS_ERR(clk2)) + clk2 = ti_clk_get("timer6_mod_ck"); + clk_set_parent(clk2, clk1); /* * The On-Chip 32K RC Osc clock is not an accurate clock-source as per