Re: [PATCH 3/3] clk: qcom: gcc-msm8939: Make silicon specific updates for msm8939
From: Stephen Boyd
Date: Tue Apr 21 2020 - 22:56:23 EST
Quoting Bryan O'Donoghue (2020-04-19 05:18:08)
> The msm8939 is based on the msm8916. It is compatible in several ways but,
> has additional functional blocks added which require additional PLL
> sources. In some cases functional blocks from the msm8916 have different
> clock sources or different supported frequencies.
>
> This patch encapsulates the conversion from msm8916 to msm8939.
>
> Cc: Andy Gross <agross@xxxxxxxxxx>
> Cc: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> Cc: Michael Turquette <mturquette@xxxxxxxxxxxx>
> Cc: Stephen Boyd <sboyd@xxxxxxxxxx>
> Cc: Rob Herring <robh+dt@xxxxxxxxxx>
> Cc: Philipp Zabel <p.zabel@xxxxxxxxxxxxxx>
> Cc: linux-arm-msm@xxxxxxxxxxxxxxx
> Cc: linux-clk@xxxxxxxxxxxxxxx
> Cc: linux-kernel@xxxxxxxxxxxxxxx
> Cc: devicetree@xxxxxxxxxxxxxxx
> Signed-off-by: Shawn Guo <shawn.guo@xxxxxxxxxx>
> Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
> ---
> drivers/clk/qcom/gcc-msm8939.c | 832 ++++++++++++++++++++++++++++-----
> 1 file changed, 709 insertions(+), 123 deletions(-)
>
Please use the new way of specifying clk parents with the clk_hw and DT
based way. Some qcom clk drivers have already migrated. If this is a
copy of the other driver then perhaps also modify that one in the series
so that git can find the copy still. Sigh I still haven't written the
documentation about it!
Look for .parent_data in drivers/clk/qcom/gcc-sc7180.c for the best
guidance.
> @@ -1695,6 +1997,7 @@ static struct clk_branch gcc_blsp1_qup4_spi_apps_clk = {
> },
> };
>
> +/* CBCR/halt_reg value derived from code only */
> static struct clk_branch gcc_blsp1_qup5_i2c_apps_clk = {
> .halt_reg = 0x06020,
> .clkr = {
> @@ -1712,6 +2015,7 @@ static struct clk_branch gcc_blsp1_qup5_i2c_apps_clk = {
> },
> };
>
> +/* CBCR/halt_reg value derived from code only */
> static struct clk_branch gcc_blsp1_qup5_spi_apps_clk = {
> .halt_reg = 0x0601c,
> .clkr = {
> @@ -1729,6 +2033,7 @@ static struct clk_branch gcc_blsp1_qup5_spi_apps_clk = {
> },
> };
>
> +/* CBCR/halt_reg value derived from code only */
> static struct clk_branch gcc_blsp1_qup6_i2c_apps_clk = {
> .halt_reg = 0x07020,
> .clkr = {
> @@ -1746,6 +2051,7 @@ static struct clk_branch gcc_blsp1_qup6_i2c_apps_clk = {
> },
> };
>
> +/* CBCR/halt_reg value derived from code only */
> static struct clk_branch gcc_blsp1_qup6_spi_apps_clk = {
> .halt_reg = 0x0701c,
> .clkr = {
> @@ -1797,6 +2103,7 @@ static struct clk_branch gcc_blsp1_uart2_apps_clk = {
> },
> };
>
> +/* CBCR/halt_reg value derived from code only */
> static struct clk_branch gcc_boot_rom_ahb_clk = {
> .halt_reg = 0x1300c,
> .halt_check = BRANCH_HALT_VOTED,
> @@ -2341,6 +2648,7 @@ static struct clk_branch gcc_camss_vfe_axi_clk = {
> },
> };
>
> +/* CBCR/halt_reg value derived from code only */
> static struct clk_branch gcc_crypto_ahb_clk = {
> .halt_reg = 0x16024,
> .halt_check = BRANCH_HALT_VOTED,
> @@ -2359,6 +2667,7 @@ static struct clk_branch gcc_crypto_ahb_clk = {
> },
> };
>
> +/* CBCR/halt_reg value derived from code only */
> static struct clk_branch gcc_crypto_axi_clk = {
> .halt_reg = 0x16020,
> .halt_check = BRANCH_HALT_VOTED,
> @@ -2377,6 +2686,7 @@ static struct clk_branch gcc_crypto_axi_clk = {
> },
> };
>
> +/* CBCR/halt_reg value derived from code only */
> static struct clk_branch gcc_crypto_clk = {
> .halt_reg = 0x1601c,
> .halt_check = BRANCH_HALT_VOTED,
> @@ -2650,6 +3011,7 @@ static struct clk_branch gcc_oxili_gfx3d_clk = {
> },
> };
>
> +/* CBCR/halt_reg value derived from code only */
> static struct clk_branch gcc_pdm2_clk = {
> .halt_reg = 0x4400c,
> .clkr = {
> @@ -2667,6 +3029,7 @@ static struct clk_branch gcc_pdm2_clk = {
> },
> };
>
> +/* CBCR/halt_reg value derived from code only */
> static struct clk_branch gcc_pdm_ahb_clk = {
> .halt_reg = 0x44004,
> .clkr = {
> @@ -2684,6 +3047,7 @@ static struct clk_branch gcc_pdm_ahb_clk = {
> },
> };
>
> +/* CBCR/halt_reg value derived from code only */
Drop these useless comments.