mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-03 07:38:10 +00:00
Code Issues Releases Wiki Activity

soc: mediatek: mtk-svs: use svs get efuse common function

Browse source 
SVS might need to read both svs efuse and thermal efuse on the probe flow.
Therefore, add a common efuse read function to remove the superfluous
codes.

Signed-off-by: Roger Lu <roger.lu@mediatek.com>
Link: https://lore.kernel.org/r/20230202124104.16504-2-roger.lu@mediatek.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>
This commit is contained in:
Roger Lu 2023-02-02 20:41:02 +08:00 committed by Matthias Brugger
parent fe15c26ee2
commit 9f195f3a1e
1 changed files with 25 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
drivers/soc/mediatek/mtk-svs.c
View file

@ -1729,26 +1729,28 @@ static int svs_bank_resource_setup(struct svs_platform *svsp)
return 0; return 0;
} }
static int svs_thermal_efuse_get_data(struct svs_platform *svsp) static int svs_get_efuse_data(struct svs_platform *svsp,
const char *nvmem_cell_name,
u32 **svsp_efuse, size_t *svsp_efuse_max)
{ {
struct nvmem_cell *cell; struct nvmem_cell *cell;
/* Thermal efuse parsing */ cell = nvmem_cell_get(svsp->dev, nvmem_cell_name);
cell = nvmem_cell_get(svsp->dev, "t-calibration-data");
if (IS_ERR_OR_NULL(cell)) { if (IS_ERR_OR_NULL(cell)) {
dev_err(svsp->dev, "no \"t-calibration-data\"? %ld\n", PTR_ERR(cell)); dev_err(svsp->dev, "no \"%s\"? %ld\n",
nvmem_cell_name, PTR_ERR(cell));
return PTR_ERR(cell); return PTR_ERR(cell);
} }
svsp->tefuse = nvmem_cell_read(cell, &svsp->tefuse_max); *svsp_efuse = nvmem_cell_read(cell, svsp_efuse_max);
if (IS_ERR(svsp->tefuse)) { if (IS_ERR(*svsp_efuse)) {
dev_err(svsp->dev, "cannot read thermal efuse: %ld\n", dev_err(svsp->dev, "cannot read \"%s\" efuse: %ld\n",
PTR_ERR(svsp->tefuse)); nvmem_cell_name, PTR_ERR(*svsp_efuse));
nvmem_cell_put(cell); nvmem_cell_put(cell);
return PTR_ERR(svsp->tefuse); return PTR_ERR(*svsp_efuse);
} }
svsp->tefuse_max /= sizeof(u32); *svsp_efuse_max /= sizeof(u32);
nvmem_cell_put(cell); nvmem_cell_put(cell);
return 0; return 0;
@ -1796,7 +1798,8 @@ static bool svs_mt8192_efuse_parsing(struct svs_platform *svsp)
svsb->vmax += svsb->dvt_fixed; svsb->vmax += svsb->dvt_fixed;
} }
ret = svs_thermal_efuse_get_data(svsp); ret = svs_get_efuse_data(svsp, "t-calibration-data",
&svsp->tefuse, &svsp->tefuse_max);
if (ret) if (ret)
return false; return false;
@ -1901,7 +1904,8 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp)
} }
} }
ret = svs_thermal_efuse_get_data(svsp); ret = svs_get_efuse_data(svsp, "t-calibration-data",
&svsp->tefuse, &svsp->tefuse_max);
if (ret) if (ret)
return false; return false;
@ -2003,32 +2007,6 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp)
return true; return true;
} }
static bool svs_is_efuse_data_correct(struct svs_platform *svsp)
{
struct nvmem_cell *cell;
/* Get svs efuse by nvmem */
cell = nvmem_cell_get(svsp->dev, "svs-calibration-data");
if (IS_ERR(cell)) {
dev_err(svsp->dev, "no \"svs-calibration-data\"? %ld\n",
PTR_ERR(cell));
return false;
}
svsp->efuse = nvmem_cell_read(cell, &svsp->efuse_max);
if (IS_ERR(svsp->efuse)) {
dev_err(svsp->dev, "cannot read svs efuse: %ld\n",
PTR_ERR(svsp->efuse));
nvmem_cell_put(cell);
return false;
}
svsp->efuse_max /= sizeof(u32);
nvmem_cell_put(cell);
return true;
}
static struct device *svs_get_subsys_device(struct svs_platform *svsp, static struct device *svs_get_subsys_device(struct svs_platform *svsp,
const char *node_name) const char *node_name)
{ {
@ -2364,8 +2342,9 @@ static int svs_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
if (!svs_is_efuse_data_correct(svsp)) { ret = svs_get_efuse_data(svsp, "svs-calibration-data",
dev_notice(svsp->dev, "efuse data isn't correct\n"); &svsp->efuse, &svsp->efuse_max);
if (ret) {
ret = -EPERM; ret = -EPERM;
goto svs_probe_free_efuse; goto svs_probe_free_efuse;
} }
@ -2373,19 +2352,19 @@ static int svs_probe(struct platform_device *pdev)
if (!svsp_data->efuse_parsing(svsp)) { if (!svsp_data->efuse_parsing(svsp)) {
dev_err(svsp->dev, "efuse data parsing failed\n"); dev_err(svsp->dev, "efuse data parsing failed\n");
ret = -EPERM; ret = -EPERM;
goto svs_probe_free_resource; goto svs_probe_free_tefuse;
} }
ret = svs_bank_resource_setup(svsp); ret = svs_bank_resource_setup(svsp);
if (ret) { if (ret) {
dev_err(svsp->dev, "svs bank resource setup fail: %d\n", ret); dev_err(svsp->dev, "svs bank resource setup fail: %d\n", ret);
goto svs_probe_free_resource; goto svs_probe_free_tefuse;
} }
svsp_irq = platform_get_irq(pdev, 0); svsp_irq = platform_get_irq(pdev, 0);
if (svsp_irq < 0) { if (svsp_irq < 0) {
ret = svsp_irq; ret = svsp_irq;
goto svs_probe_free_resource; goto svs_probe_free_tefuse;
} }
svsp->main_clk = devm_clk_get(svsp->dev, "main"); svsp->main_clk = devm_clk_get(svsp->dev, "main");
@ -2393,13 +2372,13 @@ static int svs_probe(struct platform_device *pdev)
dev_err(svsp->dev, "failed to get clock: %ld\n", dev_err(svsp->dev, "failed to get clock: %ld\n",
PTR_ERR(svsp->main_clk)); PTR_ERR(svsp->main_clk));
ret = PTR_ERR(svsp->main_clk); ret = PTR_ERR(svsp->main_clk);
goto svs_probe_free_resource; goto svs_probe_free_tefuse;
} }
ret = clk_prepare_enable(svsp->main_clk); ret = clk_prepare_enable(svsp->main_clk);
if (ret) { if (ret) {
dev_err(svsp->dev, "cannot enable main clk: %d\n", ret); dev_err(svsp->dev, "cannot enable main clk: %d\n", ret);
goto svs_probe_free_resource; goto svs_probe_free_tefuse;
} }
svsp->base = of_iomap(svsp->dev->of_node, 0); svsp->base = of_iomap(svsp->dev->of_node, 0);
@ -2439,7 +2418,7 @@ static int svs_probe(struct platform_device *pdev)
svs_probe_clk_disable: svs_probe_clk_disable:
clk_disable_unprepare(svsp->main_clk); clk_disable_unprepare(svsp->main_clk);
svs_probe_free_resource: svs_probe_free_tefuse:
if (!IS_ERR_OR_NULL(svsp->tefuse)) if (!IS_ERR_OR_NULL(svsp->tefuse))
kfree(svsp->tefuse); kfree(svsp->tefuse);