2023-01-23 20:18:31

by Krzysztof Kozlowski

Subject: [PATCH 1/3] clk: qcom: cpu-8996: add missing cputype include

Include asm/cputype.h to fix ARMv7 compile test error:

drivers/clk/qcom/clk-cpu-8996.c: In function ‘qcom_cpu_clk_msm8996_acd_init’:
drivers/clk/qcom/clk-cpu-8996.c:468:16: error: implicit declaration of function ‘read_cpuid_mpidr’ [-Werror=implicit-function-declaration]

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
drivers/clk/qcom/clk-cpu-8996.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/clk/qcom/clk-cpu-8996.c b/drivers/clk/qcom/clk-cpu-8996.c
index ee76ef958d31..40c4dabc20a7 100644
--- a/drivers/clk/qcom/clk-cpu-8996.c
+++ b/drivers/clk/qcom/clk-cpu-8996.c
@@ -49,6 +49,7 @@
* detect voltage droops.
*/

+#include <asm/cputype.h>
#include <linux/bitfield.h>
#include <linux/clk.h>
#include <linux/clk-provider.h>
--
2.34.1

2023-01-23 20:18:33

by Krzysztof Kozlowski

Subject: [PATCH 2/3] clk: qcom: gcc-qcs404: fix duplicated num_parents

num_parents field is being initialized twice:

gcc-qcs404.c:63:32: error: initialized field overwritten [-Werror=override-init]

Fixes: 2ce81afa0c7c ("clk: qcom: gcc-qcs404: sort out the cxo clock")
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
drivers/clk/qcom/gcc-qcs404.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
index 5f58dd82d3fe..a39c4990b29d 100644
--- a/drivers/clk/qcom/gcc-qcs404.c
+++ b/drivers/clk/qcom/gcc-qcs404.c
@@ -60,7 +60,6 @@ static struct clk_fixed_factor cxo = {
.name = "cxo",
.parent_data = gcc_parent_data_1,
.num_parents = ARRAY_SIZE(gcc_parent_data_1),
- .num_parents = 1,
.ops = &clk_fixed_factor_ops,
},
};
--
2.34.1

2023-01-23 20:18:35

by Krzysztof Kozlowski

Subject: [PATCH 3/3] clk: qcom: rpmh: fix double RPMH_IPA_CLK assignment

RPMH_IPA_CLK is assigned twice:

drivers/clk/qcom/clk-rpmh.c:578:35: error: initialized field overwritten [-Werror=override-init]

Fixes: aa055bf158cd ("clk: qcom: rpmh: define IPA clocks where required")
Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
drivers/clk/qcom/clk-rpmh.c | 1 -
1 file changed, 1 deletion(-)

diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
index 393b83f6020e..45ee370f3307 100644
--- a/drivers/clk/qcom/clk-rpmh.c
+++ b/drivers/clk/qcom/clk-rpmh.c
@@ -575,7 +575,6 @@ static struct clk_hw *sc8280xp_rpmh_clocks[] = {
[RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
[RPMH_PKA_CLK] = &clk_rpmh_pka.hw,
[RPMH_HWKM_CLK] = &clk_rpmh_hwkm.hw,
- [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
};

static const struct clk_rpmh_desc clk_rpmh_sc8280xp = {
--
2.34.1

2023-01-23 20:28:44

by Konrad Dybcio

Subject: Re: [PATCH 1/3] clk: qcom: cpu-8996: add missing cputype include

On 23.01.2023 21:18, Krzysztof Kozlowski wrote:
> Include asm/cputype.h to fix ARMv7 compile test error:
>
> drivers/clk/qcom/clk-cpu-8996.c: In function ‘qcom_cpu_clk_msm8996_acd_init’:
> drivers/clk/qcom/clk-cpu-8996.c:468:16: error: implicit declaration of function ‘read_cpuid_mpidr’ [-Werror=implicit-function-declaration]
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> drivers/clk/qcom/clk-cpu-8996.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/clk/qcom/clk-cpu-8996.c b/drivers/clk/qcom/clk-cpu-8996.c
> index ee76ef958d31..40c4dabc20a7 100644
> --- a/drivers/clk/qcom/clk-cpu-8996.c
> +++ b/drivers/clk/qcom/clk-cpu-8996.c
> @@ -49,6 +49,7 @@
> * detect voltage droops.
> */
>
> +#include <asm/cputype.h>
> #include <linux/bitfield.h>
> #include <linux/clk.h>
> #include <linux/clk-provider.h>

2023-01-23 20:28:59

by Konrad Dybcio

Subject: Re: [PATCH 2/3] clk: qcom: gcc-qcs404: fix duplicated num_parents

On 23.01.2023 21:18, Krzysztof Kozlowski wrote:
> num_parents field is being initialized twice:
>
> gcc-qcs404.c:63:32: error: initialized field overwritten [-Werror=override-init]
>
> Fixes: 2ce81afa0c7c ("clk: qcom: gcc-qcs404: sort out the cxo clock")
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
Reviewed-by: Konrad Dybcio <[email protected]>

Konrad
> drivers/clk/qcom/gcc-qcs404.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c
> index 5f58dd82d3fe..a39c4990b29d 100644
> --- a/drivers/clk/qcom/gcc-qcs404.c
> +++ b/drivers/clk/qcom/gcc-qcs404.c
> @@ -60,7 +60,6 @@ static struct clk_fixed_factor cxo = {
> .name = "cxo",
> .parent_data = gcc_parent_data_1,
> .num_parents = ARRAY_SIZE(gcc_parent_data_1),
> - .num_parents = 1,
> .ops = &clk_fixed_factor_ops,
> },
> };

2023-01-23 20:29:43

by Konrad Dybcio

Subject: Re: [PATCH 3/3] clk: qcom: rpmh: fix double RPMH_IPA_CLK assignment

On 23.01.2023 21:18, Krzysztof Kozlowski wrote:
> RPMH_IPA_CLK is assigned twice:
>
> drivers/clk/qcom/clk-rpmh.c:578:35: error: initialized field overwritten [-Werror=override-init]
>
> Fixes: aa055bf158cd ("clk: qcom: rpmh: define IPA clocks where required")
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git/commit/?h=for-next&id=19aeacf505a08ae8fc1e087f9d85b7caf29b09b4

Konrad
> drivers/clk/qcom/clk-rpmh.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/drivers/clk/qcom/clk-rpmh.c b/drivers/clk/qcom/clk-rpmh.c
> index 393b83f6020e..45ee370f3307 100644
> --- a/drivers/clk/qcom/clk-rpmh.c
> +++ b/drivers/clk/qcom/clk-rpmh.c
> @@ -575,7 +575,6 @@ static struct clk_hw *sc8280xp_rpmh_clocks[] = {
> [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> [RPMH_PKA_CLK] = &clk_rpmh_pka.hw,
> [RPMH_HWKM_CLK] = &clk_rpmh_hwkm.hw,
> - [RPMH_IPA_CLK] = &clk_rpmh_ipa.hw,
> };
>
> static const struct clk_rpmh_desc clk_rpmh_sc8280xp = {

2023-01-25 20:33:13

by Stephen Boyd

Subject: Re: [PATCH 1/3] clk: qcom: cpu-8996: add missing cputype include

Quoting Krzysztof Kozlowski (2023-01-23 12:18:10)
> diff --git a/drivers/clk/qcom/clk-cpu-8996.c b/drivers/clk/qcom/clk-cpu-8996.c
> index ee76ef958d31..40c4dabc20a7 100644
> --- a/drivers/clk/qcom/clk-cpu-8996.c
> +++ b/drivers/clk/qcom/clk-cpu-8996.c
> @@ -49,6 +49,7 @@
> * detect voltage droops.
> */
>
> +#include <asm/cputype.h>

Please include asm headers after linux headers

> #include <linux/bitfield.h>
> #include <linux/clk.h>
> #include <linux/clk-provider.h>

2023-01-25 20:33:44

by Stephen Boyd

Subject: Re: [PATCH 2/3] clk: qcom: gcc-qcs404: fix duplicated num_parents

Quoting Krzysztof Kozlowski (2023-01-23 12:18:11)
> num_parents field is being initialized twice:
>
> gcc-qcs404.c:63:32: error: initialized field overwritten [-Werror=override-init]
>
> Fixes: 2ce81afa0c7c ("clk: qcom: gcc-qcs404: sort out the cxo clock")
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---

Reviewed-by: Stephen Boyd <[email protected]>

2023-01-25 20:34:16

by Stephen Boyd

Subject: Re: [PATCH 3/3] clk: qcom: rpmh: fix double RPMH_IPA_CLK assignment

Quoting Krzysztof Kozlowski (2023-01-23 12:18:12)
> RPMH_IPA_CLK is assigned twice:
>
> drivers/clk/qcom/clk-rpmh.c:578:35: error: initialized field overwritten [-Werror=override-init]
>
> Fixes: aa055bf158cd ("clk: qcom: rpmh: define IPA clocks where required")
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---

Reviewed-by: Stephen Boyd <[email protected]>

2023-01-26 09:32:44

by Krzysztof Kozlowski

Subject: Re: [PATCH 1/3] clk: qcom: cpu-8996: add missing cputype include

On 25/01/2023 21:33, Stephen Boyd wrote:
> Quoting Krzysztof Kozlowski (2023-01-23 12:18:10)
>> diff --git a/drivers/clk/qcom/clk-cpu-8996.c b/drivers/clk/qcom/clk-cpu-8996.c
>> index ee76ef958d31..40c4dabc20a7 100644
>> --- a/drivers/clk/qcom/clk-cpu-8996.c
>> +++ b/drivers/clk/qcom/clk-cpu-8996.c
>> @@ -49,6 +49,7 @@
>> * detect voltage droops.
>> */
>>
>> +#include <asm/cputype.h>
>
> Please include asm headers after linux headers

Ack

Best regards,
Krzysztof

2023-02-09 04:31:48

by Bjorn Andersson

Subject: Re: (subset) [PATCH 1/3] clk: qcom: cpu-8996: add missing cputype include

On Mon, 23 Jan 2023 21:18:10 +0100, Krzysztof Kozlowski wrote:
> Include asm/cputype.h to fix ARMv7 compile test error:
>
> drivers/clk/qcom/clk-cpu-8996.c: In function ‘qcom_cpu_clk_msm8996_acd_init’:
> drivers/clk/qcom/clk-cpu-8996.c:468:16: error: implicit declaration of function ‘read_cpuid_mpidr’ [-Werror=implicit-function-declaration]
>
>

Applied, thanks!

[1/3] clk: qcom: cpu-8996: add missing cputype include
commit: 5930196eec0d5dc454db6418d82dcfb094c93373
[2/3] clk: qcom: gcc-qcs404: fix duplicated num_parents
(no commit info)
[3/3] clk: qcom: rpmh: fix double RPMH_IPA_CLK assignment
(no commit info)

Best regards,
--
Bjorn Andersson <[email protected]>