* [PATCH v4 2/4] thermal: mediatek: control buffer enablement tweaks
@ 2022-09-09 7:37 Amjad Ouled-Ameur
2022-09-09 8:35 ` AngeloGioacchino Del Regno
2022-09-09 8:37 ` AngeloGioacchino Del Regno
0 siblings, 2 replies; 3+ messages in thread
From: Amjad Ouled-Ameur @ 2022-09-09 7:37 UTC (permalink / raw)
To: matthias.bgg
Cc: Markus Schneider-Pargmann, rafael, fparent, amitk,
daniel.lezcano, devicetree, krzysztof.kozlowski+dt,
linux-arm-kernel, linux-kernel, linux-mediatek, linux-pm,
robh+dt, rui.zhang, Amjad Ouled-Ameur
From: Markus Schneider-Pargmann <msp@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@baylibre.com>
Signed-off-by: Fabien Parent <fparent@baylibre.com>
Signed-off-by: Amjad Ouled-Ameur <aouledameur@baylibre.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);
}
--
2.37.3
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v4 2/4] thermal: mediatek: control buffer enablement tweaks
2022-09-09 7:37 [PATCH v4 2/4] thermal: mediatek: control buffer enablement tweaks Amjad Ouled-Ameur
@ 2022-09-09 8:35 ` AngeloGioacchino Del Regno
2022-09-09 8:37 ` AngeloGioacchino Del Regno
1 sibling, 0 replies; 3+ messages in thread
From: AngeloGioacchino Del Regno @ 2022-09-09 8:35 UTC (permalink / raw)
To: Amjad Ouled-Ameur, matthias.bgg
Cc: Markus Schneider-Pargmann, rafael, fparent, amitk,
daniel.lezcano, devicetree, krzysztof.kozlowski+dt,
linux-arm-kernel, linux-kernel, linux-mediatek, linux-pm,
robh+dt, rui.zhang
Il 09/09/22 09:37, Amjad Ouled-Ameur ha scritto:
> From: Markus Schneider-Pargmann <msp@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@baylibre.com>
> Signed-off-by: Fabien Parent <fparent@baylibre.com>
> Signed-off-by: Amjad Ouled-Ameur <aouledameur@baylibre.com>
Hello Amjad,
I agree with these changes, but I can't give you my R-b tag: this driver
has been moved to drivers/thermal/mediatek/soc_temp.c and, as a result,
this series cannot be applied.
Please rebase.
Regards,
Angelo
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v4 2/4] thermal: mediatek: control buffer enablement tweaks
2022-09-09 7:37 [PATCH v4 2/4] thermal: mediatek: control buffer enablement tweaks Amjad Ouled-Ameur
2022-09-09 8:35 ` AngeloGioacchino Del Regno
@ 2022-09-09 8:37 ` AngeloGioacchino Del Regno
1 sibling, 0 replies; 3+ messages in thread
From: AngeloGioacchino Del Regno @ 2022-09-09 8:37 UTC (permalink / raw)
To: Amjad Ouled-Ameur, matthias.bgg
Cc: Markus Schneider-Pargmann, rafael, fparent, amitk,
daniel.lezcano, devicetree, krzysztof.kozlowski+dt,
linux-arm-kernel, linux-kernel, linux-mediatek, linux-pm,
robh+dt, rui.zhang
Il 09/09/22 09:37, Amjad Ouled-Ameur ha scritto:
> From: Markus Schneider-Pargmann <msp@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@baylibre.com>
> Signed-off-by: Fabien Parent <fparent@baylibre.com>
> Signed-off-by: Amjad Ouled-Ameur <aouledameur@baylibre.com>
Sorry for the previous reply. I got confused by a local tree.
The driver is there upstream.
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-09 8:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-09 7:37 [PATCH v4 2/4] thermal: mediatek: control buffer enablement tweaks Amjad Ouled-Ameur
2022-09-09 8:35 ` AngeloGioacchino Del Regno
2022-09-09 8:37 ` AngeloGioacchino Del Regno
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).