From: Ansuel Smith <ansuelsmth@gmail.com>
To: Rob Herring <robh+dt@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Andy Gross <agross@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
Peter De Schrijver <pdeschrijver@nvidia.com>,
Prashant Gaikwad <pgaikwad@nvidia.com>,
Thierry Reding <thierry.reding@gmail.com>,
Jonathan Hunter <jonathanh@nvidia.com>,
Ansuel Smith <ansuelsmth@gmail.com>,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org,
linux-tegra@vger.kernel.org
Subject: [PATCH 01/16] clk: permit to define a custom parent for clk_hw_get_parent_index
Date: Sun, 13 Mar 2022 20:04:04 +0100 [thread overview]
Message-ID: <20220313190419.2207-2-ansuelsmth@gmail.com> (raw)
In-Reply-To: <20220313190419.2207-1-ansuelsmth@gmail.com>
Clk can have multiple parents. Some clk may require to get the cached
index of other parent that are not current associated with the clk.
Extend clk_hw_get_parent_index() with an optional parent to permit a
driver to get the cached index. If parent is NULL, the parent associated
with the provided hw clk is used.
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
drivers/clk/clk.c | 14 +++++++++-----
drivers/clk/tegra/clk-periph.c | 2 +-
drivers/clk/tegra/clk-sdmmc-mux.c | 2 +-
drivers/clk/tegra/clk-super.c | 4 ++--
include/linux/clk-provider.h | 2 +-
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index 8de6a22498e7..fe42f56bfbdf 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -1711,15 +1711,19 @@ static int clk_fetch_parent_index(struct clk_core *core,
/**
* clk_hw_get_parent_index - return the index of the parent clock
* @hw: clk_hw associated with the clk being consumed
+ * @parent: optional clk_hw of the parent to be fetched
*
- * Fetches and returns the index of parent clock. Returns -EINVAL if the given
- * clock does not have a current parent.
+ * Fetches and returns the index of parent clock. If parent is not
+ * provided the parent of hw is used.
+ * Returns -EINVAL if the given clock does not have a current parent.
*/
-int clk_hw_get_parent_index(struct clk_hw *hw)
+int clk_hw_get_parent_index(struct clk_hw *hw, struct clk_hw *parent)
{
- struct clk_hw *parent = clk_hw_get_parent(hw);
+ /* With parent NULL get the current parent of hw */
+ if (!parent)
+ parent = clk_hw_get_parent(hw);
- if (WARN_ON(parent == NULL))
+ if (WARN_ON(!parent))
return -EINVAL;
return clk_fetch_parent_index(hw->core, parent->core);
diff --git a/drivers/clk/tegra/clk-periph.c b/drivers/clk/tegra/clk-periph.c
index 79ca3aa072b7..0fecdbbaca8f 100644
--- a/drivers/clk/tegra/clk-periph.c
+++ b/drivers/clk/tegra/clk-periph.c
@@ -116,7 +116,7 @@ static void clk_periph_restore_context(struct clk_hw *hw)
struct clk_hw *div_hw = &periph->divider.hw;
int parent_id;
- parent_id = clk_hw_get_parent_index(hw);
+ parent_id = clk_hw_get_parent_index(hw, NULL);
if (WARN_ON(parent_id < 0))
return;
diff --git a/drivers/clk/tegra/clk-sdmmc-mux.c b/drivers/clk/tegra/clk-sdmmc-mux.c
index 4f2c3309eea4..6013ca8444f4 100644
--- a/drivers/clk/tegra/clk-sdmmc-mux.c
+++ b/drivers/clk/tegra/clk-sdmmc-mux.c
@@ -210,7 +210,7 @@ static void clk_sdmmc_mux_restore_context(struct clk_hw *hw)
unsigned long rate = clk_hw_get_rate(hw);
int parent_id;
- parent_id = clk_hw_get_parent_index(hw);
+ parent_id = clk_hw_get_parent_index(hw, NULL);
if (WARN_ON(parent_id < 0))
return;
diff --git a/drivers/clk/tegra/clk-super.c b/drivers/clk/tegra/clk-super.c
index a98a420398fa..27cbbc09ef68 100644
--- a/drivers/clk/tegra/clk-super.c
+++ b/drivers/clk/tegra/clk-super.c
@@ -128,7 +128,7 @@ static void clk_super_mux_restore_context(struct clk_hw *hw)
{
int parent_id;
- parent_id = clk_hw_get_parent_index(hw);
+ parent_id = clk_hw_get_parent_index(hw, NULL);
if (WARN_ON(parent_id < 0))
return;
@@ -180,7 +180,7 @@ static void clk_super_restore_context(struct clk_hw *hw)
struct clk_hw *div_hw = &super->frac_div.hw;
int parent_id;
- parent_id = clk_hw_get_parent_index(hw);
+ parent_id = clk_hw_get_parent_index(hw, NULL);
if (WARN_ON(parent_id < 0))
return;
diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
index 2faa6f7aa8a8..65b2850c09be 100644
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@ -1198,7 +1198,7 @@ unsigned int clk_hw_get_num_parents(const struct clk_hw *hw);
struct clk_hw *clk_hw_get_parent(const struct clk_hw *hw);
struct clk_hw *clk_hw_get_parent_by_index(const struct clk_hw *hw,
unsigned int index);
-int clk_hw_get_parent_index(struct clk_hw *hw);
+int clk_hw_get_parent_index(struct clk_hw *hw, struct clk_hw *parent);
int clk_hw_set_parent(struct clk_hw *hw, struct clk_hw *new_parent);
unsigned int __clk_get_enable_count(struct clk *clk);
unsigned long clk_hw_get_rate(const struct clk_hw *hw);
--
2.34.1
next prev parent reply other threads:[~2022-03-13 19:05 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-13 19:04 [PATCH 00/16] Modernize rest of the krait drivers Ansuel Smith
2022-03-13 19:04 ` Ansuel Smith [this message]
2022-03-15 17:55 ` [PATCH 01/16] clk: permit to define a custom parent for clk_hw_get_parent_index Stephen Boyd
2022-03-15 18:07 ` Ansuel Smith
2022-03-15 21:30 ` Stephen Boyd
2022-03-13 19:04 ` [PATCH 02/16] clk: qcom: gcc-ipq806x: skip pxo/cxo fixed clk if already present Ansuel Smith
2022-03-13 19:04 ` [PATCH 03/16] clk: qcom: gcc-ipq806x: add PXO_SRC in clk table Ansuel Smith
2022-03-13 19:04 ` [PATCH 04/16] clk: qcom: clk-hfpll: use poll_timeout macro Ansuel Smith
2022-03-13 19:04 ` [PATCH 05/16] clk: qcom: kpss-xcc: convert to parent data API Ansuel Smith
2022-03-13 19:04 ` [PATCH 06/16] clk: qcom: clk-krait: unlock spin after mux completion Ansuel Smith
2022-03-13 19:04 ` [PATCH 07/16] clk: qcom: clk-krait: add hw_parent check for div2_round_rate Ansuel Smith
2022-03-15 22:43 ` Stephen Boyd
2022-03-13 19:04 ` [PATCH 08/16] clk: qcom: krait-cc: convert to parent_data API Ansuel Smith
2022-03-13 19:04 ` [PATCH 09/16] clk: qcom: krait-cc: drop pr_info and register qsb only if needed Ansuel Smith
2022-03-15 22:45 ` Stephen Boyd
2022-03-13 19:04 ` [PATCH 10/16] clk: qcom: krait-cc: drop hardcoded safe_sel Ansuel Smith
2022-03-13 19:04 ` [PATCH 11/16] clk: qcom: krait-cc: force sec_mux to QSB Ansuel Smith
2022-03-15 22:47 ` Stephen Boyd
2022-03-13 19:04 ` [PATCH 12/16] clk: qcom: clk-krait: add 8064 errata workaround Ansuel Smith
2022-03-14 8:20 ` Dmitry Baryshkov
2022-03-14 12:43 ` Ansuel Smith
2022-03-15 21:34 ` Stephen Boyd
2022-03-15 21:47 ` Ansuel Smith
2022-03-15 22:41 ` Stephen Boyd
2022-03-16 15:46 ` Ansuel Smith
2022-03-17 19:34 ` Stephen Boyd
2022-03-13 19:04 ` [PATCH 13/16] clk: qcom: clk-krait: add enable disable ops Ansuel Smith
2022-03-13 19:04 ` [PATCH 14/16] dt-bindings: clock: Convert qcom,krait-cc to yaml Ansuel Smith
2022-03-13 19:04 ` [PATCH 15/16] dts: qcom-ipq8064: add missing krait-cc compatible and clocks Ansuel Smith
2022-03-13 19:04 ` [PATCH 16/16] dt-bindings: arm: msm: Convert kpss driver Documentation to yaml Ansuel Smith
2022-03-14 14:42 ` Rob Herring
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=20220313190419.2207-2-ansuelsmth@gmail.com \
--to=ansuelsmth@gmail.com \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=jonathanh@nvidia.com \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tegra@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=pdeschrijver@nvidia.com \
--cc=pgaikwad@nvidia.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@kernel.org \
--cc=thierry.reding@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).