From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
To: Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Stephen Boyd <sboyd@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Taniya Das <tdas@codeaurora.org>
Cc: linux-arm-msm@vger.kernel.org, linux-clk@vger.kernel.org
Subject: [PATCH 08/11] clk: qcom: gcc-msm8996: drop unsupported clock sources
Date: Wed, 8 Dec 2021 20:54:27 +0300 [thread overview]
Message-ID: <20211208175430.1333594-9-dmitry.baryshkov@linaro.org> (raw)
In-Reply-To: <20211208175430.1333594-1-dmitry.baryshkov@linaro.org>
In preparation of updating the msm8996 gcc driver, drop all unsupported
GPLL sources (gpll1/gpll1_early_div, gpll2/gpll2_early and gpll3).
Downstream kernel also does not provide support for these GPLL sources,
so it is safe to drop them.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
drivers/clk/qcom/gcc-msm8996.c | 55 ++++------------------------------
1 file changed, 6 insertions(+), 49 deletions(-)
diff --git a/drivers/clk/qcom/gcc-msm8996.c b/drivers/clk/qcom/gcc-msm8996.c
index 9b1674b28d45..3acefe16355c 100644
--- a/drivers/clk/qcom/gcc-msm8996.c
+++ b/drivers/clk/qcom/gcc-msm8996.c
@@ -27,15 +27,10 @@
enum {
P_XO,
P_GPLL0,
- P_GPLL2,
- P_GPLL3,
- P_GPLL1,
- P_GPLL2_EARLY,
P_GPLL0_EARLY_DIV,
P_SLEEP_CLK,
P_GPLL4,
P_AUD_REF_CLK,
- P_GPLL1_EARLY_DIV
};
static const struct parent_map gcc_sleep_clk_map[] = {
@@ -130,44 +125,6 @@ static const char * const gcc_xo_gpll0_gpll4_gpll0_early_div[] = {
"gpll0_early_div"
};
-static const struct parent_map gcc_xo_gpll0_gpll1_early_div_gpll1_gpll4_gpll0_early_div_map[] = {
- { P_XO, 0 },
- { P_GPLL0, 1 },
- { P_GPLL1_EARLY_DIV, 3 },
- { P_GPLL1, 4 },
- { P_GPLL4, 5 },
- { P_GPLL0_EARLY_DIV, 6 }
-};
-
-static const char * const gcc_xo_gpll0_gpll1_early_div_gpll1_gpll4_gpll0_early_div[] = {
- "xo",
- "gpll0",
- "gpll1_early_div",
- "gpll1",
- "gpll4",
- "gpll0_early_div"
-};
-
-static const struct parent_map gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll2_early_gpll0_early_div_map[] = {
- { P_XO, 0 },
- { P_GPLL0, 1 },
- { P_GPLL2, 2 },
- { P_GPLL3, 3 },
- { P_GPLL1, 4 },
- { P_GPLL2_EARLY, 5 },
- { P_GPLL0_EARLY_DIV, 6 }
-};
-
-static const char * const gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll2_early_gpll0_early_div[] = {
- "xo",
- "gpll0",
- "gpll2",
- "gpll3",
- "gpll1",
- "gpll2_early",
- "gpll0_early_div"
-};
-
static struct clk_fixed_factor xo = {
.mult = 1,
.div = 1,
@@ -285,12 +242,12 @@ static const struct freq_tbl ftbl_system_noc_clk_src[] = {
static struct clk_rcg2 system_noc_clk_src = {
.cmd_rcgr = 0x0401c,
.hid_width = 5,
- .parent_map = gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll2_early_gpll0_early_div_map,
+ .parent_map = gcc_xo_gpll0_gpll0_early_div_map,
.freq_tbl = ftbl_system_noc_clk_src,
.clkr.hw.init = &(struct clk_init_data){
.name = "system_noc_clk_src",
- .parent_names = gcc_xo_gpll0_gpll2_gpll3_gpll1_gpll2_early_gpll0_early_div,
- .num_parents = 7,
+ .parent_names = gcc_xo_gpll0_gpll0_early_div,
+ .num_parents = 3,
.ops = &clk_rcg2_ops,
},
};
@@ -1257,12 +1214,12 @@ static const struct freq_tbl ftbl_qspi_ser_clk_src[] = {
static struct clk_rcg2 qspi_ser_clk_src = {
.cmd_rcgr = 0x8b00c,
.hid_width = 5,
- .parent_map = gcc_xo_gpll0_gpll1_early_div_gpll1_gpll4_gpll0_early_div_map,
+ .parent_map = gcc_xo_gpll0_gpll4_gpll0_early_div_map,
.freq_tbl = ftbl_qspi_ser_clk_src,
.clkr.hw.init = &(struct clk_init_data){
.name = "qspi_ser_clk_src",
- .parent_names = gcc_xo_gpll0_gpll1_early_div_gpll1_gpll4_gpll0_early_div,
- .num_parents = 6,
+ .parent_names = gcc_xo_gpll0_gpll4_gpll0_early_div,
+ .num_parents = 4,
.ops = &clk_rcg2_ops,
},
};
--
2.33.0
next prev parent reply other threads:[~2021-12-08 17:54 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-08 17:54 [PATCH 00/11] clk: qcom: another round of clock drivers cleanup Dmitry Baryshkov
2021-12-08 17:54 ` [PATCH 01/11] clk: qcom: gpucc-sdm660: get rid of the test clock Dmitry Baryshkov
2021-12-09 8:08 ` Stephen Boyd
2021-12-08 17:54 ` [PATCH 02/11] clk: qcom: gpucc-sdm660: use parent_hws instead of parent_data Dmitry Baryshkov
2021-12-08 22:44 ` Marijn Suijten
2021-12-09 8:08 ` Stephen Boyd
2021-12-08 17:54 ` [PATCH 03/11] clk: qcom: camcc-sc7180: get rid of the test clock Dmitry Baryshkov
2021-12-08 22:48 ` Marijn Suijten
2021-12-09 8:09 ` Stephen Boyd
2021-12-08 17:54 ` [PATCH 04/11] clk: qcom: camcc-sdm845: " Dmitry Baryshkov
2021-12-09 8:09 ` Stephen Boyd
2021-12-08 17:54 ` [PATCH 05/11] clk: qcom: camcc-sdm845: convert to parent data Dmitry Baryshkov
2021-12-08 23:19 ` Marijn Suijten
2021-12-08 17:54 ` [PATCH 06/11] clk: qcom: camcc-sc7180: use parent_hws instead of parent_data Dmitry Baryshkov
2021-12-08 23:11 ` Marijn Suijten
2021-12-09 8:11 ` Stephen Boyd
2021-12-15 0:12 ` Dmitry Baryshkov
2021-12-08 17:54 ` [PATCH 07/11] clk: qcom: videocc-sc7180: " Dmitry Baryshkov
2021-12-08 22:53 ` Marijn Suijten
2021-12-09 8:11 ` Stephen Boyd
2021-12-08 17:54 ` Dmitry Baryshkov [this message]
2021-12-08 23:23 ` [PATCH 08/11] clk: qcom: gcc-msm8996: drop unsupported clock sources Marijn Suijten
2021-12-08 17:54 ` [PATCH 09/11] clk: qcom: gcc-msm8996: move clock parent tables down Dmitry Baryshkov
2021-12-08 23:11 ` Marijn Suijten
2021-12-09 8:12 ` Stephen Boyd
2021-12-08 17:54 ` [PATCH 10/11] clk: qcom: gcc-msm8996: use parent_hws/_data instead of parent_names Dmitry Baryshkov
2021-12-08 23:09 ` Marijn Suijten
2021-12-13 23:44 ` Bjorn Andersson
2021-12-14 15:00 ` Marijn Suijten
2021-12-08 17:54 ` [PATCH 11/11] clk: qcom: gcc-msm8996: use ARRAY_SIZE instead of specifying num_parents Dmitry Baryshkov
2021-12-08 22:54 ` Marijn Suijten
2021-12-09 8:14 ` Stephen Boyd
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=20211208175430.1333594-9-dmitry.baryshkov@linaro.org \
--to=dmitry.baryshkov@linaro.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=mturquette@baylibre.com \
--cc=sboyd@kernel.org \
--cc=tdas@codeaurora.org \
/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).