thermal/drivers/k3_j72xx_bandgap: Remove fuse_base from structure

'fuse_base' is only needed during the initial probe function to provide
data for a software trimming method for some of TI's devices affected by
the i2128 erratum. The devices not affected will not use this region

Remove fuse_base from the main k3_j72xx_bandgap structure

Signed-off-by: Bryan Brattlof <bb@ti.com>
Link: https://lore.kernel.org/r/20221031232702.10339-4-bb@ti.com
Signed-off-by: Daniel Lezcano <daniel.lezcano@kernel.org>

diff --git a/drivers/thermal/k3_j72xx_bandgap.c b/drivers/thermal/k3_j72xx_bandgap.c
index b9d20026771a532dde8234e5bffc91786e4427e4..395a73cb3742529acecb8f46770e8f166a9932a5 100644 (file)
--- a/drivers/thermal/k3_j72xx_bandgap.c
+++ b/drivers/thermal/k3_j72xx_bandgap.c
@@ -177,7 +177,6 @@ struct k3_j72xx_bandgap {
        struct device *dev;
        void __iomem *base;
        void __iomem *cfg2_base;
-       void __iomem *fuse_base;
        struct k3_thermal_data *ts_data[K3_VTM_MAX_NUM_TS];
 };
 
@@ -276,7 +275,7 @@ static int k3_j72xx_bandgap_temp_to_adc_code(int temp)
 }
 
 static void get_efuse_values(int id, struct k3_thermal_data *data, int *err,
-                            struct k3_j72xx_bandgap *bgp)
+                            void __iomem *fuse_base)
 {
        int i, tmp, pow;
        int ct_offsets[5][K3_VTM_CORRECTION_TEMP_CNT] = {
@@ -298,16 +297,16 @@ static void get_efuse_values(int id, struct k3_thermal_data *data, int *err,
                /* Extract the offset value using bit-mask */
                if (ct_offsets[id][i] == -1 && i == 1) {
                        /* 25C offset Case of Sensor 2 split between 2 regs */
-                       tmp = (readl(bgp->fuse_base + 0x8) & 0xE0000000) >> (29);
-                       tmp |= ((readl(bgp->fuse_base + 0xC) & 0x1F) << 3);
+                       tmp = (readl(fuse_base + 0x8) & 0xE0000000) >> (29);
+                       tmp |= ((readl(fuse_base + 0xC) & 0x1F) << 3);
                        pow = tmp & 0x80;
                } else if (ct_offsets[id][i] == -1 && i == 2) {
                        /* 125C Case of Sensor 3 split between 2 regs */
-                       tmp = (readl(bgp->fuse_base + 0x4) & 0xF8000000) >> (27);
-                       tmp |= ((readl(bgp->fuse_base + 0x8) & 0xF) << 5);
+                       tmp = (readl(fuse_base + 0x4) & 0xF8000000) >> (27);
+                       tmp |= ((readl(fuse_base + 0x8) & 0xF) << 5);
                        pow = tmp & 0x100;
                } else {
-                       tmp = readl(bgp->fuse_base + ct_offsets[id][i]);
+                       tmp = readl(fuse_base + ct_offsets[id][i]);
                        tmp &= ct_bm[id][i];
                        tmp = tmp >> __ffs(ct_bm[id][i]);
 
@@ -356,6 +355,7 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev)
        struct thermal_zone_device *ti_thermal;
        int *ref_table;
        struct err_values err_vals;
+       void __iomem *fuse_base;
 
        const s64 golden_factors[] = {
                -490019999999999936,
@@ -387,9 +387,9 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev)
                return PTR_ERR(bgp->cfg2_base);
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, 2);
-       bgp->fuse_base = devm_ioremap_resource(dev, res);
-       if (IS_ERR(bgp->fuse_base))
-               return PTR_ERR(bgp->fuse_base);
+       fuse_base = devm_ioremap_resource(dev, res);
+       if (IS_ERR(fuse_base))
+               return PTR_ERR(fuse_base);
 
        driver_data = of_device_get_match_data(dev);
        if (driver_data)
@@ -428,7 +428,7 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev)
        }
 
        /* Workaround not needed if bit30/bit31 is set even for J721e */
-       if (workaround_needed && (readl(bgp->fuse_base + 0x0) & 0xc0000000) == 0xc0000000)
+       if (workaround_needed && (readl(fuse_base + 0x0) & 0xc0000000) == 0xc0000000)
                workaround_needed = false;
 
        dev_dbg(bgp->dev, "Work around %sneeded\n",
@@ -452,7 +452,7 @@ static int k3_j72xx_bandgap_probe(struct platform_device *pdev)
                        err_vals.refs[1] = PLUS30CREF;
                        err_vals.refs[2] = PLUS125CREF;
                        err_vals.refs[3] = PLUS150CREF;
-                       get_efuse_values(id, &data[id], err_vals.errs, bgp);
+                       get_efuse_values(id, &data[id], err_vals.errs, fuse_base);
                }
 
                if (id == 0 && workaround_needed)