* [PATCH v2 0/4] thermal: mediatek: Add mt8365 support
@ 2021-10-19 9:34 Markus Schneider-Pargmann
2021-10-19 9:34 ` [PATCH v2 1/4] dt-bindings: thermal: mediatek: Add mt8365 Markus Schneider-Pargmann
` (3 more replies)
0 siblings, 4 replies; 7+ messages in thread
From: Markus Schneider-Pargmann @ 2021-10-19 9:34 UTC (permalink / raw)
To: Zhang Rui, Daniel Lezcano, Matthias Brugger, Rob Herring
Cc: linux-pm, devicetree, linux-arm-kernel, linux-mediatek, fparent,
khilman, Markus Schneider-Pargmann
Hi,
this series adds a compatible to the bindings and a specific part for
the thermal driver.
In v2 I added a patch to remove unnecessary (void*) casts and fixed the
comments I received.
Thanks for any feedback or comments.
Best,
Markus
Fabien Parent (1):
thermal: mediatek: add MT8365 thermal driver support
Markus Schneider-Pargmann (3):
dt-bindings: thermal: mediatek: Add mt8365
thermal: mediatek: Fix apmixed error message
thermal: mediatek: Remove data void casts
.../bindings/thermal/mediatek-thermal.txt | 1 +
drivers/thermal/mtk_thermal.c | 102 +++++++++++++++---
2 files changed, 91 insertions(+), 12 deletions(-)
--
2.33.0
_______________________________________________
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] 7+ messages in thread
* [PATCH v2 1/4] dt-bindings: thermal: mediatek: Add mt8365
2021-10-19 9:34 [PATCH v2 0/4] thermal: mediatek: Add mt8365 support Markus Schneider-Pargmann
@ 2021-10-19 9:34 ` Markus Schneider-Pargmann
2021-10-27 3:09 ` Rob Herring
2021-10-19 9:34 ` [PATCH v2 2/4] thermal: mediatek: Fix apmixed error message Markus Schneider-Pargmann
` (2 subsequent siblings)
3 siblings, 1 reply; 7+ messages in thread
From: Markus Schneider-Pargmann @ 2021-10-19 9:34 UTC (permalink / raw)
To: Zhang Rui, Daniel Lezcano, Matthias Brugger, Rob Herring
Cc: linux-pm, devicetree, linux-arm-kernel, linux-mediatek, fparent,
khilman, Markus Schneider-Pargmann
This unit is present on the mt8365 SoC as well. But there is a
difference in the usage of an apmixed register.
This patch adds a distinct mt8365 to the list of compatibles.
Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
---
Documentation/devicetree/bindings/thermal/mediatek-thermal.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt
index 5c7e7bdd029a..ba4ebffeade4 100644
--- a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt
+++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt
@@ -14,6 +14,7 @@ Required properties:
- "mediatek,mt2712-thermal" : For MT2712 family of SoCs
- "mediatek,mt7622-thermal" : For MT7622 SoC
- "mediatek,mt8183-thermal" : For MT8183 family of SoCs
+ - "mediatek,mt8365-thermal" : For MT8365 family of SoCs
- "mediatek,mt8516-thermal", "mediatek,mt2701-thermal : For MT8516 family of SoCs
- reg: Address range of the thermal controller
- interrupts: IRQ for the thermal controller
--
2.33.0
_______________________________________________
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] 7+ messages in thread
* [PATCH v2 2/4] thermal: mediatek: Fix apmixed error message
2021-10-19 9:34 [PATCH v2 0/4] thermal: mediatek: Add mt8365 support Markus Schneider-Pargmann
2021-10-19 9:34 ` [PATCH v2 1/4] dt-bindings: thermal: mediatek: Add mt8365 Markus Schneider-Pargmann
@ 2021-10-19 9:34 ` Markus Schneider-Pargmann
2021-10-19 9:34 ` [PATCH v2 3/4] thermal: mediatek: Remove data void casts Markus Schneider-Pargmann
2021-10-19 9:34 ` [PATCH v2 4/4] thermal: mediatek: add MT8365 thermal driver support Markus Schneider-Pargmann
3 siblings, 0 replies; 7+ messages in thread
From: Markus Schneider-Pargmann @ 2021-10-19 9:34 UTC (permalink / raw)
To: Zhang Rui, Daniel Lezcano, Matthias Brugger, Rob Herring
Cc: linux-pm, devicetree, linux-arm-kernel, linux-mediatek, fparent,
khilman, Markus Schneider-Pargmann
Seems to be a copy and paste mistake, this is the apmixed address, not
auxadc.
Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
Fixes: a92db1c8089e (thermal: Add Mediatek thermal controller support)
---
drivers/thermal/mtk_thermal.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
index ede94eadddda..93ee043d70da 100644
--- a/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mtk_thermal.c
@@ -1050,7 +1050,7 @@ static int mtk_thermal_probe(struct platform_device *pdev)
of_node_put(apmixedsys);
if (apmixed_phys_base == OF_BAD_ADDR) {
- dev_err(&pdev->dev, "Can't get auxadc phys address\n");
+ dev_err(&pdev->dev, "Can't get apmixed phys address\n");
return -EINVAL;
}
--
2.33.0
_______________________________________________
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] 7+ messages in thread
* [PATCH v2 3/4] thermal: mediatek: Remove data void casts
2021-10-19 9:34 [PATCH v2 0/4] thermal: mediatek: Add mt8365 support Markus Schneider-Pargmann
2021-10-19 9:34 ` [PATCH v2 1/4] dt-bindings: thermal: mediatek: Add mt8365 Markus Schneider-Pargmann
2021-10-19 9:34 ` [PATCH v2 2/4] thermal: mediatek: Fix apmixed error message Markus Schneider-Pargmann
@ 2021-10-19 9:34 ` Markus Schneider-Pargmann
2021-10-19 9:34 ` [PATCH v2 4/4] thermal: mediatek: add MT8365 thermal driver support Markus Schneider-Pargmann
3 siblings, 0 replies; 7+ messages in thread
From: Markus Schneider-Pargmann @ 2021-10-19 9:34 UTC (permalink / raw)
To: Zhang Rui, Daniel Lezcano, Matthias Brugger, Rob Herring
Cc: linux-pm, devicetree, linux-arm-kernel, linux-mediatek, fparent,
khilman, Markus Schneider-Pargmann
It is not necessary to cast struct mtk_thermal_data to (void*).
This patch removes these casts.
Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
---
drivers/thermal/mtk_thermal.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
index 93ee043d70da..af6cd11eb221 100644
--- a/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mtk_thermal.c
@@ -941,23 +941,23 @@ static int mtk_thermal_get_calibration_data(struct device *dev,
static const struct of_device_id mtk_thermal_of_match[] = {
{
.compatible = "mediatek,mt8173-thermal",
- .data = (void *)&mt8173_thermal_data,
+ .data = &mt8173_thermal_data,
},
{
.compatible = "mediatek,mt2701-thermal",
- .data = (void *)&mt2701_thermal_data,
+ .data = &mt2701_thermal_data,
},
{
.compatible = "mediatek,mt2712-thermal",
- .data = (void *)&mt2712_thermal_data,
+ .data = &mt2712_thermal_data,
},
{
.compatible = "mediatek,mt7622-thermal",
- .data = (void *)&mt7622_thermal_data,
+ .data = &mt7622_thermal_data,
},
{
.compatible = "mediatek,mt8183-thermal",
- .data = (void *)&mt8183_thermal_data,
+ .data = &mt8183_thermal_data,
}, {
},
};
--
2.33.0
_______________________________________________
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] 7+ messages in thread
* [PATCH v2 4/4] thermal: mediatek: add MT8365 thermal driver support
2021-10-19 9:34 [PATCH v2 0/4] thermal: mediatek: Add mt8365 support Markus Schneider-Pargmann
` (2 preceding siblings ...)
2021-10-19 9:34 ` [PATCH v2 3/4] thermal: mediatek: Remove data void casts Markus Schneider-Pargmann
@ 2021-10-19 9:34 ` Markus Schneider-Pargmann
2021-10-19 10:44 ` Daniel Lezcano
3 siblings, 1 reply; 7+ messages in thread
From: Markus Schneider-Pargmann @ 2021-10-19 9:34 UTC (permalink / raw)
To: Zhang Rui, Daniel Lezcano, Matthias Brugger, Rob Herring
Cc: linux-pm, devicetree, linux-arm-kernel, linux-mediatek, fparent,
khilman, Markus Schneider-Pargmann
From: Fabien Parent <fparent@baylibre.com>
mt8365 is similar to the other SoCs supported by the driver. It has only
one bank and 3 sensors that can be multiplexed.
Additionally the buffer has to be enabled and connected to AUXADC
similar to the V2 version but at a different register offset. That's why
I added three new configuration values to define the register, mask and
bits to be set to be able to use it for both V2 and mt8365.
Signed-off-by: Fabien Parent <fparent@baylibre.com>
[Added apmixed control register logic]
Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
---
Notes:
Changes v1 -> v2:
- Use of ARRAY_SIZE to avoid NUM macros.
- Remove (void*) cast.
- Use macros for mt7622 buffer_ctl operations.
drivers/thermal/mtk_thermal.c | 90 ++++++++++++++++++++++++++++++++---
1 file changed, 84 insertions(+), 6 deletions(-)
diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
index af6cd11eb221..fc4ea58d00ec 100644
--- a/drivers/thermal/mtk_thermal.c
+++ b/drivers/thermal/mtk_thermal.c
@@ -31,6 +31,7 @@
#define AUXADC_CON2_V 0x010
#define AUXADC_DATA(channel) (0x14 + (channel) * 4)
+#define APMIXED_SYS_TS_CON0 0x600
#define APMIXED_SYS_TS_CON1 0x604
/* Thermal Controller Registers */
@@ -212,6 +213,8 @@ enum mtk_thermal_version {
#define MT7622_NUM_SENSORS_PER_ZONE 1
#define MT7622_TS1 0
#define MT7622_NUM_CONTROLLER 1
+#define MT7622_BUFFER_CTL_MASK ~0x37
+#define MT7622_BUFFER_CTL_SET 0x1
/* The maximum number of banks */
#define MAX_NUM_ZONES 8
@@ -245,6 +248,14 @@ enum mtk_thermal_version {
/* The calibration coefficient of sensor */
#define MT8183_CALIBRATION 153
+/* MT8365 */
+#define MT8365_TEMP_AUXADC_CHANNEL 11
+#define MT8365_CALIBRATION 164
+#define MT8365_NUM_BANKS 1
+#define MT8365_TS1 0
+#define MT8365_TS2 1
+#define MT8365_TS3 2
+
struct mtk_thermal;
struct thermal_bank_cfg {
@@ -271,6 +282,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 {
@@ -386,6 +400,25 @@ static const int mt7622_mux_values[MT7622_NUM_SENSORS] = { 0, };
static const int mt7622_vts_index[MT7622_NUM_SENSORS] = { VTS1 };
static const int mt7622_tc_offset[MT7622_NUM_CONTROLLER] = { 0x0, };
+/* MT8365 thermal sensor data */
+static const int mt8365_bank_data[] = {
+ MT8365_TS1, MT8365_TS2, MT8365_TS3
+};
+
+static const int mt8365_msr[ARRAY_SIZE(mt8365_bank_data)] = {
+ TEMP_MSR0, TEMP_MSR1, TEMP_MSR2
+};
+
+static const int mt8365_adcpnp[ARRAY_SIZE(mt8365_bank_data)] = {
+ TEMP_ADCPNP0, TEMP_ADCPNP1, TEMP_ADCPNP2
+};
+
+static const int mt8365_mux_values[ARRAY_SIZE(mt8365_bank_data)] = { 0, 1, 2 };
+static const int mt8365_tc_offset[] = { 0 };
+
+static const int mt8365_vts_index[ARRAY_SIZE(mt8365_bank_data)] = { VTS1, VTS2,
+ VTS3 };
+
/*
* The MT8173 thermal controller has four banks. Each bank can read up to
* four temperature sensors simultaneously. The MT8173 has a total of 5
@@ -460,6 +493,39 @@ static const struct mtk_thermal_data mt2701_thermal_data = {
.version = MTK_THERMAL_V1,
};
+/*
+ * The MT8365 thermal controller has one bank, which can read up to
+ * four temperature sensors simultaneously. The MT8365 has a total of 3
+ * temperature sensors.
+ *
+ * The thermal core only gets the maximum temperature of this one bank,
+ * so the bank concept wouldn't be necessary here. However, the SVS (Smart
+ * Voltage Scaling) unit makes its decisions based on the same bank
+ * data.
+ */
+static const struct mtk_thermal_data mt8365_thermal_data = {
+ .auxadc_channel = MT8365_TEMP_AUXADC_CHANNEL,
+ .num_banks = MT8365_NUM_BANKS,
+ .num_sensors = ARRAY_SIZE(mt8365_bank_data),
+ .vts_index = mt8365_vts_index,
+ .cali_val = MT8365_CALIBRATION,
+ .num_controller = ARRAY_SIZE(mt8365_tc_offset),
+ .controller_offset = mt8365_tc_offset,
+ .need_switch_bank = false,
+ .bank_data = {
+ {
+ .num_sensors = ARRAY_SIZE(mt8365_bank_data),
+ .sensors = mt8365_bank_data
+ },
+ },
+ .msr = mt8365_msr,
+ .adcpnp = mt8365_adcpnp,
+ .sensor_mux_values = mt8365_mux_values,
+ .version = MTK_THERMAL_V1,
+ .apmixed_buffer_ctl_reg = APMIXED_SYS_TS_CON0,
+ .apmixed_buffer_ctl_mask = ~(u32)GENMASK(29, 28),
+};
+
/*
* The MT2712 thermal controller has one bank, which can read up to
* four temperature sensors simultaneously. The MT2712 has a total of 4
@@ -514,6 +580,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 = MT7622_BUFFER_CTL_MASK,
+ .apmixed_buffer_ctl_set = MT7622_BUFFER_CTL_SET,
};
/*
@@ -958,19 +1027,27 @@ static const struct of_device_id mtk_thermal_of_match[] = {
{
.compatible = "mediatek,mt8183-thermal",
.data = &mt8183_thermal_data,
+ },
+ {
+ .compatible = "mediatek,mt8365-thermal",
+ .data = &mt8365_thermal_data,
}, {
},
};
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;
- tmp = readl(apmixed_base + APMIXED_SYS_TS_CON1);
- tmp &= ~(0x37);
- tmp |= 0x1;
- writel(tmp, apmixed_base + APMIXED_SYS_TS_CON1);
+ if (!mt->conf->apmixed_buffer_ctl_reg)
+ return;
+
+ 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 +1147,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.33.0
_______________________________________________
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] 7+ messages in thread
* Re: [PATCH v2 4/4] thermal: mediatek: add MT8365 thermal driver support
2021-10-19 9:34 ` [PATCH v2 4/4] thermal: mediatek: add MT8365 thermal driver support Markus Schneider-Pargmann
@ 2021-10-19 10:44 ` Daniel Lezcano
0 siblings, 0 replies; 7+ messages in thread
From: Daniel Lezcano @ 2021-10-19 10:44 UTC (permalink / raw)
To: Markus Schneider-Pargmann, Zhang Rui, Matthias Brugger, Rob Herring
Cc: linux-pm, devicetree, linux-arm-kernel, linux-mediatek, fparent, khilman
On 19/10/2021 11:34, Markus Schneider-Pargmann wrote:
> From: Fabien Parent <fparent@baylibre.com>
>
> mt8365 is similar to the other SoCs supported by the driver. It has only
> one bank and 3 sensors that can be multiplexed.
>
> Additionally the buffer has to be enabled and connected to AUXADC
> similar to the V2 version but at a different register offset. That's why
> I added three new configuration values to define the register, mask and
> bits to be set to be able to use it for both V2 and mt8365.
>
> Signed-off-by: Fabien Parent <fparent@baylibre.com>
> [Added apmixed control register logic]
> Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
> ---
>
> Notes:
> Changes v1 -> v2:
> - Use of ARRAY_SIZE to avoid NUM macros.
> - Remove (void*) cast.
> - Use macros for mt7622 buffer_ctl operations.
>
> drivers/thermal/mtk_thermal.c | 90 ++++++++++++++++++++++++++++++++---
> 1 file changed, 84 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c
> index af6cd11eb221..fc4ea58d00ec 100644
> --- a/drivers/thermal/mtk_thermal.c
> +++ b/drivers/thermal/mtk_thermal.c
> @@ -31,6 +31,7 @@
> #define AUXADC_CON2_V 0x010
> #define AUXADC_DATA(channel) (0x14 + (channel) * 4)
>
> +#define APMIXED_SYS_TS_CON0 0x600
> #define APMIXED_SYS_TS_CON1 0x604
>
> /* Thermal Controller Registers */
> @@ -212,6 +213,8 @@ enum mtk_thermal_version {
> #define MT7622_NUM_SENSORS_PER_ZONE 1
> #define MT7622_TS1 0
> #define MT7622_NUM_CONTROLLER 1
> +#define MT7622_BUFFER_CTL_MASK ~0x37
> +#define MT7622_BUFFER_CTL_SET 0x1
>
> /* The maximum number of banks */
> #define MAX_NUM_ZONES 8
> @@ -245,6 +248,14 @@ enum mtk_thermal_version {
> /* The calibration coefficient of sensor */
> #define MT8183_CALIBRATION 153
>
> +/* MT8365 */
> +#define MT8365_TEMP_AUXADC_CHANNEL 11
> +#define MT8365_CALIBRATION 164
> +#define MT8365_NUM_BANKS 1
> +#define MT8365_TS1 0
> +#define MT8365_TS2 1
> +#define MT8365_TS3 2
> +
> struct mtk_thermal;
>
> struct thermal_bank_cfg {
> @@ -271,6 +282,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 {
> @@ -386,6 +400,25 @@ static const int mt7622_mux_values[MT7622_NUM_SENSORS] = { 0, };
> static const int mt7622_vts_index[MT7622_NUM_SENSORS] = { VTS1 };
> static const int mt7622_tc_offset[MT7622_NUM_CONTROLLER] = { 0x0, };
>
> +/* MT8365 thermal sensor data */
> +static const int mt8365_bank_data[] = {
> + MT8365_TS1, MT8365_TS2, MT8365_TS3
> +};
> +
> +static const int mt8365_msr[ARRAY_SIZE(mt8365_bank_data)] = {
> + TEMP_MSR0, TEMP_MSR1, TEMP_MSR2
> +};
> +
> +static const int mt8365_adcpnp[ARRAY_SIZE(mt8365_bank_data)] = {
> + TEMP_ADCPNP0, TEMP_ADCPNP1, TEMP_ADCPNP2
> +};
> +
> +static const int mt8365_mux_values[ARRAY_SIZE(mt8365_bank_data)] = { 0, 1, 2 };
This portion of declaration shows it should be *one* array of structures :/
This comment applies for all the existing code.
TBH, I think the code could be simplified and consolidated in this
driver. But that would be out of the scope of your changes as I
understand you are sticking to the current implementation.
> +static const int mt8365_tc_offset[] = { 0 };
0x0, to be consistent with the rest of the code.
> +
> +static const int mt8365_vts_index[ARRAY_SIZE(mt8365_bank_data)] = { VTS1, VTS2,
> + VTS3 };
> +
> /*
> * The MT8173 thermal controller has four banks. Each bank can read up to
> * four temperature sensors simultaneously. The MT8173 has a total of 5
> @@ -460,6 +493,39 @@ static const struct mtk_thermal_data mt2701_thermal_data = {
> .version = MTK_THERMAL_V1,
> };
>
> +/*
> + * The MT8365 thermal controller has one bank, which can read up to
> + * four temperature sensors simultaneously. The MT8365 has a total of 3
> + * temperature sensors.
> + *
> + * The thermal core only gets the maximum temperature of this one bank,
> + * so the bank concept wouldn't be necessary here. However, the SVS (Smart
> + * Voltage Scaling) unit makes its decisions based on the same bank
> + * data.
> + */
> +static const struct mtk_thermal_data mt8365_thermal_data = {
> + .auxadc_channel = MT8365_TEMP_AUXADC_CHANNEL,
> + .num_banks = MT8365_NUM_BANKS,
> + .num_sensors = ARRAY_SIZE(mt8365_bank_data),
> + .vts_index = mt8365_vts_index,
> + .cali_val = MT8365_CALIBRATION,
> + .num_controller = ARRAY_SIZE(mt8365_tc_offset),
> + .controller_offset = mt8365_tc_offset,
> + .need_switch_bank = false,
> + .bank_data = {
> + {
> + .num_sensors = ARRAY_SIZE(mt8365_bank_data),
> + .sensors = mt8365_bank_data
> + },
> + },
> + .msr = mt8365_msr,
> + .adcpnp = mt8365_adcpnp,
> + .sensor_mux_values = mt8365_mux_values,
> + .version = MTK_THERMAL_V1,
> + .apmixed_buffer_ctl_reg = APMIXED_SYS_TS_CON0,
> + .apmixed_buffer_ctl_mask = ~(u32)GENMASK(29, 28),
> +};
>
> /*
> * The MT2712 thermal controller has one bank, which can read up to
> * four temperature sensors simultaneously. The MT2712 has a total of 4
> @@ -514,6 +580,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 = MT7622_BUFFER_CTL_MASK,
> + .apmixed_buffer_ctl_set = MT7622_BUFFER_CTL_SET,
> };
>
> /*
> @@ -958,19 +1027,27 @@ static const struct of_device_id mtk_thermal_of_match[] = {
> {
> .compatible = "mediatek,mt8183-thermal",
> .data = &mt8183_thermal_data,
> + },
> + {
> + .compatible = "mediatek,mt8365-thermal",
> + .data = &mt8365_thermal_data,
> }, {
> },
> };
> 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;
>
> - tmp = readl(apmixed_base + APMIXED_SYS_TS_CON1);
> - tmp &= ~(0x37);
> - tmp |= 0x1;
> - writel(tmp, apmixed_base + APMIXED_SYS_TS_CON1);
> + if (!mt->conf->apmixed_buffer_ctl_reg)
> + return;
> +
> + 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 +1147,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);
> }
>
>
--
<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
_______________________________________________
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] 7+ messages in thread
* Re: [PATCH v2 1/4] dt-bindings: thermal: mediatek: Add mt8365
2021-10-19 9:34 ` [PATCH v2 1/4] dt-bindings: thermal: mediatek: Add mt8365 Markus Schneider-Pargmann
@ 2021-10-27 3:09 ` Rob Herring
0 siblings, 0 replies; 7+ messages in thread
From: Rob Herring @ 2021-10-27 3:09 UTC (permalink / raw)
To: Markus Schneider-Pargmann
Cc: Rob Herring, linux-arm-kernel, Zhang Rui, Matthias Brugger,
khilman, linux-mediatek, fparent, linux-pm, devicetree,
Daniel Lezcano
On Tue, 19 Oct 2021 11:34:01 +0200, Markus Schneider-Pargmann wrote:
> This unit is present on the mt8365 SoC as well. But there is a
> difference in the usage of an apmixed register.
>
> This patch adds a distinct mt8365 to the list of compatibles.
>
> Signed-off-by: Markus Schneider-Pargmann <msp@baylibre.com>
> ---
> Documentation/devicetree/bindings/thermal/mediatek-thermal.txt | 1 +
> 1 file changed, 1 insertion(+)
>
Acked-by: Rob Herring <robh@kernel.org>
_______________________________________________
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] 7+ messages in thread
end of thread, other threads:[~2021-10-27 3:11 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-19 9:34 [PATCH v2 0/4] thermal: mediatek: Add mt8365 support Markus Schneider-Pargmann
2021-10-19 9:34 ` [PATCH v2 1/4] dt-bindings: thermal: mediatek: Add mt8365 Markus Schneider-Pargmann
2021-10-27 3:09 ` Rob Herring
2021-10-19 9:34 ` [PATCH v2 2/4] thermal: mediatek: Fix apmixed error message Markus Schneider-Pargmann
2021-10-19 9:34 ` [PATCH v2 3/4] thermal: mediatek: Remove data void casts Markus Schneider-Pargmann
2021-10-19 9:34 ` [PATCH v2 4/4] thermal: mediatek: add MT8365 thermal driver support Markus Schneider-Pargmann
2021-10-19 10:44 ` Daniel Lezcano
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).