Message ID | 1526303520-5843-1-git-send-email-ilialin@codeaurora.org |
---|---|
Headers | show |
Series | CPU scaling support for msm8996 | expand |
On 14-05-18, 16:11, Ilia Lin wrote: > Signed-off-by: Ilia Lin <ilialin@codeaurora.org> > --- > arch/arm64/boot/dts/qcom/msm8996.dtsi | 269 ++++++++++++++++++++++++++++++++-- > 1 file changed, 260 insertions(+), 9 deletions(-) Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
On 14-05-18, 16:11, Ilia Lin wrote: > 1. Add syscon node for the SAW CPU registers > 2. Add SAW regulators gang definition for s8-s11 > 3. Add voltages to the OPP tables > 4. Add the s11 SAW regulator as CPU regulator > > Signed-off-by: Ilia Lin <ilialin@codeaurora.org> > --- > arch/arm64/boot/dts/qcom/msm8996.dtsi | 75 +++++++++++++++++++++++++++++++++++ > 1 file changed, 75 insertions(+) Acked-by: Viresh Kumar <viresh.kumar@linaro.org>
On 14-05-18, 16:11, Ilia Lin wrote: > +static int __init qcom_cpufreq_kryo_driver_init(void) > +{ > + size_t len; > + int ret; > + u32 versions; > + enum _msm8996_version msm8996_version; > + u8 *speedbin; > + struct device *cpu_dev; > + struct device_node *np; > + struct nvmem_cell *speedbin_nvmem; > + struct opp_table *opp_temp = NULL; > + > + cpu_dev = get_cpu_device(SILVER_LEAD); > + if (IS_ERR_OR_NULL(cpu_dev)) > + return PTR_ERR(cpu_dev); > + > + msm8996_version = qcom_cpufreq_kryo_get_msm_id(); > + if (NUM_OF_MSM8996_VERSIONS == msm8996_version) { > + dev_err(cpu_dev, "Not Snapdragon 820/821!"); > + return -ENODEV; > + } > + > + np = dev_pm_opp_of_get_opp_desc_node(cpu_dev); > + if (IS_ERR_OR_NULL(np)) > + return PTR_ERR(np); > + > + if (!of_device_is_compatible(np, "operating-points-v2-kryo-cpu")) { > + ret = -ENOENT; > + goto free_np; > + } > + > + speedbin_nvmem = of_nvmem_cell_get(np, NULL); > + if (IS_ERR(speedbin_nvmem)) { > + ret = PTR_ERR(speedbin_nvmem); > + dev_err(cpu_dev, "Could not get nvmem cell: %d\n", ret); > + goto free_np; > + } > + > + speedbin = nvmem_cell_read(speedbin_nvmem, &len); > + > + switch (msm8996_version) { > + case MSM8996_V3: > + versions = 1 << (unsigned int)(*speedbin); > + break; > + case MSM8996_SG: > + versions = 1 << ((unsigned int)(*speedbin) + 4); > + break; > + default: > + BUG(); > + break; > + } > + > + ret = PTR_ERR_OR_ZERO(opp_temp = \ Why back slash here ? > + dev_pm_opp_set_supported_hw(cpu_dev,&versions,1)); > + if (0 > ret) > + goto free_np; > + > + dev_pm_opp_put_supported_hw(opp_temp); > + > + cpu_dev = get_cpu_device(GOLD_LEAD); > + ret = PTR_ERR_OR_ZERO(opp_temp = \ And here. > + dev_pm_opp_set_supported_hw(cpu_dev,&versions,1)); > + if (0 > ret) > + goto free_np; > + > + ret = PTR_ERR_OR_ZERO(platform_device_register_simple("cpufreq-dt", \ and here. > + -1, NULL, 0)); > + > + dev_pm_opp_put_supported_hw(opp_temp); And this is wrong. You don't need to call this in success case here. It may have worked for you as cpufreq-dt driver would have already been initialized, but that's not the case always. For example try inserting cpufreq-dt module after kernel boots and it will fail. > + > +free_np: > + of_node_put(np); > + > + return ret; > +} > +late_initcall(qcom_cpufreq_kryo_driver_init); > + > +MODULE_DESCRIPTION("Qualcomm Technologies, Inc. Kryo CPUfreq driver"); > +MODULE_LICENSE("GPL v2"); > -- > 1.9.1
On 14-05-18, 16:12, Ilia Lin wrote: > Signed-off-by: Ilia Lin <ilialin@codeaurora.org> > --- > arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 2 +- > arch/arm64/boot/dts/qcom/msm8996.dtsi | 310 +++++++++++++++++++++++++++- > 2 files changed, 309 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts > index 230e9c8..da23bda 100644 > --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dts > +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dts > @@ -17,5 +17,5 @@ > > / { > model = "Qualcomm Technologies, Inc. DB820c"; > - compatible = "arrow,apq8096-db820c", "qcom,apq8096-sbc"; > + compatible = "arrow,apq8096-db820c", "qcom,apq8096-sbc", "qcom,apq8096"; > }; > diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi > index d7adef9..fbf92f6 100644 > --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi > +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi > @@ -174,218 +174,519 @@ > }; > > cluster0_opp: opp_table0 { > - compatible = "operating-points-v2"; > + compatible = "operating-points-v2-kryo-cpu"; I think you need to mention both the above compatible strings here with the kyro one mentioned first.