[PATCH v9 2/5] thermal: mediatek: control buffer enablement tweaks

[Daniel Lezcano]

On 27/01/2023 23:21, Amjad Ouled-Ameur wrote:
> 
> On 1/27/23 22:48, Daniel Lezcano wrote:
>> On 27/01/2023 16:44, Amjad Ouled-Ameur wrote:
>>> From: Markus Schneider-Pargmann <msp at baylibre.com>
>>>
>>> Add logic in order to be able to turn on the control buffer on MT8365.
>>> This change now allows to have control buffer support for 
>>> MTK_THERMAL_V1,
>>> and it allows to define the register offset, and mask used to enable it.
>>>
>>> Signed-off-by: Markus Schneider-Pargmann <msp at baylibre.com>
>>> Signed-off-by: Fabien Parent <fparent at baylibre.com>
>>> Signed-off-by: Amjad Ouled-Ameur <aouledameur at baylibre.com>
>>> Reviewed-by: AngeloGioacchino Del Regno 
>>> <angelogioacchino.delregno at collabora.com>
>>> ---
>>>   drivers/thermal/mtk_thermal.c | 25 ++++++++++++++++++-------
>>>   1 file changed, 18 insertions(+), 7 deletions(-)
>>>
>>> diff --git a/drivers/thermal/mtk_thermal.c 
>>> b/drivers/thermal/mtk_thermal.c
>>> index 8440692e3890..d8ddceb75372 100644
>>> --- a/drivers/thermal/mtk_thermal.c
>>> +++ b/drivers/thermal/mtk_thermal.c
>>> @@ -271,6 +271,9 @@ struct mtk_thermal_data {
>>>       bool need_switch_bank;
>>>       struct thermal_bank_cfg bank_data[MAX_NUM_ZONES];
>>>       enum mtk_thermal_version version;
>>> +    u32 apmixed_buffer_ctl_reg;
>>> +    u32 apmixed_buffer_ctl_mask;
>>> +    u32 apmixed_buffer_ctl_set;
>>>   };
>>>     struct mtk_thermal {
>>> @@ -514,6 +517,9 @@ static const struct mtk_thermal_data 
>>> mt7622_thermal_data = {
>>>       .adcpnp = mt7622_adcpnp,
>>>       .sensor_mux_values = mt7622_mux_values,
>>>       .version = MTK_THERMAL_V2,
>>> +    .apmixed_buffer_ctl_reg = APMIXED_SYS_TS_CON1,
>>> +    .apmixed_buffer_ctl_mask = GENMASK(31, 6) | BIT(3),
>>> +    .apmixed_buffer_ctl_set = BIT(0),
>>>   };
>>>     /*
>>> @@ -963,14 +969,18 @@ static const struct of_device_id 
>>> mtk_thermal_of_match[] = {
>>>   };
>>>   MODULE_DEVICE_TABLE(of, mtk_thermal_of_match);
>>>   -static void mtk_thermal_turn_on_buffer(void __iomem *apmixed_base)
>>> +static void mtk_thermal_turn_on_buffer(struct mtk_thermal *mt,
>>> +                       void __iomem *apmixed_base)
>>>   {
>>> -    int tmp;
>>> +    u32 tmp;
>>> +
>>> +    if (!mt->conf->apmixed_buffer_ctl_reg)
>>> +        return;
>>>   -    tmp = readl(apmixed_base + APMIXED_SYS_TS_CON1);
>>> -    tmp &= ~(0x37);
>>> -    tmp |= 0x1;
>>> -    writel(tmp, apmixed_base + APMIXED_SYS_TS_CON1);
>>> +    tmp = readl(apmixed_base + mt->conf->apmixed_buffer_ctl_reg);
>>> +    tmp &= mt->conf->apmixed_buffer_ctl_mask;
>>> +    tmp |= mt->conf->apmixed_buffer_ctl_set;
>>> +    writel(tmp, apmixed_base + mt->conf->apmixed_buffer_ctl_reg);
>>>       udelay(200);
>>>   }
>>>   @@ -1070,8 +1080,9 @@ static int mtk_thermal_probe(struct 
>>> platform_device *pdev)
>>>           goto err_disable_clk_auxadc;
>>>       }
>>>   +    mtk_thermal_turn_on_buffer(mt, apmixed_base);
>>> +
>>>       if (mt->conf->version == MTK_THERMAL_V2) {
>>> -        mtk_thermal_turn_on_buffer(apmixed_base);
>>>           mtk_thermal_release_periodic_ts(mt, auxadc_base);
>>>       }
>>
>> This change conflicts with commit 4f2ee0aa2e706
>>
>> I fixed it with:
>>
>> -       if (mt->conf->version != MTK_THERMAL_V1) {
>> -               mtk_thermal_turn_on_buffer(apmixed_base);
>> +       mtk_thermal_turn_on_buffer(apmixed_base);
>> +
>> +       if (mt->conf->version != MTK_THERMAL_V1)
>>                 mtk_thermal_release_periodic_ts(mt, auxadc_base);
>> -       }
>>
> I think it's rather MTK_THERMAL_V2 and not MTK_THERMAL_V1. Other than 
> that, it looks

It was before if (version == MTK_THERMAL_V2). Now there is a V3, so it 
is replaced by if (version != MTK_THERMAL_V1) in order to include the V3


>> Let me know if there is something wrong.
>>
>>

-- 
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog