[PATCH 1/2] cpufreq: qcom: fix compatibility issue with old binding

[PATCH 1/2] cpufreq: qcom: fix compatibility issue with old binding

[Ansuel Smith]

Binding has changed from operating-points-v2-kryo-cpu to
operating-points-v2-qcom-cpu. Also check for old binding in driver
probe.

Fixes: a8811ec764f9 cpufreq: qcom: Add support for krait based socs
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
 drivers/cpufreq/qcom-cpufreq-nvmem.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c
index a1b8238872a2..8a0411efc79a 100644
--- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
+++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
@@ -278,6 +278,10 @@ static int qcom_cpufreq_probe(struct platform_device *pdev)
 		return -ENOENT;
 
 	ret = of_device_is_compatible(np, "operating-points-v2-qcom-cpu");
+	if (!ret)
+		ret = of_device_is_compatible(np,
+					      "operating-points-v2-kyro-cpu");
+
 	if (!ret) {
 		of_node_put(np);
 		return -ENOENT;
-- 
2.25.1

[PATCH 2/2] dt-bindings: opp: Fix wrong binding in qcom-nvmem-cpufreq

[Ansuel Smith]

Update binding to new generic name "operating-points-v2-qcom-cpu"

Fixes: a8811ec764f9 cpufreq: qcom: Add support for krait based socs
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
---
 Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt b/Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
index 64f07417ecfb..537e1774f589 100644
--- a/Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
+++ b/Documentation/devicetree/bindings/opp/qcom-nvmem-cpufreq.txt
@@ -19,7 +19,7 @@ In 'cpu' nodes:
 
 In 'operating-points-v2' table:
 - compatible: Should be
-	- 'operating-points-v2-kryo-cpu' for apq8096, msm8996, msm8974,
+	- 'operating-points-v2-qcom-cpu' for apq8096, msm8996, msm8974,
 					     apq8064, ipq8064, msm8960 and ipq8074.
 
 Optional properties:
-- 
2.25.1

Re: [PATCH 1/2] cpufreq: qcom: fix compatibility issue with old binding

[Georgi Djakov]

Hi Ansuel,

On 4/22/20 17:08, Ansuel Smith wrote:
> Binding has changed from operating-points-v2-kryo-cpu to
> operating-points-v2-qcom-cpu. Also check for old binding in driver
> probe.
> 
> Fixes: a8811ec764f9 cpufreq: qcom: Add support for krait based socs

The correct format is: Fixes: %h (\"%s\")

> Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
> ---
>  drivers/cpufreq/qcom-cpufreq-nvmem.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c
> index a1b8238872a2..8a0411efc79a 100644
> --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
> +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
> @@ -278,6 +278,10 @@ static int qcom_cpufreq_probe(struct platform_device *pdev)
>  		return -ENOENT;
>  
>  	ret = of_device_is_compatible(np, "operating-points-v2-qcom-cpu");
> +	if (!ret)
> +		ret = of_device_is_compatible(np,
> +					      "operating-points-v2-kyro-cpu");

There is a typo in the compatible string.

Thanks,
Georgi

> +
>  	if (!ret) {
>  		of_node_put(np);
>  		return -ENOENT;
>