All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tero Kristo <t-kristo@ti.com>
To: <linux-omap@vger.kernel.org>, <linux-clk@vger.kernel.org>,
	<tony@atomide.com>, <paul@pwsan.com>, <sboyd@codeaurora.org>,
	<mturquette@baylibre.com>
Cc: <linux-arm-kernel@lists.infradead.org>
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	[thread overview]
Message-ID: <1467296018-25086-6-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1467296018-25086-1-git-send-email-t-kristo@ti.com>

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 <t-kristo@ti.com>
---
 drivers/clk/ti/clk-33xx.c | 6 ++++++
 1 file changed, 6 insertions(+)

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
-- 
1.9.1

WARNING: multiple messages have this Message-ID (diff)
From: Tero Kristo <t-kristo@ti.com>
To: linux-omap@vger.kernel.org, linux-clk@vger.kernel.org,
	tony@atomide.com, paul@pwsan.com, sboyd@codeaurora.org,
	mturquette@baylibre.com
Cc: linux-arm-kernel@lists.infradead.org
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	[thread overview]
Message-ID: <1467296018-25086-6-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1467296018-25086-1-git-send-email-t-kristo@ti.com>

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 <t-kristo@ti.com>
---
 drivers/clk/ti/clk-33xx.c | 6 ++++++
 1 file changed, 6 insertions(+)

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
-- 
1.9.1


WARNING: multiple messages have this Message-ID (diff)
From: t-kristo@ti.com (Tero Kristo)
To: linux-arm-kernel@lists.infradead.org
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	[thread overview]
Message-ID: <1467296018-25086-6-git-send-email-t-kristo@ti.com> (raw)
In-Reply-To: <1467296018-25086-1-git-send-email-t-kristo@ti.com>

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 <t-kristo@ti.com>
---
 drivers/clk/ti/clk-33xx.c | 6 ++++++
 1 file changed, 6 insertions(+)

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
-- 
1.9.1

  parent reply	other threads:[~2016-06-30 14:13 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-30 14:13 [PATCHv3 0/7] clk: ti add support for hwmod clk type Tero Kristo
2016-06-30 14:13 ` Tero Kristo
2016-06-30 14:13 ` Tero Kristo
2016-06-30 14:13 ` [PATCHv3 1/7] clkdev: add helper registration API Tero Kristo
2016-06-30 14:13   ` Tero Kristo
2016-06-30 14:13   ` Tero Kristo
2016-06-30 14:13 ` [PATCHv3 2/7] clk: ti: add clkdev get helper Tero Kristo
2016-06-30 14:13   ` Tero Kristo
2016-06-30 14:13   ` Tero Kristo
2016-07-12 10:22   ` Russell King - ARM Linux
2016-07-12 10:22     ` Russell King - ARM Linux
2016-07-12 15:18     ` Tero Kristo
2016-07-12 15:18       ` Tero Kristo
2016-07-12 15:18       ` Tero Kristo
2016-07-12 15:34       ` Russell King - ARM Linux
2016-07-12 15:34         ` Russell King - ARM Linux
2016-07-12 15:49         ` Tero Kristo
2016-07-12 15:49           ` Tero Kristo
2016-07-12 15:49           ` Tero Kristo
2016-07-12 17:40           ` Michael Turquette
2016-07-12 17:40             ` Michael Turquette
2016-07-12 17:40             ` Michael Turquette
2016-06-30 14:13 ` [PATCHv3 3/7] clk: ti: remove un-used definitions from public clk_hw_omap struct Tero Kristo
2016-06-30 14:13   ` Tero Kristo
2016-06-30 14:13   ` Tero Kristo
2016-06-30 14:13 ` [PATCHv3 4/7] clk: ti: mux: export mux clock APIs locally Tero Kristo
2016-06-30 14:13   ` Tero Kristo
2016-06-30 14:13   ` Tero Kristo
2016-06-30 14:13 ` Tero Kristo [this message]
2016-06-30 14:13   ` [PATCHv3 5/7] clk: ti: am33xx: fix timer3/6 init time setup for module clocks Tero Kristo
2016-06-30 14:13   ` Tero Kristo
2016-06-30 14:13 ` [PATCHv3 6/7] dt-bindings: clk: ti: Document module clock type Tero Kristo
2016-06-30 14:13   ` Tero Kristo
2016-06-30 14:13   ` Tero Kristo
2016-06-30 14:13 ` [PATCHv3 7/7] clk: ti: add support for omap4 module clocks Tero Kristo
2016-06-30 14:13   ` Tero Kristo
2016-06-30 14:13   ` Tero Kristo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1467296018-25086-6-git-send-email-t-kristo@ti.com \
    --to=t-kristo@ti.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=mturquette@baylibre.com \
    --cc=paul@pwsan.com \
    --cc=sboyd@codeaurora.org \
    --cc=tony@atomide.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.