diff mbox series

[v3,08/10] clk: qcom: gcc-mdm9615: drop the cxo clock

Message ID 20230512211727.3445575-9-dmitry.baryshkov@linaro.org (mailing list archive)
State Awaiting Upstream, archived
Headers show
Series clk: qcom: convert mdm9615 to parent_hws/_data | expand

Commit Message

Dmitry Baryshkov May 12, 2023, 9:17 p.m. UTC 
The gcc and lcc devices have been switched to the DT-defined cxo_board
clock. Now we can drop the manually defined cxo clock.

Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
---
 drivers/clk/qcom/gcc-mdm9615.c | 17 -----------------
 1 file changed, 17 deletions(-)

Comments

Konrad Dybcio May 15, 2023, 11:40 a.m. UTC | #1 
On 12.05.2023 23:17, Dmitry Baryshkov wrote:
> The gcc and lcc devices have been switched to the DT-defined cxo_board
> clock. Now we can drop the manually defined cxo clock.
> 
> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>

Konrad
>  drivers/clk/qcom/gcc-mdm9615.c | 17 -----------------
>  1 file changed, 17 deletions(-)
> 
> diff --git a/drivers/clk/qcom/gcc-mdm9615.c b/drivers/clk/qcom/gcc-mdm9615.c
> index 458c18b639db..64d4f508e43a 100644
> --- a/drivers/clk/qcom/gcc-mdm9615.c
> +++ b/drivers/clk/qcom/gcc-mdm9615.c
> @@ -26,17 +26,6 @@
>  #include "clk-branch.h"
>  #include "reset.h"
>  
> -static struct clk_fixed_factor cxo = {
> -	.mult = 1,
> -	.div = 1,
> -	.hw.init = &(struct clk_init_data){
> -		.name = "cxo",
> -		.parent_names = (const char *[]){ "cxo_board" },
> -		.num_parents = 1,
> -		.ops = &clk_fixed_factor_ops,
> -	},
> -};
> -
>  enum {
>  	DT_CXO,
>  	DT_PLL4,
> @@ -1623,10 +1612,6 @@ static struct clk_branch ebi2_aon_clk = {
>  	},
>  };
>  
> -static struct clk_hw *gcc_mdm9615_hws[] = {
> -	&cxo.hw,
> -};
> -
>  static struct clk_regmap *gcc_mdm9615_clks[] = {
>  	[PLL0] = &pll0.clkr,
>  	[PLL0_VOTE] = &pll0_vote,
> @@ -1736,8 +1721,6 @@ static const struct qcom_cc_desc gcc_mdm9615_desc = {
>  	.num_clks = ARRAY_SIZE(gcc_mdm9615_clks),
>  	.resets = gcc_mdm9615_resets,
>  	.num_resets = ARRAY_SIZE(gcc_mdm9615_resets),
> -	.clk_hws = gcc_mdm9615_hws,
> -	.num_clk_hws = ARRAY_SIZE(gcc_mdm9615_hws),
>  };
>  
>  static const struct of_device_id gcc_mdm9615_match_table[] = {
Bjorn Andersson June 13, 2023, 11:41 p.m. UTC | #2 
On Sat, May 13, 2023 at 12:17:25AM +0300, Dmitry Baryshkov wrote:
> The gcc and lcc devices have been switched to the DT-defined cxo_board
> clock. Now we can drop the manually defined cxo clock.
> 

Perhaps I'm reading this incorrectly, but don't you introduce that clock
in DT in the next commit? It would be nice to allow for at least some
overlap between existing dtb and the new scheme.

Regards,
Bjorn

> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
>  drivers/clk/qcom/gcc-mdm9615.c | 17 -----------------
>  1 file changed, 17 deletions(-)
> 
> diff --git a/drivers/clk/qcom/gcc-mdm9615.c b/drivers/clk/qcom/gcc-mdm9615.c
> index 458c18b639db..64d4f508e43a 100644
> --- a/drivers/clk/qcom/gcc-mdm9615.c
> +++ b/drivers/clk/qcom/gcc-mdm9615.c
> @@ -26,17 +26,6 @@
>  #include "clk-branch.h"
>  #include "reset.h"
>  
> -static struct clk_fixed_factor cxo = {
> -	.mult = 1,
> -	.div = 1,
> -	.hw.init = &(struct clk_init_data){
> -		.name = "cxo",
> -		.parent_names = (const char *[]){ "cxo_board" },
> -		.num_parents = 1,
> -		.ops = &clk_fixed_factor_ops,
> -	},
> -};
> -
>  enum {
>  	DT_CXO,
>  	DT_PLL4,
> @@ -1623,10 +1612,6 @@ static struct clk_branch ebi2_aon_clk = {
>  	},
>  };
>  
> -static struct clk_hw *gcc_mdm9615_hws[] = {
> -	&cxo.hw,
> -};
> -
>  static struct clk_regmap *gcc_mdm9615_clks[] = {
>  	[PLL0] = &pll0.clkr,
>  	[PLL0_VOTE] = &pll0_vote,
> @@ -1736,8 +1721,6 @@ static const struct qcom_cc_desc gcc_mdm9615_desc = {
>  	.num_clks = ARRAY_SIZE(gcc_mdm9615_clks),
>  	.resets = gcc_mdm9615_resets,
>  	.num_resets = ARRAY_SIZE(gcc_mdm9615_resets),
> -	.clk_hws = gcc_mdm9615_hws,
> -	.num_clk_hws = ARRAY_SIZE(gcc_mdm9615_hws),
>  };
>  
>  static const struct of_device_id gcc_mdm9615_match_table[] = {
> -- 
> 2.39.2
>
Dmitry Baryshkov June 21, 2023, 2:15 p.m. UTC | #3 
On 14/06/2023 02:41, Bjorn Andersson wrote:
> On Sat, May 13, 2023 at 12:17:25AM +0300, Dmitry Baryshkov wrote:
>> The gcc and lcc devices have been switched to the DT-defined cxo_board
>> clock. Now we can drop the manually defined cxo clock.
>>
> 
> Perhaps I'm reading this incorrectly, but don't you introduce that clock
> in DT in the next commit? It would be nice to allow for at least some
> overlap between existing dtb and the new scheme.

No, this clock existed in DT for some time, I'm just removing the 
necessity for an intermediate clock in the gcc driver.

> 
> Regards,
> Bjorn
> 
>> Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
>> ---
>>   drivers/clk/qcom/gcc-mdm9615.c | 17 -----------------
>>   1 file changed, 17 deletions(-)
>>
>> diff --git a/drivers/clk/qcom/gcc-mdm9615.c b/drivers/clk/qcom/gcc-mdm9615.c
>> index 458c18b639db..64d4f508e43a 100644
>> --- a/drivers/clk/qcom/gcc-mdm9615.c
>> +++ b/drivers/clk/qcom/gcc-mdm9615.c
>> @@ -26,17 +26,6 @@
>>   #include "clk-branch.h"
>>   #include "reset.h"
>>   
>> -static struct clk_fixed_factor cxo = {
>> -	.mult = 1,
>> -	.div = 1,
>> -	.hw.init = &(struct clk_init_data){
>> -		.name = "cxo",
>> -		.parent_names = (const char *[]){ "cxo_board" },
>> -		.num_parents = 1,
>> -		.ops = &clk_fixed_factor_ops,
>> -	},
>> -};
>> -
>>   enum {
>>   	DT_CXO,
>>   	DT_PLL4,
>> @@ -1623,10 +1612,6 @@ static struct clk_branch ebi2_aon_clk = {
>>   	},
>>   };
>>   
>> -static struct clk_hw *gcc_mdm9615_hws[] = {
>> -	&cxo.hw,
>> -};
>> -
>>   static struct clk_regmap *gcc_mdm9615_clks[] = {
>>   	[PLL0] = &pll0.clkr,
>>   	[PLL0_VOTE] = &pll0_vote,
>> @@ -1736,8 +1721,6 @@ static const struct qcom_cc_desc gcc_mdm9615_desc = {
>>   	.num_clks = ARRAY_SIZE(gcc_mdm9615_clks),
>>   	.resets = gcc_mdm9615_resets,
>>   	.num_resets = ARRAY_SIZE(gcc_mdm9615_resets),
>> -	.clk_hws = gcc_mdm9615_hws,
>> -	.num_clk_hws = ARRAY_SIZE(gcc_mdm9615_hws),
>>   };
>>   
>>   static const struct of_device_id gcc_mdm9615_match_table[] = {
>> -- 
>> 2.39.2
>>
diff mbox series

Patch

diff --git a/drivers/clk/qcom/gcc-mdm9615.c b/drivers/clk/qcom/gcc-mdm9615.c
index 458c18b639db..64d4f508e43a 100644
--- a/drivers/clk/qcom/gcc-mdm9615.c
+++ b/drivers/clk/qcom/gcc-mdm9615.c
@@ -26,17 +26,6 @@ 
 #include "clk-branch.h"
 #include "reset.h"
 
-static struct clk_fixed_factor cxo = {
-	.mult = 1,
-	.div = 1,
-	.hw.init = &(struct clk_init_data){
-		.name = "cxo",
-		.parent_names = (const char *[]){ "cxo_board" },
-		.num_parents = 1,
-		.ops = &clk_fixed_factor_ops,
-	},
-};
-
 enum {
 	DT_CXO,
 	DT_PLL4,
@@ -1623,10 +1612,6 @@  static struct clk_branch ebi2_aon_clk = {
 	},
 };
 
-static struct clk_hw *gcc_mdm9615_hws[] = {
-	&cxo.hw,
-};
-
 static struct clk_regmap *gcc_mdm9615_clks[] = {
 	[PLL0] = &pll0.clkr,
 	[PLL0_VOTE] = &pll0_vote,
@@ -1736,8 +1721,6 @@  static const struct qcom_cc_desc gcc_mdm9615_desc = {
 	.num_clks = ARRAY_SIZE(gcc_mdm9615_clks),
 	.resets = gcc_mdm9615_resets,
 	.num_resets = ARRAY_SIZE(gcc_mdm9615_resets),
-	.clk_hws = gcc_mdm9615_hws,
-	.num_clk_hws = ARRAY_SIZE(gcc_mdm9615_hws),
 };
 
 static const struct of_device_id gcc_mdm9615_match_table[] = {