soc: mediatek: mtk-svs: Move t-calibration-data retrieval to svs_probe()
authorAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Tue, 21 Nov 2023 12:50:33 +0000 (13:50 +0100)
committerAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Mon, 11 Dec 2023 10:36:13 +0000 (11:36 +0100)
The t-calibration-data (SVS-Thermal calibration data) shall exist for
all SoCs or SVS won't work anyway: move it to the common svs_probe()
function and remove it from all of the per-SoC efuse_parsing() probe
callbacks.

Link: https://lore.kernel.org/r/20231121125044.78642-10-angelogioacchino.delregno@collabora.com
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
drivers/soc/mediatek/mtk-svs.c

index ab564d48092bc3da7079d6009afa8a349a0da288..1042af2aee3fc2fc0dcc4b214e96a7f36d06f5aa 100644 (file)
@@ -1884,11 +1884,6 @@ static bool svs_mt8195_efuse_parsing(struct svs_platform *svsp)
                svsb->vmax += svsb->dvt_fixed;
        }
 
-       ret = svs_get_efuse_data(svsp, "t-calibration-data",
-                                &svsp->tefuse, &svsp->tefuse_max);
-       if (ret)
-               return false;
-
        for (i = 0; i < svsp->tefuse_max; i++)
                if (svsp->tefuse[i] != 0)
                        break;
@@ -1949,11 +1944,6 @@ static bool svs_mt8192_efuse_parsing(struct svs_platform *svsp)
                svsb->vmax += svsb->dvt_fixed;
        }
 
-       ret = svs_get_efuse_data(svsp, "t-calibration-data",
-                                &svsp->tefuse, &svsp->tefuse_max);
-       if (ret)
-               return false;
-
        for (i = 0; i < svsp->tefuse_max; i++)
                if (svsp->tefuse[i] != 0)
                        break;
@@ -2009,11 +1999,6 @@ static bool svs_mt8188_efuse_parsing(struct svs_platform *svsp)
                svsb->vmax += svsb->dvt_fixed;
        }
 
-       ret = svs_get_efuse_data(svsp, "t-calibration-data",
-                                &svsp->tefuse, &svsp->tefuse_max);
-       if (ret)
-               return false;
-
        for (i = 0; i < svsp->tefuse_max; i++)
                if (svsp->tefuse[i] != 0)
                        break;
@@ -2097,11 +2082,6 @@ static bool svs_mt8186_efuse_parsing(struct svs_platform *svsp)
                svsb->vmax += svsb->dvt_fixed;
        }
 
-       ret = svs_get_efuse_data(svsp, "t-calibration-data",
-                                &svsp->tefuse, &svsp->tefuse_max);
-       if (ret)
-               return false;
-
        golden_temp = (svsp->tefuse[0] >> 24) & GENMASK(7, 0);
        if (!golden_temp)
                golden_temp = 50;
@@ -2198,11 +2178,6 @@ static bool svs_mt8183_efuse_parsing(struct svs_platform *svsp)
                }
        }
 
-       ret = svs_get_efuse_data(svsp, "t-calibration-data",
-                                &svsp->tefuse, &svsp->tefuse_max);
-       if (ret)
-               return false;
-
        /* Thermal efuse parsing */
        adc_ge_t = (svsp->tefuse[1] >> 22) & GENMASK(9, 0);
        adc_oe_t = (svsp->tefuse[1] >> 12) & GENMASK(9, 0);
@@ -3040,8 +3015,13 @@ static int svs_probe(struct platform_device *pdev)
 
        ret = svs_get_efuse_data(svsp, "svs-calibration-data",
                                 &svsp->efuse, &svsp->efuse_max);
+       if (ret)
+               return dev_err_probe(&pdev->dev, ret, "Cannot read SVS calibration\n");
+
+       ret = svs_get_efuse_data(svsp, "t-calibration-data",
+                                &svsp->tefuse, &svsp->tefuse_max);
        if (ret) {
-               ret = -EPERM;
+               dev_err_probe(&pdev->dev, ret, "Cannot read SVS-Thermal calibration\n");
                goto svs_probe_free_efuse;
        }