From: Taniya Das <tdas@codeaurora.org>
To: Douglas Anderson <dianders@chromium.org>,
Rob Herring <robh@kernel.org>, Andy Gross <agross@kernel.org>,
Bjorn Andersson <bjorn.andersson@linaro.org>,
Stephen Boyd <sboyd@codeaurora.org>
Cc: Jeffrey Hugo <jhugo@codeaurora.org>,
devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org,
harigovi@codeaurora.org, mka@chromium.org,
kalyan_t@codeaurora.org, Mark Rutland <mark.rutland@arm.com>,
linux-clk@vger.kernel.org, hoegsberg@chromium.org,
Michael Turquette <mturquette@baylibre.com>,
Stephen Boyd <sboyd@kernel.org>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2 05/10] clk: qcom: Fix sc7180 dispcc parent data
Date: Tue, 28 Jan 2020 11:23:39 +0530 [thread overview]
Message-ID: <149394fe-b726-15da-1c6f-a223d57a009f@codeaurora.org> (raw)
In-Reply-To: <20200124144154.v2.5.If590c468722d2985cea63adf60c0d2b3098f37d9@changeid>
Hi Doug,
Thanks for the patch.
On 1/25/2020 4:12 AM, Douglas Anderson wrote:
> The bindings file (qcom,dispcc.yaml) says that the two clocks that
> dispcc is a client of are named "xo" and "gpll0". That means we have
> to refer to them by those names. We weren't referring to "xo"
> properly in the driver.
>
> Then, in the patch ("dt-bindings: clock: Fix qcom,dispcc bindings for
> sdm845/sc7180") we clarify the names for all of the clocks that we are
> a client of. Fix all those too, also getting rid of the "fallback"
> names for them. Since sc7180 is still in infancy there is no reason
> to specify a fallback name. People should just get the device tree
> right.
>
> Since we didn't add the "test" clock to the bindings (apparently it's
> never used), kill it from the driver. If someone has a use for it we
> should add it to the bindings and bring it back.
>
> Instead of updating all of the sizes of the arrays now that the test
> clock is gone, switch to using the less error-prone ARRAY_SIZE. Not
> sure why it didn't always use that.
>
> Fixes: dd3d06622138 ("clk: qcom: Add display clock controller driver for SC7180")
> Signed-off-by: Douglas Anderson <dianders@chromium.org>
> ---
>
> Changes in v2:
> - Patch ("clk: qcom: Fix sc7180 dispcc parent data") new for v2.
>
> drivers/clk/qcom/dispcc-sc7180.c | 63 ++++++++++++--------------------
> 1 file changed, 24 insertions(+), 39 deletions(-)
>
> diff --git a/drivers/clk/qcom/dispcc-sc7180.c b/drivers/clk/qcom/dispcc-sc7180.c
> index 30c1e25d3edb..380eca3f847d 100644
> --- a/drivers/clk/qcom/dispcc-sc7180.c
> +++ b/drivers/clk/qcom/dispcc-sc7180.c
> @@ -43,7 +43,7 @@ static struct clk_alpha_pll disp_cc_pll0 = {
> .hw.init = &(struct clk_init_data){
> .name = "disp_cc_pll0",
> .parent_data = &(const struct clk_parent_data){
> - .fw_name = "bi_tcxo",
> + .fw_name = "xo",
These clock names are as per our HW design and we would not like to
update them as they require lot of hand-coding. These codes are all
auto-generated.
> },
> .num_parents = 1,
> .ops = &clk_alpha_pll_fabia_ops,
> @@ -76,40 +76,32 @@ static struct clk_alpha_pll_postdiv disp_cc_pll0_out_even = {
>
> static const struct parent_map disp_cc_parent_map_0[] = {
> { P_BI_TCXO, 0 },
> - { P_CORE_BI_PLL_TEST_SE, 7 },
> };
>
> static const struct clk_parent_data disp_cc_parent_data_0[] = {
> - { .fw_name = "bi_tcxo" },
> - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" },
> + { .fw_name = "xo" },
> };
>
> static const struct parent_map disp_cc_parent_map_1[] = {
> { P_BI_TCXO, 0 },
> { P_DP_PHY_PLL_LINK_CLK, 1 },
> { P_DP_PHY_PLL_VCO_DIV_CLK, 2 },
> - { P_CORE_BI_PLL_TEST_SE, 7 },
> };
>
> static const struct clk_parent_data disp_cc_parent_data_1[] = {
> - { .fw_name = "bi_tcxo" },
> - { .fw_name = "dp_phy_pll_link_clk", .name = "dp_phy_pll_link_clk" },
> - { .fw_name = "dp_phy_pll_vco_div_clk",
> - .name = "dp_phy_pll_vco_div_clk"},
> - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" },
> + { .fw_name = "xo" },
> + { .fw_name = "dp_phy_pll_link" },
> + { .fw_name = "dp_phy_pll_vco_div" },
similar comments for these too. They would conflict with our HW design
clock names.
> };
>
> static const struct parent_map disp_cc_parent_map_2[] = {
> { P_BI_TCXO, 0 },
> { P_DSI0_PHY_PLL_OUT_BYTECLK, 1 },
> - { P_CORE_BI_PLL_TEST_SE, 7 },
> };
>
> static const struct clk_parent_data disp_cc_parent_data_2[] = {
> - { .fw_name = "bi_tcxo" },
> - { .fw_name = "dsi0_phy_pll_out_byteclk",
> - .name = "dsi0_phy_pll_out_byteclk" },
> - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" },
> + { .fw_name = "xo" },
> + { .fw_name = "dsi_phy_pll_byte" },
> };
>
> static const struct parent_map disp_cc_parent_map_3[] = {
> @@ -117,40 +109,33 @@ static const struct parent_map disp_cc_parent_map_3[] = {
> { P_DISP_CC_PLL0_OUT_MAIN, 1 },
> { P_GPLL0_OUT_MAIN, 4 },
> { P_DISP_CC_PLL0_OUT_EVEN, 5 },
> - { P_CORE_BI_PLL_TEST_SE, 7 },
> };
>
> static const struct clk_parent_data disp_cc_parent_data_3[] = {
> - { .fw_name = "bi_tcxo" },
> + { .fw_name = "xo" },
> { .hw = &disp_cc_pll0.clkr.hw },
> - { .fw_name = "gcc_disp_gpll0_clk_src" },
> + { .fw_name = "gpll0" },
This is not the correct clock, we have a child/branch clock which
requires to be turned ON "gcc_disp_gpll0_clk_src" when we switch to this
source.
> { .hw = &disp_cc_pll0_out_even.clkr.hw },
> - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" },
> };
>
> static const struct parent_map disp_cc_parent_map_4[] = {
> { P_BI_TCXO, 0 },
> { P_GPLL0_OUT_MAIN, 4 },
> - { P_CORE_BI_PLL_TEST_SE, 7 },
> };
>
> static const struct clk_parent_data disp_cc_parent_data_4[] = {
> - { .fw_name = "bi_tcxo" },
> - { .fw_name = "gcc_disp_gpll0_clk_src" },
> - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" },
> + { .fw_name = "xo" },
> + { .fw_name = "gpll0" },
same comment as above.
> };
>
> static const struct parent_map disp_cc_parent_map_5[] = {
> { P_BI_TCXO, 0 },
> { P_DSI0_PHY_PLL_OUT_DSICLK, 1 },
> - { P_CORE_BI_PLL_TEST_SE, 7 },
> };
>
> static const struct clk_parent_data disp_cc_parent_data_5[] = {
> - { .fw_name = "bi_tcxo" },
> - { .fw_name = "dsi0_phy_pll_out_dsiclk",
> - .name = "dsi0_phy_pll_out_dsiclk" },
> - { .fw_name = "core_bi_pll_test_se", .name = "core_bi_pll_test_se" },
> + { .fw_name = "xo" },
> + { .fw_name = "dsi_phy_pll_pixel" },
> };
>
> static const struct freq_tbl ftbl_disp_cc_mdss_ahb_clk_src[] = {
> @@ -169,7 +154,7 @@ static struct clk_rcg2 disp_cc_mdss_ahb_clk_src = {
> .clkr.hw.init = &(struct clk_init_data){
> .name = "disp_cc_mdss_ahb_clk_src",
> .parent_data = disp_cc_parent_data_4,
> - .num_parents = 3,
> + .num_parents = ARRAY_SIZE(disp_cc_parent_data_4),
> .flags = CLK_SET_RATE_PARENT,
> .ops = &clk_rcg2_shared_ops,
> },
> @@ -183,7 +168,7 @@ static struct clk_rcg2 disp_cc_mdss_byte0_clk_src = {
> .clkr.hw.init = &(struct clk_init_data){
> .name = "disp_cc_mdss_byte0_clk_src",
> .parent_data = disp_cc_parent_data_2,
> - .num_parents = 3,
> + .num_parents = ARRAY_SIZE(disp_cc_parent_data_2),
> .flags = CLK_SET_RATE_PARENT,
> .ops = &clk_byte2_ops,
> },
> @@ -203,7 +188,7 @@ static struct clk_rcg2 disp_cc_mdss_dp_aux_clk_src = {
> .clkr.hw.init = &(struct clk_init_data){
> .name = "disp_cc_mdss_dp_aux_clk_src",
> .parent_data = disp_cc_parent_data_0,
> - .num_parents = 2,
> + .num_parents = ARRAY_SIZE(disp_cc_parent_data_0),
> .ops = &clk_rcg2_ops,
> },
> };
> @@ -216,7 +201,7 @@ static struct clk_rcg2 disp_cc_mdss_dp_crypto_clk_src = {
> .clkr.hw.init = &(struct clk_init_data){
> .name = "disp_cc_mdss_dp_crypto_clk_src",
> .parent_data = disp_cc_parent_data_1,
> - .num_parents = 4,
> + .num_parents = ARRAY_SIZE(disp_cc_parent_data_1),
> .flags = CLK_SET_RATE_PARENT,
> .ops = &clk_byte2_ops,
> },
> @@ -230,7 +215,7 @@ static struct clk_rcg2 disp_cc_mdss_dp_link_clk_src = {
> .clkr.hw.init = &(struct clk_init_data){
> .name = "disp_cc_mdss_dp_link_clk_src",
> .parent_data = disp_cc_parent_data_1,
> - .num_parents = 4,
> + .num_parents = ARRAY_SIZE(disp_cc_parent_data_1),
> .flags = CLK_SET_RATE_PARENT,
> .ops = &clk_byte2_ops,
> },
> @@ -244,7 +229,7 @@ static struct clk_rcg2 disp_cc_mdss_dp_pixel_clk_src = {
> .clkr.hw.init = &(struct clk_init_data){
> .name = "disp_cc_mdss_dp_pixel_clk_src",
> .parent_data = disp_cc_parent_data_1,
> - .num_parents = 4,
> + .num_parents = ARRAY_SIZE(disp_cc_parent_data_1),
> .flags = CLK_SET_RATE_PARENT,
> .ops = &clk_dp_ops,
> },
> @@ -259,7 +244,7 @@ static struct clk_rcg2 disp_cc_mdss_esc0_clk_src = {
> .clkr.hw.init = &(struct clk_init_data){
> .name = "disp_cc_mdss_esc0_clk_src",
> .parent_data = disp_cc_parent_data_2,
> - .num_parents = 3,
> + .num_parents = ARRAY_SIZE(disp_cc_parent_data_2),
> .ops = &clk_rcg2_ops,
> },
> };
> @@ -282,7 +267,7 @@ static struct clk_rcg2 disp_cc_mdss_mdp_clk_src = {
> .clkr.hw.init = &(struct clk_init_data){
> .name = "disp_cc_mdss_mdp_clk_src",
> .parent_data = disp_cc_parent_data_3,
> - .num_parents = 5,
> + .num_parents = ARRAY_SIZE(disp_cc_parent_data_3),
> .ops = &clk_rcg2_shared_ops,
> },
> };
> @@ -295,7 +280,7 @@ static struct clk_rcg2 disp_cc_mdss_pclk0_clk_src = {
> .clkr.hw.init = &(struct clk_init_data){
> .name = "disp_cc_mdss_pclk0_clk_src",
> .parent_data = disp_cc_parent_data_5,
> - .num_parents = 3,
> + .num_parents = ARRAY_SIZE(disp_cc_parent_data_5),
> .flags = CLK_SET_RATE_PARENT,
> .ops = &clk_pixel_ops,
> },
> @@ -310,7 +295,7 @@ static struct clk_rcg2 disp_cc_mdss_rot_clk_src = {
> .clkr.hw.init = &(struct clk_init_data){
> .name = "disp_cc_mdss_rot_clk_src",
> .parent_data = disp_cc_parent_data_3,
> - .num_parents = 5,
> + .num_parents = ARRAY_SIZE(disp_cc_parent_data_3),
> .ops = &clk_rcg2_shared_ops,
> },
> };
> @@ -324,7 +309,7 @@ static struct clk_rcg2 disp_cc_mdss_vsync_clk_src = {
> .clkr.hw.init = &(struct clk_init_data){
> .name = "disp_cc_mdss_vsync_clk_src",
> .parent_data = disp_cc_parent_data_0,
> - .num_parents = 2,
> + .num_parents = ARRAY_SIZE(disp_cc_parent_data_0),
> .ops = &clk_rcg2_shared_ops,
> },
> };
>
All the above code are auto-generated and we really do not want to
hand-code.
--
QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation.
--
next prev parent reply other threads:[~2020-01-28 5:53 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 22:42 [PATCH v2 00/10] clk: qcom: Fix parenting for dispcc/gpucc/videocc Douglas Anderson
2020-01-24 22:42 ` [PATCH v2 01/10] clk: qcom: rcg2: Don't crash if our parent can't be found; return an error Douglas Anderson
2020-01-28 17:43 ` Matthias Kaehlcke
2020-01-24 22:42 ` [PATCH v2 02/10] dt-bindings: clock: Fix qcom,dispcc bindings for sdm845/sc7180 Douglas Anderson
2020-01-24 22:42 ` [PATCH v2 03/10] arm64: dts: qcom: sdm845: Add the missing clocks on the dispcc Douglas Anderson
2020-01-24 22:42 ` [PATCH v2 04/10] dt-bindings: clock: Fix qcom,gpucc bindings for sdm845/sc7180/msm8998 Douglas Anderson
2020-01-24 22:42 ` [PATCH v2 05/10] clk: qcom: Fix sc7180 dispcc parent data Douglas Anderson
2020-01-28 5:53 ` Taniya Das [this message]
2020-01-28 16:33 ` Doug Anderson
2020-01-29 0:51 ` Stephen Boyd
2020-01-30 21:19 ` Doug Anderson
2020-01-24 22:42 ` [PATCH v2 06/10] arm64: dts: qcom: sdm845: Add the missing clocks on the gpucc Douglas Anderson
2020-01-24 22:42 ` [PATCH v2 07/10] clk: qcom: Fix sc7180 gpucc parent data Douglas Anderson
2020-01-28 5:55 ` Taniya Das
2020-01-28 16:37 ` Doug Anderson
2020-01-24 22:42 ` [PATCH v2 08/10] dt-bindings: clock: Cleanup qcom,videocc bindings for sdm845/sc7180 Douglas Anderson
2020-01-24 22:42 ` [PATCH v2 09/10] arm64: dts: qcom: sdm845: Add the missing clock on the videocc Douglas Anderson
2020-01-24 22:42 ` [PATCH v2 10/10] arm64: dts: sc7180: Add clock controller nodes Douglas Anderson
2020-01-28 5:58 ` Taniya Das
2020-01-28 16:40 ` Doug Anderson
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=149394fe-b726-15da-1c6f-a223d57a009f@codeaurora.org \
--to=tdas@codeaurora.org \
--cc=agross@kernel.org \
--cc=bjorn.andersson@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=dianders@chromium.org \
--cc=harigovi@codeaurora.org \
--cc=hoegsberg@chromium.org \
--cc=jhugo@codeaurora.org \
--cc=kalyan_t@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mka@chromium.org \
--cc=mturquette@baylibre.com \
--cc=robh@kernel.org \
--cc=sboyd@codeaurora.org \
--cc=sboyd@kernel.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).