| Message ID | 20220504130540.5902-4-rex-bc.chen@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | cpufreq: mediatek: Cleanup and support MT8183 and MT8186 | expand |
On 04-05-22, 21:05, Rex-BC Chen wrote: > From: Jia-Wei Chang <jia-wei.chang@mediatek.com> > > Voltages and shifts are defined as macros originally. > There are different requirements of these values for each MediaTek SoCs. > Therefore, we add the platform data and move these values into it. > > Signed-off-by: Jia-Wei Chang <jia-wei.chang@mediatek.com> > Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com> > Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > drivers/cpufreq/mediatek-cpufreq.c | 90 ++++++++++++++++++++---------- > 1 file changed, 61 insertions(+), 29 deletions(-) > > diff --git a/drivers/cpufreq/mediatek-cpufreq.c b/drivers/cpufreq/mediatek-cpufreq.c > index 363ebecb2c80..80a3d4cd49ed 100644 > --- a/drivers/cpufreq/mediatek-cpufreq.c > +++ b/drivers/cpufreq/mediatek-cpufreq.c > @@ -10,15 +10,21 @@ > #include <linux/cpumask.h> > #include <linux/module.h> > #include <linux/of.h> > +#include <linux/of_platform.h> > #include <linux/platform_device.h> > #include <linux/pm_opp.h> > #include <linux/regulator/consumer.h> > > -#define MIN_VOLT_SHIFT (100000) > -#define MAX_VOLT_SHIFT (200000) > -#define MAX_VOLT_LIMIT (1150000) > #define VOLT_TOL (10000) > > +struct mtk_cpufreq_platform_data { > + int min_volt_shift; > + int max_volt_shift; > + int proc_max_volt; > + int sram_min_volt; > + int sram_max_volt; > +}; > + > /* > * The struct mtk_cpu_dvfs_info holds necessary information for doing CPU DVFS > * on each CPU power/clock domain of Mediatek SoCs. Each CPU cluster in > @@ -46,8 +52,11 @@ struct mtk_cpu_dvfs_info { > struct notifier_block opp_nb; > unsigned int opp_cpu; > unsigned long opp_freq; > + const struct mtk_cpufreq_platform_data *soc_data; > }; > > +static struct platform_device *cpufreq_pdev; > + > static LIST_HEAD(dvfs_info_list); > > static struct mtk_cpu_dvfs_info *mtk_cpu_dvfs_info_lookup(int cpu) > @@ -65,6 +74,7 @@ static struct mtk_cpu_dvfs_info *mtk_cpu_dvfs_info_lookup(int cpu) > static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, > int new_vproc) > { > + const struct mtk_cpufreq_platform_data *soc_data = info->soc_data; > struct regulator *proc_reg = info->proc_reg; > struct regulator *sram_reg = info->sram_reg; > int pre_vproc, pre_vsram, new_vsram, vsram, vproc, ret; > @@ -76,7 +86,8 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, > return pre_vproc; > } > /* Vsram should not exceed the maximum allowed voltage of SoC. */ > - new_vsram = min(new_vproc + MIN_VOLT_SHIFT, MAX_VOLT_LIMIT); > + new_vsram = min(new_vproc + soc_data->min_volt_shift, > + soc_data->sram_max_volt); > > if (pre_vproc < new_vproc) { > /* > @@ -99,10 +110,11 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, > return pre_vproc; > } > > - vsram = min(new_vsram, pre_vproc + MAX_VOLT_SHIFT); > + vsram = min(new_vsram, > + pre_vproc + soc_data->min_volt_shift); > > - if (vsram + VOLT_TOL >= MAX_VOLT_LIMIT) { > - vsram = MAX_VOLT_LIMIT; > + if (vsram + VOLT_TOL >= soc_data->sram_max_volt) { > + vsram = soc_data->sram_max_volt; > > /* > * If the target Vsram hits the maximum voltage, > @@ -120,7 +132,7 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, > ret = regulator_set_voltage(sram_reg, vsram, > vsram + VOLT_TOL); > > - vproc = vsram - MIN_VOLT_SHIFT; > + vproc = vsram - soc_data->min_volt_shift; > } > if (ret) > return ret; > @@ -154,7 +166,8 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, > return pre_vsram; > } > > - vproc = max(new_vproc, pre_vsram - MAX_VOLT_SHIFT); > + vproc = max(new_vproc, > + pre_vsram - soc_data->max_volt_shift); > ret = regulator_set_voltage(proc_reg, vproc, > vproc + VOLT_TOL); > if (ret) > @@ -163,10 +176,11 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, > if (vproc == new_vproc) > vsram = new_vsram; > else > - vsram = max(new_vsram, vproc + MIN_VOLT_SHIFT); > + vsram = max(new_vsram, > + vproc + soc_data->min_volt_shift); > > - if (vsram + VOLT_TOL >= MAX_VOLT_LIMIT) { > - vsram = MAX_VOLT_LIMIT; > + if (vsram + VOLT_TOL >= soc_data->sram_max_volt) { > + vsram = soc_data->sram_max_volt; > > /* > * If the target Vsram hits the maximum voltage, > @@ -197,13 +211,14 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, > > static int mtk_cpufreq_set_voltage(struct mtk_cpu_dvfs_info *info, int vproc) > { > + const struct mtk_cpufreq_platform_data *soc_data = info->soc_data; > int ret; > > if (info->need_voltage_tracking) > ret = mtk_cpufreq_voltage_tracking(info, vproc); > else > ret = regulator_set_voltage(info->proc_reg, vproc, > - MAX_VOLT_LIMIT); > + soc_data->proc_max_volt); > if (!ret) > info->pre_vproc = vproc; > > @@ -583,9 +598,17 @@ static struct cpufreq_driver mtk_cpufreq_driver = { > > static int mtk_cpufreq_probe(struct platform_device *pdev) > { > + const struct of_device_id *match; > struct mtk_cpu_dvfs_info *info, *tmp; > int cpu, ret; > > + match = dev_get_platdata(&pdev->dev); > + if (!match || !match->data) { > + dev_err(&pdev->dev, > + "failed to get mtk cpufreq platform data\n"); > + return -ENODEV; > + } > + > for_each_possible_cpu(cpu) { > info = mtk_cpu_dvfs_info_lookup(cpu); > if (info) > @@ -597,6 +620,7 @@ static int mtk_cpufreq_probe(struct platform_device *pdev) > goto release_dvfs_info_list; > } > > + info->soc_data = match->data; > ret = mtk_cpu_dvfs_info_init(info, cpu); > if (ret) { > dev_err(&pdev->dev, > @@ -632,20 +656,27 @@ static struct platform_driver mtk_cpufreq_platdrv = { > .probe = mtk_cpufreq_probe, > }; > > +static const struct mtk_cpufreq_platform_data mt2701_platform_data = { > + .min_volt_shift = 100000, > + .max_volt_shift = 200000, > + .proc_max_volt = 1150000, > + .sram_min_volt = 0, > + .sram_max_volt = 1150000, > +}; > + > /* List of machines supported by this driver */ > static const struct of_device_id mtk_cpufreq_machines[] __initconst = { > - { .compatible = "mediatek,mt2701", }, > - { .compatible = "mediatek,mt2712", }, > - { .compatible = "mediatek,mt7622", }, > - { .compatible = "mediatek,mt7623", }, > - { .compatible = "mediatek,mt8167", }, > - { .compatible = "mediatek,mt817x", }, > - { .compatible = "mediatek,mt8173", }, > - { .compatible = "mediatek,mt8176", }, > - { .compatible = "mediatek,mt8183", }, > - { .compatible = "mediatek,mt8365", }, > - { .compatible = "mediatek,mt8516", }, > - > + { .compatible = "mediatek,mt2701", .data = &mt2701_platform_data }, > + { .compatible = "mediatek,mt2712", .data = &mt2701_platform_data }, > + { .compatible = "mediatek,mt7622", .data = &mt2701_platform_data }, > + { .compatible = "mediatek,mt7623", .data = &mt2701_platform_data }, > + { .compatible = "mediatek,mt8167", .data = &mt2701_platform_data }, > + { .compatible = "mediatek,mt817x", .data = &mt2701_platform_data }, > + { .compatible = "mediatek,mt8173", .data = &mt2701_platform_data }, > + { .compatible = "mediatek,mt8176", .data = &mt2701_platform_data }, > + { .compatible = "mediatek,mt8183", .data = &mt2701_platform_data }, > + { .compatible = "mediatek,mt8365", .data = &mt2701_platform_data }, > + { .compatible = "mediatek,mt8516", .data = &mt2701_platform_data }, > { } > }; > MODULE_DEVICE_TABLE(of, mtk_cpufreq_machines); > @@ -654,7 +685,6 @@ static int __init mtk_cpufreq_driver_init(void) > { > struct device_node *np; > const struct of_device_id *match; > - struct platform_device *pdev; > int err; > > np = of_find_node_by_path("/"); > @@ -678,11 +708,12 @@ static int __init mtk_cpufreq_driver_init(void) > * and the device registration codes are put here to handle defer > * probing. > */ > - pdev = platform_device_register_simple("mtk-cpufreq", -1, NULL, 0); > - if (IS_ERR(pdev)) { > + cpufreq_pdev = platform_device_register_data(NULL, "mtk-cpufreq", -1, > + match, sizeof(*match)); Why pass match here instead of just the data ? > + if (IS_ERR(cpufreq_pdev)) { > pr_err("failed to register mtk-cpufreq platform device\n"); > platform_driver_unregister(&mtk_cpufreq_platdrv); > - return PTR_ERR(pdev); > + return PTR_ERR(cpufreq_pdev); > } > > return 0; > @@ -691,6 +722,7 @@ module_init(mtk_cpufreq_driver_init) > > static void __exit mtk_cpufreq_driver_exit(void) > { > + platform_device_unregister(cpufreq_pdev); You fixed a bug silently :) That's not right. > platform_driver_unregister(&mtk_cpufreq_platdrv); > } > module_exit(mtk_cpufreq_driver_exit) > -- > 2.18.0
On Thu, 2022-05-05 at 14:22 +0530, Viresh Kumar wrote: > On 04-05-22, 21:05, Rex-BC Chen wrote: > > From: Jia-Wei Chang <jia-wei.chang@mediatek.com> > > > > Voltages and shifts are defined as macros originally. > > There are different requirements of these values for each MediaTek > > SoCs. > > Therefore, we add the platform data and move these values into it. > > > > Signed-off-by: Jia-Wei Chang <jia-wei.chang@mediatek.com> > > Signed-off-by: Rex-BC Chen <rex-bc.chen@mediatek.com> > > Reviewed-by: AngeloGioacchino Del Regno < > > angelogioacchino.delregno@collabora.com> > > --- > > drivers/cpufreq/mediatek-cpufreq.c | 90 ++++++++++++++++++++---- > > ------ > > 1 file changed, 61 insertions(+), 29 deletions(-) > > > > diff --git a/drivers/cpufreq/mediatek-cpufreq.c > > b/drivers/cpufreq/mediatek-cpufreq.c > > index 363ebecb2c80..80a3d4cd49ed 100644 > > --- a/drivers/cpufreq/mediatek-cpufreq.c > > +++ b/drivers/cpufreq/mediatek-cpufreq.c > > @@ -10,15 +10,21 @@ > > #include <linux/cpumask.h> > > #include <linux/module.h> > > #include <linux/of.h> > > +#include <linux/of_platform.h> > > #include <linux/platform_device.h> > > #include <linux/pm_opp.h> > > #include <linux/regulator/consumer.h> > > > > -#define MIN_VOLT_SHIFT (100000) > > -#define MAX_VOLT_SHIFT (200000) > > -#define MAX_VOLT_LIMIT (1150000) > > #define VOLT_TOL (10000) > > > > +struct mtk_cpufreq_platform_data { > > + int min_volt_shift; > > + int max_volt_shift; > > + int proc_max_volt; > > + int sram_min_volt; > > + int sram_max_volt; > > +}; > > + > > /* > > * The struct mtk_cpu_dvfs_info holds necessary information for > > doing CPU DVFS > > * on each CPU power/clock domain of Mediatek SoCs. Each CPU > > cluster in > > @@ -46,8 +52,11 @@ struct mtk_cpu_dvfs_info { > > struct notifier_block opp_nb; > > unsigned int opp_cpu; > > unsigned long opp_freq; > > + const struct mtk_cpufreq_platform_data *soc_data; > > }; > > > > +static struct platform_device *cpufreq_pdev; > > + > > static LIST_HEAD(dvfs_info_list); > > > > static struct mtk_cpu_dvfs_info *mtk_cpu_dvfs_info_lookup(int cpu) > > @@ -65,6 +74,7 @@ static struct mtk_cpu_dvfs_info > > *mtk_cpu_dvfs_info_lookup(int cpu) > > static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info > > *info, > > int new_vproc) > > { > > + const struct mtk_cpufreq_platform_data *soc_data = info- > > >soc_data; > > struct regulator *proc_reg = info->proc_reg; > > struct regulator *sram_reg = info->sram_reg; > > int pre_vproc, pre_vsram, new_vsram, vsram, vproc, ret; > > @@ -76,7 +86,8 @@ static int mtk_cpufreq_voltage_tracking(struct > > mtk_cpu_dvfs_info *info, > > return pre_vproc; > > } > > /* Vsram should not exceed the maximum allowed voltage of SoC. > > */ > > - new_vsram = min(new_vproc + MIN_VOLT_SHIFT, MAX_VOLT_LIMIT); > > + new_vsram = min(new_vproc + soc_data->min_volt_shift, > > + soc_data->sram_max_volt); > > > > if (pre_vproc < new_vproc) { > > /* > > @@ -99,10 +110,11 @@ static int mtk_cpufreq_voltage_tracking(struct > > mtk_cpu_dvfs_info *info, > > return pre_vproc; > > } > > > > - vsram = min(new_vsram, pre_vproc + > > MAX_VOLT_SHIFT); > > + vsram = min(new_vsram, > > + pre_vproc + soc_data- > > >min_volt_shift); > > > > - if (vsram + VOLT_TOL >= MAX_VOLT_LIMIT) { > > - vsram = MAX_VOLT_LIMIT; > > + if (vsram + VOLT_TOL >= soc_data- > > >sram_max_volt) { > > + vsram = soc_data->sram_max_volt; > > > > /* > > * If the target Vsram hits the maximum > > voltage, > > @@ -120,7 +132,7 @@ static int mtk_cpufreq_voltage_tracking(struct > > mtk_cpu_dvfs_info *info, > > ret = regulator_set_voltage(sram_reg, > > vsram, > > vsram + > > VOLT_TOL); > > > > - vproc = vsram - MIN_VOLT_SHIFT; > > + vproc = vsram - soc_data- > > >min_volt_shift; > > } > > if (ret) > > return ret; > > @@ -154,7 +166,8 @@ static int mtk_cpufreq_voltage_tracking(struct > > mtk_cpu_dvfs_info *info, > > return pre_vsram; > > } > > > > - vproc = max(new_vproc, pre_vsram - > > MAX_VOLT_SHIFT); > > + vproc = max(new_vproc, > > + pre_vsram - soc_data- > > >max_volt_shift); > > ret = regulator_set_voltage(proc_reg, vproc, > > vproc + VOLT_TOL); > > if (ret) > > @@ -163,10 +176,11 @@ static int > > mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, > > if (vproc == new_vproc) > > vsram = new_vsram; > > else > > - vsram = max(new_vsram, vproc + > > MIN_VOLT_SHIFT); > > + vsram = max(new_vsram, > > + vproc + soc_data- > > >min_volt_shift); > > > > - if (vsram + VOLT_TOL >= MAX_VOLT_LIMIT) { > > - vsram = MAX_VOLT_LIMIT; > > + if (vsram + VOLT_TOL >= soc_data- > > >sram_max_volt) { > > + vsram = soc_data->sram_max_volt; > > > > /* > > * If the target Vsram hits the maximum > > voltage, > > @@ -197,13 +211,14 @@ static int > > mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, > > > > static int mtk_cpufreq_set_voltage(struct mtk_cpu_dvfs_info *info, > > int vproc) > > { > > + const struct mtk_cpufreq_platform_data *soc_data = info- > > >soc_data; > > int ret; > > > > if (info->need_voltage_tracking) > > ret = mtk_cpufreq_voltage_tracking(info, vproc); > > else > > ret = regulator_set_voltage(info->proc_reg, vproc, > > - MAX_VOLT_LIMIT); > > + soc_data->proc_max_volt); > > if (!ret) > > info->pre_vproc = vproc; > > > > @@ -583,9 +598,17 @@ static struct cpufreq_driver > > mtk_cpufreq_driver = { > > > > static int mtk_cpufreq_probe(struct platform_device *pdev) > > { > > + const struct of_device_id *match; > > struct mtk_cpu_dvfs_info *info, *tmp; > > int cpu, ret; > > > > + match = dev_get_platdata(&pdev->dev); > > + if (!match || !match->data) { > > + dev_err(&pdev->dev, > > + "failed to get mtk cpufreq platform data\n"); > > + return -ENODEV; > > + } > > + > > for_each_possible_cpu(cpu) { > > info = mtk_cpu_dvfs_info_lookup(cpu); > > if (info) > > @@ -597,6 +620,7 @@ static int mtk_cpufreq_probe(struct > > platform_device *pdev) > > goto release_dvfs_info_list; > > } > > > > + info->soc_data = match->data; > > ret = mtk_cpu_dvfs_info_init(info, cpu); > > if (ret) { > > dev_err(&pdev->dev, > > @@ -632,20 +656,27 @@ static struct platform_driver > > mtk_cpufreq_platdrv = { > > .probe = mtk_cpufreq_probe, > > }; > > > > +static const struct mtk_cpufreq_platform_data mt2701_platform_data > > = { > > + .min_volt_shift = 100000, > > + .max_volt_shift = 200000, > > + .proc_max_volt = 1150000, > > + .sram_min_volt = 0, > > + .sram_max_volt = 1150000, > > +}; > > + > > /* List of machines supported by this driver */ > > static const struct of_device_id mtk_cpufreq_machines[] > > __initconst = { > > - { .compatible = "mediatek,mt2701", }, > > - { .compatible = "mediatek,mt2712", }, > > - { .compatible = "mediatek,mt7622", }, > > - { .compatible = "mediatek,mt7623", }, > > - { .compatible = "mediatek,mt8167", }, > > - { .compatible = "mediatek,mt817x", }, > > - { .compatible = "mediatek,mt8173", }, > > - { .compatible = "mediatek,mt8176", }, > > - { .compatible = "mediatek,mt8183", }, > > - { .compatible = "mediatek,mt8365", }, > > - { .compatible = "mediatek,mt8516", }, > > - > > + { .compatible = "mediatek,mt2701", .data = > > &mt2701_platform_data }, > > + { .compatible = "mediatek,mt2712", .data = > > &mt2701_platform_data }, > > + { .compatible = "mediatek,mt7622", .data = > > &mt2701_platform_data }, > > + { .compatible = "mediatek,mt7623", .data = > > &mt2701_platform_data }, > > + { .compatible = "mediatek,mt8167", .data = > > &mt2701_platform_data }, > > + { .compatible = "mediatek,mt817x", .data = > > &mt2701_platform_data }, > > + { .compatible = "mediatek,mt8173", .data = > > &mt2701_platform_data }, > > + { .compatible = "mediatek,mt8176", .data = > > &mt2701_platform_data }, > > + { .compatible = "mediatek,mt8183", .data = > > &mt2701_platform_data }, > > + { .compatible = "mediatek,mt8365", .data = > > &mt2701_platform_data }, > > + { .compatible = "mediatek,mt8516", .data = > > &mt2701_platform_data }, > > { } > > }; > > MODULE_DEVICE_TABLE(of, mtk_cpufreq_machines); > > @@ -654,7 +685,6 @@ static int __init mtk_cpufreq_driver_init(void) > > { > > struct device_node *np; > > const struct of_device_id *match; > > - struct platform_device *pdev; > > int err; > > > > np = of_find_node_by_path("/"); > > @@ -678,11 +708,12 @@ static int __init > > mtk_cpufreq_driver_init(void) > > * and the device registration codes are put here to handle > > defer > > * probing. > > */ > > - pdev = platform_device_register_simple("mtk-cpufreq", -1, NULL, > > 0); > > - if (IS_ERR(pdev)) { > > + cpufreq_pdev = platform_device_register_data(NULL, "mtk- > > cpufreq", -1, > > + match, > > sizeof(*match)); > > Why pass match here instead of just the data ? > Hello Viresh, Thanks for your review. I will pass data directly in next version. > > + if (IS_ERR(cpufreq_pdev)) { > > pr_err("failed to register mtk-cpufreq platform > > device\n"); > > platform_driver_unregister(&mtk_cpufreq_platdrv); > > - return PTR_ERR(pdev); > > + return PTR_ERR(cpufreq_pdev); > > } > > > > return 0; > > @@ -691,6 +722,7 @@ module_init(mtk_cpufreq_driver_init) > > > > static void __exit mtk_cpufreq_driver_exit(void) > > { > > + platform_device_unregister(cpufreq_pdev); > > You fixed a bug silently :) > > That's not right. > I will move this modification to another patch. BRs, Rex > > platform_driver_unregister(&mtk_cpufreq_platdrv); > > } > > module_exit(mtk_cpufreq_driver_exit) > > -- > > 2.18.0 > >
diff --git a/drivers/cpufreq/mediatek-cpufreq.c b/drivers/cpufreq/mediatek-cpufreq.c index 363ebecb2c80..80a3d4cd49ed 100644 --- a/drivers/cpufreq/mediatek-cpufreq.c +++ b/drivers/cpufreq/mediatek-cpufreq.c @@ -10,15 +10,21 @@ #include <linux/cpumask.h> #include <linux/module.h> #include <linux/of.h> +#include <linux/of_platform.h> #include <linux/platform_device.h> #include <linux/pm_opp.h> #include <linux/regulator/consumer.h> -#define MIN_VOLT_SHIFT (100000) -#define MAX_VOLT_SHIFT (200000) -#define MAX_VOLT_LIMIT (1150000) #define VOLT_TOL (10000) +struct mtk_cpufreq_platform_data { + int min_volt_shift; + int max_volt_shift; + int proc_max_volt; + int sram_min_volt; + int sram_max_volt; +}; + /* * The struct mtk_cpu_dvfs_info holds necessary information for doing CPU DVFS * on each CPU power/clock domain of Mediatek SoCs. Each CPU cluster in @@ -46,8 +52,11 @@ struct mtk_cpu_dvfs_info { struct notifier_block opp_nb; unsigned int opp_cpu; unsigned long opp_freq; + const struct mtk_cpufreq_platform_data *soc_data; }; +static struct platform_device *cpufreq_pdev; + static LIST_HEAD(dvfs_info_list); static struct mtk_cpu_dvfs_info *mtk_cpu_dvfs_info_lookup(int cpu) @@ -65,6 +74,7 @@ static struct mtk_cpu_dvfs_info *mtk_cpu_dvfs_info_lookup(int cpu) static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, int new_vproc) { + const struct mtk_cpufreq_platform_data *soc_data = info->soc_data; struct regulator *proc_reg = info->proc_reg; struct regulator *sram_reg = info->sram_reg; int pre_vproc, pre_vsram, new_vsram, vsram, vproc, ret; @@ -76,7 +86,8 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, return pre_vproc; } /* Vsram should not exceed the maximum allowed voltage of SoC. */ - new_vsram = min(new_vproc + MIN_VOLT_SHIFT, MAX_VOLT_LIMIT); + new_vsram = min(new_vproc + soc_data->min_volt_shift, + soc_data->sram_max_volt); if (pre_vproc < new_vproc) { /* @@ -99,10 +110,11 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, return pre_vproc; } - vsram = min(new_vsram, pre_vproc + MAX_VOLT_SHIFT); + vsram = min(new_vsram, + pre_vproc + soc_data->min_volt_shift); - if (vsram + VOLT_TOL >= MAX_VOLT_LIMIT) { - vsram = MAX_VOLT_LIMIT; + if (vsram + VOLT_TOL >= soc_data->sram_max_volt) { + vsram = soc_data->sram_max_volt; /* * If the target Vsram hits the maximum voltage, @@ -120,7 +132,7 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, ret = regulator_set_voltage(sram_reg, vsram, vsram + VOLT_TOL); - vproc = vsram - MIN_VOLT_SHIFT; + vproc = vsram - soc_data->min_volt_shift; } if (ret) return ret; @@ -154,7 +166,8 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, return pre_vsram; } - vproc = max(new_vproc, pre_vsram - MAX_VOLT_SHIFT); + vproc = max(new_vproc, + pre_vsram - soc_data->max_volt_shift); ret = regulator_set_voltage(proc_reg, vproc, vproc + VOLT_TOL); if (ret) @@ -163,10 +176,11 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, if (vproc == new_vproc) vsram = new_vsram; else - vsram = max(new_vsram, vproc + MIN_VOLT_SHIFT); + vsram = max(new_vsram, + vproc + soc_data->min_volt_shift); - if (vsram + VOLT_TOL >= MAX_VOLT_LIMIT) { - vsram = MAX_VOLT_LIMIT; + if (vsram + VOLT_TOL >= soc_data->sram_max_volt) { + vsram = soc_data->sram_max_volt; /* * If the target Vsram hits the maximum voltage, @@ -197,13 +211,14 @@ static int mtk_cpufreq_voltage_tracking(struct mtk_cpu_dvfs_info *info, static int mtk_cpufreq_set_voltage(struct mtk_cpu_dvfs_info *info, int vproc) { + const struct mtk_cpufreq_platform_data *soc_data = info->soc_data; int ret; if (info->need_voltage_tracking) ret = mtk_cpufreq_voltage_tracking(info, vproc); else ret = regulator_set_voltage(info->proc_reg, vproc, - MAX_VOLT_LIMIT); + soc_data->proc_max_volt); if (!ret) info->pre_vproc = vproc; @@ -583,9 +598,17 @@ static struct cpufreq_driver mtk_cpufreq_driver = { static int mtk_cpufreq_probe(struct platform_device *pdev) { + const struct of_device_id *match; struct mtk_cpu_dvfs_info *info, *tmp; int cpu, ret; + match = dev_get_platdata(&pdev->dev); + if (!match || !match->data) { + dev_err(&pdev->dev, + "failed to get mtk cpufreq platform data\n"); + return -ENODEV; + } + for_each_possible_cpu(cpu) { info = mtk_cpu_dvfs_info_lookup(cpu); if (info) @@ -597,6 +620,7 @@ static int mtk_cpufreq_probe(struct platform_device *pdev) goto release_dvfs_info_list; } + info->soc_data = match->data; ret = mtk_cpu_dvfs_info_init(info, cpu); if (ret) { dev_err(&pdev->dev, @@ -632,20 +656,27 @@ static struct platform_driver mtk_cpufreq_platdrv = { .probe = mtk_cpufreq_probe, }; +static const struct mtk_cpufreq_platform_data mt2701_platform_data = { + .min_volt_shift = 100000, + .max_volt_shift = 200000, + .proc_max_volt = 1150000, + .sram_min_volt = 0, + .sram_max_volt = 1150000, +}; + /* List of machines supported by this driver */ static const struct of_device_id mtk_cpufreq_machines[] __initconst = { - { .compatible = "mediatek,mt2701", }, - { .compatible = "mediatek,mt2712", }, - { .compatible = "mediatek,mt7622", }, - { .compatible = "mediatek,mt7623", }, - { .compatible = "mediatek,mt8167", }, - { .compatible = "mediatek,mt817x", }, - { .compatible = "mediatek,mt8173", }, - { .compatible = "mediatek,mt8176", }, - { .compatible = "mediatek,mt8183", }, - { .compatible = "mediatek,mt8365", }, - { .compatible = "mediatek,mt8516", }, - + { .compatible = "mediatek,mt2701", .data = &mt2701_platform_data }, + { .compatible = "mediatek,mt2712", .data = &mt2701_platform_data }, + { .compatible = "mediatek,mt7622", .data = &mt2701_platform_data }, + { .compatible = "mediatek,mt7623", .data = &mt2701_platform_data }, + { .compatible = "mediatek,mt8167", .data = &mt2701_platform_data }, + { .compatible = "mediatek,mt817x", .data = &mt2701_platform_data }, + { .compatible = "mediatek,mt8173", .data = &mt2701_platform_data }, + { .compatible = "mediatek,mt8176", .data = &mt2701_platform_data }, + { .compatible = "mediatek,mt8183", .data = &mt2701_platform_data }, + { .compatible = "mediatek,mt8365", .data = &mt2701_platform_data }, + { .compatible = "mediatek,mt8516", .data = &mt2701_platform_data }, { } }; MODULE_DEVICE_TABLE(of, mtk_cpufreq_machines); @@ -654,7 +685,6 @@ static int __init mtk_cpufreq_driver_init(void) { struct device_node *np; const struct of_device_id *match; - struct platform_device *pdev; int err; np = of_find_node_by_path("/"); @@ -678,11 +708,12 @@ static int __init mtk_cpufreq_driver_init(void) * and the device registration codes are put here to handle defer * probing. */ - pdev = platform_device_register_simple("mtk-cpufreq", -1, NULL, 0); - if (IS_ERR(pdev)) { + cpufreq_pdev = platform_device_register_data(NULL, "mtk-cpufreq", -1, + match, sizeof(*match)); + if (IS_ERR(cpufreq_pdev)) { pr_err("failed to register mtk-cpufreq platform device\n"); platform_driver_unregister(&mtk_cpufreq_platdrv); - return PTR_ERR(pdev); + return PTR_ERR(cpufreq_pdev); } return 0; @@ -691,6 +722,7 @@ module_init(mtk_cpufreq_driver_init) static void __exit mtk_cpufreq_driver_exit(void) { + platform_device_unregister(cpufreq_pdev); platform_driver_unregister(&mtk_cpufreq_platdrv); } module_exit(mtk_cpufreq_driver_exit)