* [PATCH 0/3] thermal: Add Mediatek thermal driver for mt2701
@ 2016-07-07 9:06 Dawei Chien
2016-07-07 9:06 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Dawei Chien
` (2 more replies)
0 siblings, 3 replies; 32+ messages in thread
From: Dawei Chien @ 2016-07-07 9:06 UTC (permalink / raw)
To: linux-arm-kernel
This series support for mt2701 chip to mtk_thermal.c,
and integrate both mt8173 and mt2701 on the same driver.
MT8173 has four banks and five sensors, and MT2701 has
only one bank and three sensors.
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2016-07-07 9:06 [PATCH 0/3] thermal: Add Mediatek thermal driver for mt2701 Dawei Chien @ 2016-07-07 9:06 ` Dawei Chien 2016-07-07 11:09 ` Keerthy 2016-07-07 9:06 ` [PATCH 2/3] thermal: Add Mediatek thermal driver for mt2701 Dawei Chien 2016-07-07 9:06 ` [PATCH 3/3] arm: dts: thermal: add thermal/auxadc node Dawei Chien 2 siblings, 1 reply; 32+ messages in thread From: Dawei Chien @ 2016-07-07 9:06 UTC (permalink / raw) To: linux-arm-kernel This adds the device tree binding documentation for the mediatek thermal controller found on Mediatek MT2701. Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> --- .../bindings/thermal/mediatek-thermal.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt index 81f9a51..bb55e79 100644 --- a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt @@ -8,7 +8,7 @@ apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS is also needed. Required properties: -- compatible: "mediatek,mt8173-thermal" +- compatible: "mediatek,mt8173-thermal" or "mediatek,mt2701-thermal" - reg: Address range of the thermal controller - interrupts: IRQ for the thermal controller - clocks, clock-names: Clocks needed for the thermal controller. required -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2016-07-07 9:06 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Dawei Chien @ 2016-07-07 11:09 ` Keerthy 2016-07-11 8:52 ` dawei chien 0 siblings, 1 reply; 32+ messages in thread From: Keerthy @ 2016-07-07 11:09 UTC (permalink / raw) To: linux-arm-kernel On Thursday 07 July 2016 02:36 PM, Dawei Chien wrote: > This adds the device tree binding documentation for the mediatek thermal > controller found on Mediatek MT2701. > > Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> > --- > .../bindings/thermal/mediatek-thermal.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > index 81f9a51..bb55e79 100644 > --- a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > @@ -8,7 +8,7 @@ apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS > is also needed. > > Required properties: > -- compatible: "mediatek,mt8173-thermal" > +- compatible: "mediatek,mt8173-thermal" or "mediatek,mt2701-thermal" - compatible : - "mediatek,mt8173-thermal" : For MT8173 family of SoCs - "mediatek,mt2701-thermal" : For MT2701 family of SoCs > - reg: Address range of the thermal controller > - interrupts: IRQ for the thermal controller > - clocks, clock-names: Clocks needed for the thermal controller. required > ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2016-07-07 11:09 ` Keerthy @ 2016-07-11 8:52 ` dawei chien 2016-08-11 15:48 ` Matthias Brugger 0 siblings, 1 reply; 32+ messages in thread From: dawei chien @ 2016-07-11 8:52 UTC (permalink / raw) To: linux-arm-kernel Dear Keerthy, On Thu, 2016-07-07 at 16:39 +0530, Keerthy wrote: > > On Thursday 07 July 2016 02:36 PM, Dawei Chien wrote: > > This adds the device tree binding documentation for the mediatek thermal > > controller found on Mediatek MT2701. > > > > Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> > > --- > > .../bindings/thermal/mediatek-thermal.txt | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > > index 81f9a51..bb55e79 100644 > > --- a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > > +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > > @@ -8,7 +8,7 @@ apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS > > is also needed. > > > > Required properties: > > -- compatible: "mediatek,mt8173-thermal" > > +- compatible: "mediatek,mt8173-thermal" or "mediatek,mt2701-thermal" > > - compatible : > - "mediatek,mt8173-thermal" : For MT8173 family of SoCs > - "mediatek,mt2701-thermal" : For MT2701 family of SoCs Thank you, I will update it on next version. > > > - reg: Address range of the thermal controller > > - interrupts: IRQ for the thermal controller > > - clocks, clock-names: Clocks needed for the thermal controller. required > > ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2016-07-11 8:52 ` dawei chien @ 2016-08-11 15:48 ` Matthias Brugger 2016-08-15 7:07 ` dawei chien 0 siblings, 1 reply; 32+ messages in thread From: Matthias Brugger @ 2016-08-11 15:48 UTC (permalink / raw) To: linux-arm-kernel On 11/07/16 10:52, dawei chien wrote: > Dear Keerthy, > > On Thu, 2016-07-07 at 16:39 +0530, Keerthy wrote: >> >> On Thursday 07 July 2016 02:36 PM, Dawei Chien wrote: >>> This adds the device tree binding documentation for the mediatek thermal >>> controller found on Mediatek MT2701. >>> >>> Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> >>> --- >>> .../bindings/thermal/mediatek-thermal.txt | 2 +- >>> 1 file changed, 1 insertion(+), 1 deletion(-) >>> >>> diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt >>> index 81f9a51..bb55e79 100644 >>> --- a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt >>> +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt >>> @@ -8,7 +8,7 @@ apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS >>> is also needed. >>> >>> Required properties: >>> -- compatible: "mediatek,mt8173-thermal" >>> +- compatible: "mediatek,mt8173-thermal" or "mediatek,mt2701-thermal" >> >> - compatible : >> - "mediatek,mt8173-thermal" : For MT8173 family of SoCs >> - "mediatek,mt2701-thermal" : For MT2701 family of SoCs > > Thank you, I will update it on next version. > Do you know about the compability to older SoCs (e.g. mt6589)? It might make sense to add mediatek,mtk-thermal if they are compatible or nearly compatible. >> >>> - reg: Address range of the thermal controller >>> - interrupts: IRQ for the thermal controller >>> - clocks, clock-names: Clocks needed for the thermal controller. required >>> > > ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2016-08-11 15:48 ` Matthias Brugger @ 2016-08-15 7:07 ` dawei chien 0 siblings, 0 replies; 32+ messages in thread From: dawei chien @ 2016-08-15 7:07 UTC (permalink / raw) To: linux-arm-kernel Hi Matthias, On Thu, 2016-08-11 at 17:48 +0200, Matthias Brugger wrote: > > On 11/07/16 10:52, dawei chien wrote: > > Dear Keerthy, > > > > On Thu, 2016-07-07 at 16:39 +0530, Keerthy wrote: > >> > >> On Thursday 07 July 2016 02:36 PM, Dawei Chien wrote: > >>> This adds the device tree binding documentation for the mediatek thermal > >>> controller found on Mediatek MT2701. > >>> > >>> Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> > >>> --- > >>> .../bindings/thermal/mediatek-thermal.txt | 2 +- > >>> 1 file changed, 1 insertion(+), 1 deletion(-) > >>> > >>> diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > >>> index 81f9a51..bb55e79 100644 > >>> --- a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > >>> +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > >>> @@ -8,7 +8,7 @@ apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS > >>> is also needed. > >>> > >>> Required properties: > >>> -- compatible: "mediatek,mt8173-thermal" > >>> +- compatible: "mediatek,mt8173-thermal" or "mediatek,mt2701-thermal" > >> > >> - compatible : > >> - "mediatek,mt8173-thermal" : For MT8173 family of SoCs > >> - "mediatek,mt2701-thermal" : For MT2701 family of SoCs > > > > Thank you, I will update it on next version. > > > > Do you know about the compability to older SoCs (e.g. mt6589)? > It might make sense to add mediatek,mtk-thermal if they are compatible > or nearly compatible. I agree with you that we should add mediatek,mtk-thermal for compatible or nearly compatible SoC. However, there is no more compatible SoC so far. Once we have such new nearly compatible SoC, we would update it on this binding document soon, thank you. BR, Dawei > >> > >>> - reg: Address range of the thermal controller > >>> - interrupts: IRQ for the thermal controller > >>> - clocks, clock-names: Clocks needed for the thermal controller. required > >>> > > > > ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 2/3] thermal: Add Mediatek thermal driver for mt2701. 2016-07-07 9:06 [PATCH 0/3] thermal: Add Mediatek thermal driver for mt2701 Dawei Chien 2016-07-07 9:06 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Dawei Chien @ 2016-07-07 9:06 ` Dawei Chien 2016-07-07 11:54 ` Keerthy 2016-07-07 9:06 ` [PATCH 3/3] arm: dts: thermal: add thermal/auxadc node Dawei Chien 2 siblings, 1 reply; 32+ messages in thread From: Dawei Chien @ 2016-07-07 9:06 UTC (permalink / raw) To: linux-arm-kernel This patch adds support for mt2701 chip to mtk_thermal.c, and integrate both mt8173 and mt2701 on the same driver. MT8173 has four banks and five sensors, and MT2701 has only one bank and three sensors. Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> --- drivers/thermal/mtk_thermal.c | 258 ++++++++++++++++++++++++++--------------- 1 file changed, 165 insertions(+), 93 deletions(-) diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c index 262ab0a..860f2e2 100644 --- a/drivers/thermal/mtk_thermal.c +++ b/drivers/thermal/mtk_thermal.c @@ -2,6 +2,7 @@ * Copyright (c) 2015 MediaTek Inc. * Author: Hanyi Wu <hanyi.wu@mediatek.com> * Sascha Hauer <s.hauer@pengutronix.de> + * Dawei Chien <dawei.chien@mediatek.com> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -21,6 +22,7 @@ #include <linux/nvmem-consumer.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/of_device.h> #include <linux/platform_device.h> #include <linux/slab.h> #include <linux/io.h> @@ -88,6 +90,7 @@ #define TEMP_ADCVALIDMASK_VALID_HIGH BIT(5) #define TEMP_ADCVALIDMASK_VALID_POS(bit) (bit) +/* MT8173 thermal sensors */ #define MT8173_TS1 0 #define MT8173_TS2 1 #define MT8173_TS3 2 @@ -97,35 +100,62 @@ /* AUXADC channel 11 is used for the temperature sensors */ #define MT8173_TEMP_AUXADC_CHANNEL 11 -/* The total number of temperature sensors in the MT8173 */ -#define MT8173_NUM_SENSORS 5 - -/* The number of banks in the MT8173 */ -#define MT8173_NUM_ZONES 4 - -/* The number of sensing points per bank */ -#define MT8173_NUM_SENSORS_PER_ZONE 4 - /* Layout of the fuses providing the calibration data */ -#define MT8173_CALIB_BUF0_VALID BIT(0) -#define MT8173_CALIB_BUF1_ADC_GE(x) (((x) >> 22) & 0x3ff) -#define MT8173_CALIB_BUF0_VTS_TS1(x) (((x) >> 17) & 0x1ff) -#define MT8173_CALIB_BUF0_VTS_TS2(x) (((x) >> 8) & 0x1ff) -#define MT8173_CALIB_BUF1_VTS_TS3(x) (((x) >> 0) & 0x1ff) -#define MT8173_CALIB_BUF2_VTS_TS4(x) (((x) >> 23) & 0x1ff) -#define MT8173_CALIB_BUF2_VTS_TSABB(x) (((x) >> 14) & 0x1ff) -#define MT8173_CALIB_BUF0_DEGC_CALI(x) (((x) >> 1) & 0x3f) -#define MT8173_CALIB_BUF0_O_SLOPE(x) (((x) >> 26) & 0x3f) +#define CALIB_BUF0_VALID BIT(0) +#define CALIB_BUF1_ADC_GE(x) (((x) >> 22) & 0x3ff) +#define CALIB_BUF0_VTS_TS1(x) (((x) >> 17) & 0x1ff) +#define CALIB_BUF0_VTS_TS2(x) (((x) >> 8) & 0x1ff) +#define CALIB_BUF1_VTS_TS3(x) (((x) >> 0) & 0x1ff) +#define CALIB_BUF2_VTS_TS4(x) (((x) >> 23) & 0x1ff) +#define CALIB_BUF2_VTS_TS5(x) (((x) >> 14) & 0x1ff) +#define CALIB_BUF0_DEGC_CALI(x) (((x) >> 1) & 0x3f) +#define CALIB_BUF0_O_SLOPE(x) (((x) >> 26) & 0x3f) + +#define NVMEM_TS1 0 +#define NVMEM_TS2 1 +#define NVMEM_TS3 2 +#define NVMEM_TS4 3 +#define NVMEM_TS5 4 + +/* MT2701 thermal sensors */ +#define MT2701_TS1 0 +#define MT2701_TS2 1 +#define MT2701_TSABB 2 + +/* AUXADC channel 11 is used for the temperature sensors */ +#define MT2701_TEMP_AUXADC_CHANNEL 11 #define THERMAL_NAME "mtk-thermal" +/* Maximum support banks */ +#define MAX_NUM_BANK 5 + struct mtk_thermal; +struct thermal_bank_cfg { + unsigned int num_sensors; + unsigned int sensors[MAX_NUM_BANK]; +}; + struct mtk_thermal_bank { struct mtk_thermal *mt; int id; }; +struct mtk_thermal_sense_point { + int msr; + int adcpnp; +}; + +struct mtk_thermal_data { + struct thermal_bank_cfg bank_data[MAX_NUM_BANK]; + struct mtk_thermal_sense_point sensing_points[MAX_NUM_BANK]; + int sensor_mux_values[MAX_NUM_BANK]; + s32 num_banks; + s32 num_sensors; + s32 auxadc_channel; +}; + struct mtk_thermal { struct device *dev; void __iomem *thermal_base; @@ -133,27 +163,20 @@ struct mtk_thermal { struct clk *clk_peri_therm; struct clk *clk_auxadc; - struct mtk_thermal_bank banks[MT8173_NUM_ZONES]; - + struct mtk_thermal_bank banks[MAX_NUM_BANK]; + const struct mtk_thermal_data *conf; /* lock: for getting and putting banks */ struct mutex lock; + struct thermal_zone_device *tzd; /* Calibration values */ s32 adc_ge; s32 degc_cali; s32 o_slope; - s32 vts[MT8173_NUM_SENSORS]; - -}; - -struct mtk_thermal_bank_cfg { - unsigned int num_sensors; - unsigned int sensors[MT8173_NUM_SENSORS_PER_ZONE]; + s32 vts[MAX_NUM_BANK]; }; -static const int sensor_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 }; - -/* +/** * The MT8173 thermal controller has four banks. Each bank can read up to * four temperature sensors simultaneously. The MT8173 has a total of 5 * temperature sensors. We use each bank to measure a certain area of the @@ -166,42 +189,76 @@ static const int sensor_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 }; * data, and this indeed needs the temperatures of the individual banks * for making better decisions. */ -static const struct mtk_thermal_bank_cfg bank_data[] = { - { - .num_sensors = 2, - .sensors = { MT8173_TS2, MT8173_TS3 }, - }, { - .num_sensors = 2, - .sensors = { MT8173_TS2, MT8173_TS4 }, - }, { - .num_sensors = 3, - .sensors = { MT8173_TS1, MT8173_TS2, MT8173_TSABB }, - }, { - .num_sensors = 1, - .sensors = { MT8173_TS2 }, +static const struct mtk_thermal_data mt8173_thermal_data = { + .auxadc_channel = MT8173_TEMP_AUXADC_CHANNEL, + .num_banks = 4, + .num_sensors = 5, + .bank_data = { + { + .num_sensors = 2, + .sensors = { MT8173_TS2, MT8173_TS3 }, + }, { + .num_sensors = 2, + .sensors = { MT8173_TS2, MT8173_TS4 }, + }, { + .num_sensors = 3, + .sensors = { MT8173_TS1, MT8173_TS2, MT8173_TSABB }, + }, { + .num_sensors = 1, + .sensors = { MT8173_TS2 }, + }, }, + .sensing_points = { + { + .msr = TEMP_MSR0, + .adcpnp = TEMP_ADCPNP0, + }, { + .msr = TEMP_MSR1, + .adcpnp = TEMP_ADCPNP1, + }, { + .msr = TEMP_MSR2, + .adcpnp = TEMP_ADCPNP2, + }, { + .msr = TEMP_MSR3, + .adcpnp = TEMP_ADCPNP3, + }, + }, + .sensor_mux_values = { 0, 1, 2, 3, 16 }, }; -struct mtk_thermal_sense_point { - int msr; - int adcpnp; -}; - -static const struct mtk_thermal_sense_point - sensing_points[MT8173_NUM_SENSORS_PER_ZONE] = { - { - .msr = TEMP_MSR0, - .adcpnp = TEMP_ADCPNP0, - }, { - .msr = TEMP_MSR1, - .adcpnp = TEMP_ADCPNP1, - }, { - .msr = TEMP_MSR2, - .adcpnp = TEMP_ADCPNP2, - }, { - .msr = TEMP_MSR3, - .adcpnp = TEMP_ADCPNP3, +/** + * The MT2701 thermal controller has one bank, which can read up to + * three temperature sensors simultaneously. The MT2701 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 mt2701_thermal_data = { + .auxadc_channel = MT2701_TEMP_AUXADC_CHANNEL, + .num_banks = 1, + .num_sensors = 3, + .bank_data = { + { + .num_sensors = 3, + .sensors = { MT2701_TS1, MT2701_TS2, MT2701_TSABB }, + }, }, + .sensing_points = { + { + .msr = TEMP_MSR0, + .adcpnp = TEMP_ADCPNP0, + }, { + .msr = TEMP_MSR1, + .adcpnp = TEMP_ADCPNP1, + }, { + .msr = TEMP_MSR2, + .adcpnp = TEMP_ADCPNP2, + }, + }, + .sensor_mux_values = { 0, 1, 16}, }; /** @@ -270,13 +327,15 @@ static void mtk_thermal_put_bank(struct mtk_thermal_bank *bank) static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank) { struct mtk_thermal *mt = bank->mt; + const struct mtk_thermal_data *conf = mt->conf; int i, temp = INT_MIN, max = INT_MIN; u32 raw; - for (i = 0; i < bank_data[bank->id].num_sensors; i++) { - raw = readl(mt->thermal_base + sensing_points[i].msr); + for (i = 0; i < conf->bank_data[bank->id].num_sensors; i++) { + raw = readl(mt->thermal_base + conf->sensing_points[i].msr); - temp = raw_to_mcelsius(mt, bank_data[bank->id].sensors[i], raw); + temp = raw_to_mcelsius(mt, conf->bank_data[bank->id].sensors[i], + raw); /* * The first read of a sensor often contains very high bogus @@ -299,7 +358,7 @@ static int mtk_read_temp(void *data, int *temperature) int i; int tempmax = INT_MIN; - for (i = 0; i < MT8173_NUM_ZONES; i++) { + for (i = 0; i < mt->conf->num_banks; i++) { struct mtk_thermal_bank *bank = &mt->banks[i]; mtk_thermal_get_bank(bank); @@ -322,7 +381,7 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, u32 apmixed_phys_base, u32 auxadc_phys_base) { struct mtk_thermal_bank *bank = &mt->banks[num]; - const struct mtk_thermal_bank_cfg *cfg = &bank_data[num]; + const struct mtk_thermal_data *conf = mt->conf; int i; bank->id = num; @@ -368,7 +427,7 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, * this value will be stored to TEMP_PNPMUXADDR (TEMP_SPARE0) * automatically by hw */ - writel(BIT(MT8173_TEMP_AUXADC_CHANNEL), mt->thermal_base + TEMP_ADCMUX); + writel(BIT(conf->auxadc_channel), mt->thermal_base + TEMP_ADCMUX); /* AHB address for auxadc mux selection */ writel(auxadc_phys_base + AUXADC_CON1_CLR_V, @@ -379,18 +438,18 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, mt->thermal_base + TEMP_PNPMUXADDR); /* AHB value for auxadc enable */ - writel(BIT(MT8173_TEMP_AUXADC_CHANNEL), mt->thermal_base + TEMP_ADCEN); + writel(BIT(conf->auxadc_channel), mt->thermal_base + TEMP_ADCEN); /* AHB address for auxadc enable (channel 0 immediate mode selected) */ writel(auxadc_phys_base + AUXADC_CON1_SET_V, mt->thermal_base + TEMP_ADCENADDR); /* AHB address for auxadc valid bit */ - writel(auxadc_phys_base + AUXADC_DATA(MT8173_TEMP_AUXADC_CHANNEL), + writel(auxadc_phys_base + AUXADC_DATA(conf->auxadc_channel), mt->thermal_base + TEMP_ADCVALIDADDR); /* AHB address for auxadc voltage output */ - writel(auxadc_phys_base + AUXADC_DATA(MT8173_TEMP_AUXADC_CHANNEL), + writel(auxadc_phys_base + AUXADC_DATA(conf->auxadc_channel), mt->thermal_base + TEMP_ADCVOLTADDR); /* read valid & voltage are at the same register */ @@ -407,11 +466,12 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, writel(TEMP_ADCWRITECTRL_ADC_MUX_WRITE, mt->thermal_base + TEMP_ADCWRITECTRL); - for (i = 0; i < cfg->num_sensors; i++) - writel(sensor_mux_values[cfg->sensors[i]], - mt->thermal_base + sensing_points[i].adcpnp); + for (i = 0; i < conf->bank_data[num].num_sensors; i++) + writel(conf->sensor_mux_values[conf->bank_data[num].sensors[i]], + mt->thermal_base + conf->sensing_points[i].adcpnp); - writel((1 << cfg->num_sensors) - 1, mt->thermal_base + TEMP_MONCTL0); + writel((1 << conf->bank_data[num].num_sensors) - 1, + mt->thermal_base + TEMP_MONCTL0); writel(TEMP_ADCWRITECTRL_ADC_PNP_WRITE | TEMP_ADCWRITECTRL_ADC_MUX_WRITE, @@ -442,7 +502,7 @@ static int mtk_thermal_get_calibration_data(struct device *dev, /* Start with default values */ mt->adc_ge = 512; - for (i = 0; i < MT8173_NUM_SENSORS; i++) + for (i = 0; i < mt->conf->num_sensors; i++) mt->vts[i] = 260; mt->degc_cali = 40; mt->o_slope = 0; @@ -467,15 +527,15 @@ static int mtk_thermal_get_calibration_data(struct device *dev, goto out; } - if (buf[0] & MT8173_CALIB_BUF0_VALID) { - mt->adc_ge = MT8173_CALIB_BUF1_ADC_GE(buf[1]); - mt->vts[MT8173_TS1] = MT8173_CALIB_BUF0_VTS_TS1(buf[0]); - mt->vts[MT8173_TS2] = MT8173_CALIB_BUF0_VTS_TS2(buf[0]); - mt->vts[MT8173_TS3] = MT8173_CALIB_BUF1_VTS_TS3(buf[1]); - mt->vts[MT8173_TS4] = MT8173_CALIB_BUF2_VTS_TS4(buf[2]); - mt->vts[MT8173_TSABB] = MT8173_CALIB_BUF2_VTS_TSABB(buf[2]); - mt->degc_cali = MT8173_CALIB_BUF0_DEGC_CALI(buf[0]); - mt->o_slope = MT8173_CALIB_BUF0_O_SLOPE(buf[0]); + if (buf[0] & CALIB_BUF0_VALID) { + mt->adc_ge = CALIB_BUF1_ADC_GE(buf[1]); + mt->vts[NVMEM_TS1] = CALIB_BUF0_VTS_TS1(buf[0]); + mt->vts[NVMEM_TS2] = CALIB_BUF0_VTS_TS2(buf[0]); + mt->vts[NVMEM_TS3] = CALIB_BUF1_VTS_TS3(buf[1]); + mt->vts[NVMEM_TS4] = CALIB_BUF2_VTS_TS4(buf[1]); + mt->vts[NVMEM_TS5] = CALIB_BUF2_VTS_TS5(buf[2]); + mt->degc_cali = CALIB_BUF0_DEGC_CALI(buf[0]); + mt->o_slope = CALIB_BUF0_O_SLOPE(buf[0]); } else { dev_info(dev, "Device not calibrated, using default calibration values\n"); } @@ -486,18 +546,36 @@ out: return ret; } +static const struct of_device_id mtk_thermal_of_match[] = { + { + .compatible = "mediatek,mt8173-thermal", + .data = (void *)&mt8173_thermal_data, + }, + { + .compatible = "mediatek,mt2701-thermal", + .data = (void *)&mt2701_thermal_data, + }, { + }, +}; +MODULE_DEVICE_TABLE(of, mtk_thermal_of_match); + static int mtk_thermal_probe(struct platform_device *pdev) { int ret, i; struct device_node *auxadc, *apmixedsys, *np = pdev->dev.of_node; struct mtk_thermal *mt; struct resource *res; + const struct of_device_id *of_id; u64 auxadc_phys_base, apmixed_phys_base; mt = devm_kzalloc(&pdev->dev, sizeof(*mt), GFP_KERNEL); if (!mt) return -ENOMEM; + of_id = of_match_device(mtk_thermal_of_match, &pdev->dev); + if (of_id) + mt->conf = (const struct mtk_thermal_data *)of_id->data; + mt->clk_peri_therm = devm_clk_get(&pdev->dev, "therm"); if (IS_ERR(mt->clk_peri_therm)) return PTR_ERR(mt->clk_peri_therm); @@ -565,7 +643,7 @@ static int mtk_thermal_probe(struct platform_device *pdev) goto err_disable_clk_auxadc; } - for (i = 0; i < MT8173_NUM_ZONES; i++) + for (i = 0; i < mt->conf->num_banks; i++) mtk_thermal_init_bank(mt, i, apmixed_phys_base, auxadc_phys_base); @@ -592,13 +670,6 @@ static int mtk_thermal_remove(struct platform_device *pdev) return 0; } -static const struct of_device_id mtk_thermal_of_match[] = { - { - .compatible = "mediatek,mt8173-thermal", - }, { - }, -}; - static struct platform_driver mtk_thermal_driver = { .probe = mtk_thermal_probe, .remove = mtk_thermal_remove, @@ -610,6 +681,7 @@ static struct platform_driver mtk_thermal_driver = { module_platform_driver(mtk_thermal_driver); +MODULE_AUTHOR("Dawei Chien <dawei.chien@mediatek.com>"); MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); MODULE_AUTHOR("Hanyi Wu <hanyi.wu@mediatek.com>"); MODULE_DESCRIPTION("Mediatek thermal driver"); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 2/3] thermal: Add Mediatek thermal driver for mt2701. 2016-07-07 9:06 ` [PATCH 2/3] thermal: Add Mediatek thermal driver for mt2701 Dawei Chien @ 2016-07-07 11:54 ` Keerthy 2016-07-11 8:56 ` dawei chien 0 siblings, 1 reply; 32+ messages in thread From: Keerthy @ 2016-07-07 11:54 UTC (permalink / raw) To: linux-arm-kernel Hi Dawei Chien, On Thursday 07 July 2016 02:36 PM, Dawei Chien wrote: > This patch adds support for mt2701 chip to mtk_thermal.c, > and integrate both mt8173 and mt2701 on the same driver. > MT8173 has four banks and five sensors, and MT2701 has > only one bank and three sensors. > > Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> > --- > drivers/thermal/mtk_thermal.c | 258 ++++++++++++++++++++++++++--------------- > 1 file changed, 165 insertions(+), 93 deletions(-) > > diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c > index 262ab0a..860f2e2 100644 > --- a/drivers/thermal/mtk_thermal.c > +++ b/drivers/thermal/mtk_thermal.c > @@ -2,6 +2,7 @@ > * Copyright (c) 2015 MediaTek Inc. > * Author: Hanyi Wu <hanyi.wu@mediatek.com> > * Sascha Hauer <s.hauer@pengutronix.de> > + * Dawei Chien <dawei.chien@mediatek.com> > * > * This program is free software; you can redistribute it and/or modify > * it under the terms of the GNU General Public License version 2 as > @@ -21,6 +22,7 @@ > #include <linux/nvmem-consumer.h> > #include <linux/of.h> > #include <linux/of_address.h> > +#include <linux/of_device.h> > #include <linux/platform_device.h> > #include <linux/slab.h> > #include <linux/io.h> > @@ -88,6 +90,7 @@ > #define TEMP_ADCVALIDMASK_VALID_HIGH BIT(5) > #define TEMP_ADCVALIDMASK_VALID_POS(bit) (bit) > > +/* MT8173 thermal sensors */ > #define MT8173_TS1 0 > #define MT8173_TS2 1 > #define MT8173_TS3 2 > @@ -97,35 +100,62 @@ > /* AUXADC channel 11 is used for the temperature sensors */ > #define MT8173_TEMP_AUXADC_CHANNEL 11 > > -/* The total number of temperature sensors in the MT8173 */ > -#define MT8173_NUM_SENSORS 5 > - > -/* The number of banks in the MT8173 */ > -#define MT8173_NUM_ZONES 4 > - > -/* The number of sensing points per bank */ > -#define MT8173_NUM_SENSORS_PER_ZONE 4 > - > /* Layout of the fuses providing the calibration data */ > -#define MT8173_CALIB_BUF0_VALID BIT(0) > -#define MT8173_CALIB_BUF1_ADC_GE(x) (((x) >> 22) & 0x3ff) > -#define MT8173_CALIB_BUF0_VTS_TS1(x) (((x) >> 17) & 0x1ff) > -#define MT8173_CALIB_BUF0_VTS_TS2(x) (((x) >> 8) & 0x1ff) > -#define MT8173_CALIB_BUF1_VTS_TS3(x) (((x) >> 0) & 0x1ff) > -#define MT8173_CALIB_BUF2_VTS_TS4(x) (((x) >> 23) & 0x1ff) > -#define MT8173_CALIB_BUF2_VTS_TSABB(x) (((x) >> 14) & 0x1ff) > -#define MT8173_CALIB_BUF0_DEGC_CALI(x) (((x) >> 1) & 0x3f) > -#define MT8173_CALIB_BUF0_O_SLOPE(x) (((x) >> 26) & 0x3f) > +#define CALIB_BUF0_VALID BIT(0) > +#define CALIB_BUF1_ADC_GE(x) (((x) >> 22) & 0x3ff) > +#define CALIB_BUF0_VTS_TS1(x) (((x) >> 17) & 0x1ff) > +#define CALIB_BUF0_VTS_TS2(x) (((x) >> 8) & 0x1ff) > +#define CALIB_BUF1_VTS_TS3(x) (((x) >> 0) & 0x1ff) > +#define CALIB_BUF2_VTS_TS4(x) (((x) >> 23) & 0x1ff) > +#define CALIB_BUF2_VTS_TS5(x) (((x) >> 14) & 0x1ff) > +#define CALIB_BUF0_DEGC_CALI(x) (((x) >> 1) & 0x3f) > +#define CALIB_BUF0_O_SLOPE(x) (((x) >> 26) & 0x3f) > + IMHO the above changes from defining CALIB_BUF1_ADC_GE(x) to CALIB_BUF0_O_SLOPE(x) can be avoided. We are just renaming the same defines to a generic name. Instead the macro starting with MT8173 can only be used wherever needed commonly both by 8173 instance and for 2701 instance. > +#define NVMEM_TS1 0 > +#define NVMEM_TS2 1 > +#define NVMEM_TS3 2 > +#define NVMEM_TS4 3 > +#define NVMEM_TS5 4 > + > +/* MT2701 thermal sensors */ > +#define MT2701_TS1 0 > +#define MT2701_TS2 1 > +#define MT2701_TSABB 2 > + > +/* AUXADC channel 11 is used for the temperature sensors */ > +#define MT2701_TEMP_AUXADC_CHANNEL 11 > > #define THERMAL_NAME "mtk-thermal" > > +/* Maximum support banks */ > +#define MAX_NUM_BANK 5 Why is this 5? Commit message states: MT8173 has four banks and five sensors, and MT2701 has only one bank and three sensors. Am i missing something here? > + > struct mtk_thermal; > > +struct thermal_bank_cfg { > + unsigned int num_sensors; > + unsigned int sensors[MAX_NUM_BANK]; > +}; > + > struct mtk_thermal_bank { > struct mtk_thermal *mt; > int id; > }; > > +struct mtk_thermal_sense_point { > + int msr; > + int adcpnp; > +}; > + > +struct mtk_thermal_data { > + struct thermal_bank_cfg bank_data[MAX_NUM_BANK]; So for MT8173 we are allocating one bank extra and for MT2701 we are allocating 4 banks extra right? Why not do something like this: struct thermal_bank *banks_data Assign the array based on the SoC type? > + struct mtk_thermal_sense_point sensing_points[MAX_NUM_BANK]; > + int sensor_mux_values[MAX_NUM_BANK]; > + s32 num_banks; > + s32 num_sensors; > + s32 auxadc_channel; > +}; > + > struct mtk_thermal { > struct device *dev; > void __iomem *thermal_base; > @@ -133,27 +163,20 @@ struct mtk_thermal { > struct clk *clk_peri_therm; > struct clk *clk_auxadc; > > - struct mtk_thermal_bank banks[MT8173_NUM_ZONES]; > - > + struct mtk_thermal_bank banks[MAX_NUM_BANK]; Here again some extra memory allocation. Why not keep a pointer which points to the desired array? > + const struct mtk_thermal_data *conf; > /* lock: for getting and putting banks */ > struct mutex lock; > + struct thermal_zone_device *tzd; > > /* Calibration values */ > s32 adc_ge; > s32 degc_cali; > s32 o_slope; > - s32 vts[MT8173_NUM_SENSORS]; > - > -}; > - > -struct mtk_thermal_bank_cfg { > - unsigned int num_sensors; > - unsigned int sensors[MT8173_NUM_SENSORS_PER_ZONE]; > + s32 vts[MAX_NUM_BANK]; > }; > > -static const int sensor_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 }; > - > -/* > +/** > * The MT8173 thermal controller has four banks. Each bank can read up to > * four temperature sensors simultaneously. The MT8173 has a total of 5 > * temperature sensors. We use each bank to measure a certain area of the > @@ -166,42 +189,76 @@ static const int sensor_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 }; > * data, and this indeed needs the temperatures of the individual banks > * for making better decisions. > */ > -static const struct mtk_thermal_bank_cfg bank_data[] = { > - { > - .num_sensors = 2, > - .sensors = { MT8173_TS2, MT8173_TS3 }, > - }, { > - .num_sensors = 2, > - .sensors = { MT8173_TS2, MT8173_TS4 }, > - }, { > - .num_sensors = 3, > - .sensors = { MT8173_TS1, MT8173_TS2, MT8173_TSABB }, > - }, { > - .num_sensors = 1, > - .sensors = { MT8173_TS2 }, > +static const struct mtk_thermal_data mt8173_thermal_data = { > + .auxadc_channel = MT8173_TEMP_AUXADC_CHANNEL, > + .num_banks = 4, > + .num_sensors = 5, > + .bank_data = { > + { > + .num_sensors = 2, > + .sensors = { MT8173_TS2, MT8173_TS3 }, > + }, { > + .num_sensors = 2, > + .sensors = { MT8173_TS2, MT8173_TS4 }, > + }, { > + .num_sensors = 3, > + .sensors = { MT8173_TS1, MT8173_TS2, MT8173_TSABB }, > + }, { > + .num_sensors = 1, > + .sensors = { MT8173_TS2 }, > + }, > }, > + .sensing_points = { > + { > + .msr = TEMP_MSR0, > + .adcpnp = TEMP_ADCPNP0, > + }, { > + .msr = TEMP_MSR1, > + .adcpnp = TEMP_ADCPNP1, > + }, { > + .msr = TEMP_MSR2, > + .adcpnp = TEMP_ADCPNP2, > + }, { > + .msr = TEMP_MSR3, > + .adcpnp = TEMP_ADCPNP3, > + }, > + }, > + .sensor_mux_values = { 0, 1, 2, 3, 16 }, > }; > > -struct mtk_thermal_sense_point { > - int msr; > - int adcpnp; > -}; > - > -static const struct mtk_thermal_sense_point > - sensing_points[MT8173_NUM_SENSORS_PER_ZONE] = { > - { > - .msr = TEMP_MSR0, > - .adcpnp = TEMP_ADCPNP0, > - }, { > - .msr = TEMP_MSR1, > - .adcpnp = TEMP_ADCPNP1, > - }, { > - .msr = TEMP_MSR2, > - .adcpnp = TEMP_ADCPNP2, > - }, { > - .msr = TEMP_MSR3, > - .adcpnp = TEMP_ADCPNP3, > +/** > + * The MT2701 thermal controller has one bank, which can read up to > + * three temperature sensors simultaneously. The MT2701 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 mt2701_thermal_data = { > + .auxadc_channel = MT2701_TEMP_AUXADC_CHANNEL, > + .num_banks = 1, > + .num_sensors = 3, > + .bank_data = { > + { > + .num_sensors = 3, > + .sensors = { MT2701_TS1, MT2701_TS2, MT2701_TSABB }, > + }, > }, > + .sensing_points = { > + { > + .msr = TEMP_MSR0, > + .adcpnp = TEMP_ADCPNP0, > + }, { > + .msr = TEMP_MSR1, > + .adcpnp = TEMP_ADCPNP1, > + }, { > + .msr = TEMP_MSR2, > + .adcpnp = TEMP_ADCPNP2, > + }, > + }, > + .sensor_mux_values = { 0, 1, 16}, > }; > > /** > @@ -270,13 +327,15 @@ static void mtk_thermal_put_bank(struct mtk_thermal_bank *bank) > static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank) > { > struct mtk_thermal *mt = bank->mt; > + const struct mtk_thermal_data *conf = mt->conf; > int i, temp = INT_MIN, max = INT_MIN; > u32 raw; > > - for (i = 0; i < bank_data[bank->id].num_sensors; i++) { > - raw = readl(mt->thermal_base + sensing_points[i].msr); > + for (i = 0; i < conf->bank_data[bank->id].num_sensors; i++) { > + raw = readl(mt->thermal_base + conf->sensing_points[i].msr); > > - temp = raw_to_mcelsius(mt, bank_data[bank->id].sensors[i], raw); > + temp = raw_to_mcelsius(mt, conf->bank_data[bank->id].sensors[i], > + raw); > > /* > * The first read of a sensor often contains very high bogus > @@ -299,7 +358,7 @@ static int mtk_read_temp(void *data, int *temperature) > int i; > int tempmax = INT_MIN; > > - for (i = 0; i < MT8173_NUM_ZONES; i++) { > + for (i = 0; i < mt->conf->num_banks; i++) { > struct mtk_thermal_bank *bank = &mt->banks[i]; > > mtk_thermal_get_bank(bank); > @@ -322,7 +381,7 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > u32 apmixed_phys_base, u32 auxadc_phys_base) > { > struct mtk_thermal_bank *bank = &mt->banks[num]; > - const struct mtk_thermal_bank_cfg *cfg = &bank_data[num]; > + const struct mtk_thermal_data *conf = mt->conf; > int i; > > bank->id = num; > @@ -368,7 +427,7 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > * this value will be stored to TEMP_PNPMUXADDR (TEMP_SPARE0) > * automatically by hw > */ > - writel(BIT(MT8173_TEMP_AUXADC_CHANNEL), mt->thermal_base + TEMP_ADCMUX); > + writel(BIT(conf->auxadc_channel), mt->thermal_base + TEMP_ADCMUX); > > /* AHB address for auxadc mux selection */ > writel(auxadc_phys_base + AUXADC_CON1_CLR_V, > @@ -379,18 +438,18 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > mt->thermal_base + TEMP_PNPMUXADDR); > > /* AHB value for auxadc enable */ > - writel(BIT(MT8173_TEMP_AUXADC_CHANNEL), mt->thermal_base + TEMP_ADCEN); > + writel(BIT(conf->auxadc_channel), mt->thermal_base + TEMP_ADCEN); > > /* AHB address for auxadc enable (channel 0 immediate mode selected) */ > writel(auxadc_phys_base + AUXADC_CON1_SET_V, > mt->thermal_base + TEMP_ADCENADDR); > > /* AHB address for auxadc valid bit */ > - writel(auxadc_phys_base + AUXADC_DATA(MT8173_TEMP_AUXADC_CHANNEL), > + writel(auxadc_phys_base + AUXADC_DATA(conf->auxadc_channel), > mt->thermal_base + TEMP_ADCVALIDADDR); > > /* AHB address for auxadc voltage output */ > - writel(auxadc_phys_base + AUXADC_DATA(MT8173_TEMP_AUXADC_CHANNEL), > + writel(auxadc_phys_base + AUXADC_DATA(conf->auxadc_channel), > mt->thermal_base + TEMP_ADCVOLTADDR); > > /* read valid & voltage are at the same register */ > @@ -407,11 +466,12 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > writel(TEMP_ADCWRITECTRL_ADC_MUX_WRITE, > mt->thermal_base + TEMP_ADCWRITECTRL); > > - for (i = 0; i < cfg->num_sensors; i++) > - writel(sensor_mux_values[cfg->sensors[i]], > - mt->thermal_base + sensing_points[i].adcpnp); > + for (i = 0; i < conf->bank_data[num].num_sensors; i++) > + writel(conf->sensor_mux_values[conf->bank_data[num].sensors[i]], > + mt->thermal_base + conf->sensing_points[i].adcpnp); > > - writel((1 << cfg->num_sensors) - 1, mt->thermal_base + TEMP_MONCTL0); > + writel((1 << conf->bank_data[num].num_sensors) - 1, > + mt->thermal_base + TEMP_MONCTL0); > > writel(TEMP_ADCWRITECTRL_ADC_PNP_WRITE | > TEMP_ADCWRITECTRL_ADC_MUX_WRITE, > @@ -442,7 +502,7 @@ static int mtk_thermal_get_calibration_data(struct device *dev, > > /* Start with default values */ > mt->adc_ge = 512; > - for (i = 0; i < MT8173_NUM_SENSORS; i++) > + for (i = 0; i < mt->conf->num_sensors; i++) > mt->vts[i] = 260; > mt->degc_cali = 40; > mt->o_slope = 0; > @@ -467,15 +527,15 @@ static int mtk_thermal_get_calibration_data(struct device *dev, > goto out; > } > > - if (buf[0] & MT8173_CALIB_BUF0_VALID) { > - mt->adc_ge = MT8173_CALIB_BUF1_ADC_GE(buf[1]); > - mt->vts[MT8173_TS1] = MT8173_CALIB_BUF0_VTS_TS1(buf[0]); > - mt->vts[MT8173_TS2] = MT8173_CALIB_BUF0_VTS_TS2(buf[0]); > - mt->vts[MT8173_TS3] = MT8173_CALIB_BUF1_VTS_TS3(buf[1]); > - mt->vts[MT8173_TS4] = MT8173_CALIB_BUF2_VTS_TS4(buf[2]); > - mt->vts[MT8173_TSABB] = MT8173_CALIB_BUF2_VTS_TSABB(buf[2]); > - mt->degc_cali = MT8173_CALIB_BUF0_DEGC_CALI(buf[0]); > - mt->o_slope = MT8173_CALIB_BUF0_O_SLOPE(buf[0]); > + if (buf[0] & CALIB_BUF0_VALID) { > + mt->adc_ge = CALIB_BUF1_ADC_GE(buf[1]); > + mt->vts[NVMEM_TS1] = CALIB_BUF0_VTS_TS1(buf[0]); > + mt->vts[NVMEM_TS2] = CALIB_BUF0_VTS_TS2(buf[0]); > + mt->vts[NVMEM_TS3] = CALIB_BUF1_VTS_TS3(buf[1]); > + mt->vts[NVMEM_TS4] = CALIB_BUF2_VTS_TS4(buf[1]); > + mt->vts[NVMEM_TS5] = CALIB_BUF2_VTS_TS5(buf[2]); > + mt->degc_cali = CALIB_BUF0_DEGC_CALI(buf[0]); > + mt->o_slope = CALIB_BUF0_O_SLOPE(buf[0]); I guess even the above code changes can be avoided if we just retain macros starting with MT8173? Best Regards, Keerthy > } else { > dev_info(dev, "Device not calibrated, using default calibration values\n"); > } > @@ -486,18 +546,36 @@ out: > return ret; > } > > +static const struct of_device_id mtk_thermal_of_match[] = { > + { > + .compatible = "mediatek,mt8173-thermal", > + .data = (void *)&mt8173_thermal_data, > + }, > + { > + .compatible = "mediatek,mt2701-thermal", > + .data = (void *)&mt2701_thermal_data, > + }, { > + }, > +}; > +MODULE_DEVICE_TABLE(of, mtk_thermal_of_match); > + > static int mtk_thermal_probe(struct platform_device *pdev) > { > int ret, i; > struct device_node *auxadc, *apmixedsys, *np = pdev->dev.of_node; > struct mtk_thermal *mt; > struct resource *res; > + const struct of_device_id *of_id; > u64 auxadc_phys_base, apmixed_phys_base; > > mt = devm_kzalloc(&pdev->dev, sizeof(*mt), GFP_KERNEL); > if (!mt) > return -ENOMEM; > > + of_id = of_match_device(mtk_thermal_of_match, &pdev->dev); > + if (of_id) > + mt->conf = (const struct mtk_thermal_data *)of_id->data; > + > mt->clk_peri_therm = devm_clk_get(&pdev->dev, "therm"); > if (IS_ERR(mt->clk_peri_therm)) > return PTR_ERR(mt->clk_peri_therm); > @@ -565,7 +643,7 @@ static int mtk_thermal_probe(struct platform_device *pdev) > goto err_disable_clk_auxadc; > } > > - for (i = 0; i < MT8173_NUM_ZONES; i++) > + for (i = 0; i < mt->conf->num_banks; i++) > mtk_thermal_init_bank(mt, i, apmixed_phys_base, > auxadc_phys_base); > > @@ -592,13 +670,6 @@ static int mtk_thermal_remove(struct platform_device *pdev) > return 0; > } > > -static const struct of_device_id mtk_thermal_of_match[] = { > - { > - .compatible = "mediatek,mt8173-thermal", > - }, { > - }, > -}; > - > static struct platform_driver mtk_thermal_driver = { > .probe = mtk_thermal_probe, > .remove = mtk_thermal_remove, > @@ -610,6 +681,7 @@ static struct platform_driver mtk_thermal_driver = { > > module_platform_driver(mtk_thermal_driver); > > +MODULE_AUTHOR("Dawei Chien <dawei.chien@mediatek.com>"); > MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); > MODULE_AUTHOR("Hanyi Wu <hanyi.wu@mediatek.com>"); > MODULE_DESCRIPTION("Mediatek thermal driver"); > ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 2/3] thermal: Add Mediatek thermal driver for mt2701. 2016-07-07 11:54 ` Keerthy @ 2016-07-11 8:56 ` dawei chien 2016-08-09 5:55 ` dawei chien 0 siblings, 1 reply; 32+ messages in thread From: dawei chien @ 2016-07-11 8:56 UTC (permalink / raw) To: linux-arm-kernel Dear Keerthy, On Thu, 2016-07-07 at 17:24 +0530, Keerthy wrote: > Hi Dawei Chien, > > > On Thursday 07 July 2016 02:36 PM, Dawei Chien wrote: > > This patch adds support for mt2701 chip to mtk_thermal.c, > > and integrate both mt8173 and mt2701 on the same driver. > > MT8173 has four banks and five sensors, and MT2701 has > > only one bank and three sensors. > > > > Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> > > --- > > drivers/thermal/mtk_thermal.c | 258 ++++++++++++++++++++++++++--------------- > > 1 file changed, 165 insertions(+), 93 deletions(-) > > > > diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c > > index 262ab0a..860f2e2 100644 > > --- a/drivers/thermal/mtk_thermal.c > > +++ b/drivers/thermal/mtk_thermal.c > > @@ -2,6 +2,7 @@ > > * Copyright (c) 2015 MediaTek Inc. > > * Author: Hanyi Wu <hanyi.wu@mediatek.com> > > * Sascha Hauer <s.hauer@pengutronix.de> > > + * Dawei Chien <dawei.chien@mediatek.com> > > * > > * This program is free software; you can redistribute it and/or modify > > * it under the terms of the GNU General Public License version 2 as > > @@ -21,6 +22,7 @@ > > #include <linux/nvmem-consumer.h> > > #include <linux/of.h> > > #include <linux/of_address.h> > > +#include <linux/of_device.h> > > #include <linux/platform_device.h> > > #include <linux/slab.h> > > #include <linux/io.h> > > @@ -88,6 +90,7 @@ > > #define TEMP_ADCVALIDMASK_VALID_HIGH BIT(5) > > #define TEMP_ADCVALIDMASK_VALID_POS(bit) (bit) > > > > +/* MT8173 thermal sensors */ > > #define MT8173_TS1 0 > > #define MT8173_TS2 1 > > #define MT8173_TS3 2 > > @@ -97,35 +100,62 @@ > > /* AUXADC channel 11 is used for the temperature sensors */ > > #define MT8173_TEMP_AUXADC_CHANNEL 11 > > > > -/* The total number of temperature sensors in the MT8173 */ > > -#define MT8173_NUM_SENSORS 5 > > - > > -/* The number of banks in the MT8173 */ > > -#define MT8173_NUM_ZONES 4 > > - > > -/* The number of sensing points per bank */ > > -#define MT8173_NUM_SENSORS_PER_ZONE 4 > > - > > /* Layout of the fuses providing the calibration data */ > > -#define MT8173_CALIB_BUF0_VALID BIT(0) > > -#define MT8173_CALIB_BUF1_ADC_GE(x) (((x) >> 22) & 0x3ff) > > -#define MT8173_CALIB_BUF0_VTS_TS1(x) (((x) >> 17) & 0x1ff) > > -#define MT8173_CALIB_BUF0_VTS_TS2(x) (((x) >> 8) & 0x1ff) > > -#define MT8173_CALIB_BUF1_VTS_TS3(x) (((x) >> 0) & 0x1ff) > > -#define MT8173_CALIB_BUF2_VTS_TS4(x) (((x) >> 23) & 0x1ff) > > -#define MT8173_CALIB_BUF2_VTS_TSABB(x) (((x) >> 14) & 0x1ff) > > -#define MT8173_CALIB_BUF0_DEGC_CALI(x) (((x) >> 1) & 0x3f) > > -#define MT8173_CALIB_BUF0_O_SLOPE(x) (((x) >> 26) & 0x3f) > > +#define CALIB_BUF0_VALID BIT(0) > > +#define CALIB_BUF1_ADC_GE(x) (((x) >> 22) & 0x3ff) > > +#define CALIB_BUF0_VTS_TS1(x) (((x) >> 17) & 0x1ff) > > +#define CALIB_BUF0_VTS_TS2(x) (((x) >> 8) & 0x1ff) > > +#define CALIB_BUF1_VTS_TS3(x) (((x) >> 0) & 0x1ff) > > +#define CALIB_BUF2_VTS_TS4(x) (((x) >> 23) & 0x1ff) > > +#define CALIB_BUF2_VTS_TS5(x) (((x) >> 14) & 0x1ff) > > +#define CALIB_BUF0_DEGC_CALI(x) (((x) >> 1) & 0x3f) > > +#define CALIB_BUF0_O_SLOPE(x) (((x) >> 26) & 0x3f) > > + > > IMHO the above changes from defining CALIB_BUF1_ADC_GE(x) to > CALIB_BUF0_O_SLOPE(x) can be avoided. We are just renaming the same > defines to a generic name. Instead the macro starting with MT8173 can > only be used wherever needed commonly both by 8173 instance and for > 2701 instance. > I would have a try to keep MT8173 original one and add some comment for the macro starting on next version. > > +#define NVMEM_TS1 0 > > +#define NVMEM_TS2 1 > > +#define NVMEM_TS3 2 > > +#define NVMEM_TS4 3 > > +#define NVMEM_TS5 4 > > + Does these need to keep the old one MT8173_TS1/MT8173_TS2/MT8173_TS3/MT8173_TS4/MT8173_TSABB > > +/* MT2701 thermal sensors */ > > +#define MT2701_TS1 0 > > +#define MT2701_TS2 1 > > +#define MT2701_TSABB 2 > > + > > +/* AUXADC channel 11 is used for the temperature sensors */ > > +#define MT2701_TEMP_AUXADC_CHANNEL 11 > > > > #define THERMAL_NAME "mtk-thermal" > > > > +/* Maximum support banks */ > > +#define MAX_NUM_BANK 5 > > Why is this 5? > Commit message states: MT8173 has four banks and five sensors, and > MT2701 has only one bank and three sensors. Am i missing something here? > This is my miss, it should be 4, but it line might remove since I would depend on SoC type to assign array for next version. > > + > > struct mtk_thermal; > > > > +struct thermal_bank_cfg { > > + unsigned int num_sensors; > > + unsigned int sensors[MAX_NUM_BANK]; > > +}; > > + > > struct mtk_thermal_bank { > > struct mtk_thermal *mt; > > int id; > > }; > > > > +struct mtk_thermal_sense_point { > > + int msr; > > + int adcpnp; > > +}; > > + > > +struct mtk_thermal_data { > > + struct thermal_bank_cfg bank_data[MAX_NUM_BANK]; > > So for MT8173 we are allocating one bank extra and for MT2701 we are > allocating 4 banks extra right? Why not do something like this: > > struct thermal_bank *banks_data > Assign the array based on the SoC type? > Yes, I agree with you, I would update it on next version. > > + struct mtk_thermal_sense_point sensing_points[MAX_NUM_BANK]; > > + int sensor_mux_values[MAX_NUM_BANK]; > > + s32 num_banks; > > + s32 num_sensors; > > + s32 auxadc_channel; > > +}; > > + > > struct mtk_thermal { > > struct device *dev; > > void __iomem *thermal_base; > > @@ -133,27 +163,20 @@ struct mtk_thermal { > > struct clk *clk_peri_therm; > > struct clk *clk_auxadc; > > > > - struct mtk_thermal_bank banks[MT8173_NUM_ZONES]; > > - > > + struct mtk_thermal_bank banks[MAX_NUM_BANK]; > > Here again some extra memory allocation. > > Why not keep a pointer which points to the desired array? > > > + const struct mtk_thermal_data *conf; > > /* lock: for getting and putting banks */ > > struct mutex lock; > > + struct thermal_zone_device *tzd; > > > > /* Calibration values */ > > s32 adc_ge; > > s32 degc_cali; > > s32 o_slope; > > - s32 vts[MT8173_NUM_SENSORS]; > > - > > -}; > > - > > -struct mtk_thermal_bank_cfg { > > - unsigned int num_sensors; > > - unsigned int sensors[MT8173_NUM_SENSORS_PER_ZONE]; > > + s32 vts[MAX_NUM_BANK]; > > }; > > > > -static const int sensor_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 }; > > - > > -/* > > +/** > > * The MT8173 thermal controller has four banks. Each bank can read up to > > * four temperature sensors simultaneously. The MT8173 has a total of 5 > > * temperature sensors. We use each bank to measure a certain area of the > > @@ -166,42 +189,76 @@ static const int sensor_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 }; > > * data, and this indeed needs the temperatures of the individual banks > > * for making better decisions. > > */ > > -static const struct mtk_thermal_bank_cfg bank_data[] = { > > - { > > - .num_sensors = 2, > > - .sensors = { MT8173_TS2, MT8173_TS3 }, > > - }, { > > - .num_sensors = 2, > > - .sensors = { MT8173_TS2, MT8173_TS4 }, > > - }, { > > - .num_sensors = 3, > > - .sensors = { MT8173_TS1, MT8173_TS2, MT8173_TSABB }, > > - }, { > > - .num_sensors = 1, > > - .sensors = { MT8173_TS2 }, > > +static const struct mtk_thermal_data mt8173_thermal_data = { > > + .auxadc_channel = MT8173_TEMP_AUXADC_CHANNEL, > > + .num_banks = 4, > > + .num_sensors = 5, > > + .bank_data = { > > + { > > + .num_sensors = 2, > > + .sensors = { MT8173_TS2, MT8173_TS3 }, > > + }, { > > + .num_sensors = 2, > > + .sensors = { MT8173_TS2, MT8173_TS4 }, > > + }, { > > + .num_sensors = 3, > > + .sensors = { MT8173_TS1, MT8173_TS2, MT8173_TSABB }, > > + }, { > > + .num_sensors = 1, > > + .sensors = { MT8173_TS2 }, > > + }, > > }, > > + .sensing_points = { > > + { > > + .msr = TEMP_MSR0, > > + .adcpnp = TEMP_ADCPNP0, > > + }, { > > + .msr = TEMP_MSR1, > > + .adcpnp = TEMP_ADCPNP1, > > + }, { > > + .msr = TEMP_MSR2, > > + .adcpnp = TEMP_ADCPNP2, > > + }, { > > + .msr = TEMP_MSR3, > > + .adcpnp = TEMP_ADCPNP3, > > + }, > > + }, > > + .sensor_mux_values = { 0, 1, 2, 3, 16 }, > > }; > > > > -struct mtk_thermal_sense_point { > > - int msr; > > - int adcpnp; > > -}; > > - > > -static const struct mtk_thermal_sense_point > > - sensing_points[MT8173_NUM_SENSORS_PER_ZONE] = { > > - { > > - .msr = TEMP_MSR0, > > - .adcpnp = TEMP_ADCPNP0, > > - }, { > > - .msr = TEMP_MSR1, > > - .adcpnp = TEMP_ADCPNP1, > > - }, { > > - .msr = TEMP_MSR2, > > - .adcpnp = TEMP_ADCPNP2, > > - }, { > > - .msr = TEMP_MSR3, > > - .adcpnp = TEMP_ADCPNP3, > > +/** > > + * The MT2701 thermal controller has one bank, which can read up to > > + * three temperature sensors simultaneously. The MT2701 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 mt2701_thermal_data = { > > + .auxadc_channel = MT2701_TEMP_AUXADC_CHANNEL, > > + .num_banks = 1, > > + .num_sensors = 3, > > + .bank_data = { > > + { > > + .num_sensors = 3, > > + .sensors = { MT2701_TS1, MT2701_TS2, MT2701_TSABB }, > > + }, > > }, > > + .sensing_points = { > > + { > > + .msr = TEMP_MSR0, > > + .adcpnp = TEMP_ADCPNP0, > > + }, { > > + .msr = TEMP_MSR1, > > + .adcpnp = TEMP_ADCPNP1, > > + }, { > > + .msr = TEMP_MSR2, > > + .adcpnp = TEMP_ADCPNP2, > > + }, > > + }, > > + .sensor_mux_values = { 0, 1, 16}, > > }; > > > > /** > > @@ -270,13 +327,15 @@ static void mtk_thermal_put_bank(struct mtk_thermal_bank *bank) > > static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank) > > { > > struct mtk_thermal *mt = bank->mt; > > + const struct mtk_thermal_data *conf = mt->conf; > > int i, temp = INT_MIN, max = INT_MIN; > > u32 raw; > > > > - for (i = 0; i < bank_data[bank->id].num_sensors; i++) { > > - raw = readl(mt->thermal_base + sensing_points[i].msr); > > + for (i = 0; i < conf->bank_data[bank->id].num_sensors; i++) { > > + raw = readl(mt->thermal_base + conf->sensing_points[i].msr); > > > > - temp = raw_to_mcelsius(mt, bank_data[bank->id].sensors[i], raw); > > + temp = raw_to_mcelsius(mt, conf->bank_data[bank->id].sensors[i], > > + raw); > > > > /* > > * The first read of a sensor often contains very high bogus > > @@ -299,7 +358,7 @@ static int mtk_read_temp(void *data, int *temperature) > > int i; > > int tempmax = INT_MIN; > > > > - for (i = 0; i < MT8173_NUM_ZONES; i++) { > > + for (i = 0; i < mt->conf->num_banks; i++) { > > struct mtk_thermal_bank *bank = &mt->banks[i]; > > > > mtk_thermal_get_bank(bank); > > @@ -322,7 +381,7 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > > u32 apmixed_phys_base, u32 auxadc_phys_base) > > { > > struct mtk_thermal_bank *bank = &mt->banks[num]; > > - const struct mtk_thermal_bank_cfg *cfg = &bank_data[num]; > > + const struct mtk_thermal_data *conf = mt->conf; > > int i; > > > > bank->id = num; > > @@ -368,7 +427,7 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > > * this value will be stored to TEMP_PNPMUXADDR (TEMP_SPARE0) > > * automatically by hw > > */ > > - writel(BIT(MT8173_TEMP_AUXADC_CHANNEL), mt->thermal_base + TEMP_ADCMUX); > > + writel(BIT(conf->auxadc_channel), mt->thermal_base + TEMP_ADCMUX); > > > > /* AHB address for auxadc mux selection */ > > writel(auxadc_phys_base + AUXADC_CON1_CLR_V, > > @@ -379,18 +438,18 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > > mt->thermal_base + TEMP_PNPMUXADDR); > > > > /* AHB value for auxadc enable */ > > - writel(BIT(MT8173_TEMP_AUXADC_CHANNEL), mt->thermal_base + TEMP_ADCEN); > > + writel(BIT(conf->auxadc_channel), mt->thermal_base + TEMP_ADCEN); > > > > /* AHB address for auxadc enable (channel 0 immediate mode selected) */ > > writel(auxadc_phys_base + AUXADC_CON1_SET_V, > > mt->thermal_base + TEMP_ADCENADDR); > > > > /* AHB address for auxadc valid bit */ > > - writel(auxadc_phys_base + AUXADC_DATA(MT8173_TEMP_AUXADC_CHANNEL), > > + writel(auxadc_phys_base + AUXADC_DATA(conf->auxadc_channel), > > mt->thermal_base + TEMP_ADCVALIDADDR); > > > > /* AHB address for auxadc voltage output */ > > - writel(auxadc_phys_base + AUXADC_DATA(MT8173_TEMP_AUXADC_CHANNEL), > > + writel(auxadc_phys_base + AUXADC_DATA(conf->auxadc_channel), > > mt->thermal_base + TEMP_ADCVOLTADDR); > > > > /* read valid & voltage are at the same register */ > > @@ -407,11 +466,12 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > > writel(TEMP_ADCWRITECTRL_ADC_MUX_WRITE, > > mt->thermal_base + TEMP_ADCWRITECTRL); > > > > - for (i = 0; i < cfg->num_sensors; i++) > > - writel(sensor_mux_values[cfg->sensors[i]], > > - mt->thermal_base + sensing_points[i].adcpnp); > > + for (i = 0; i < conf->bank_data[num].num_sensors; i++) > > + writel(conf->sensor_mux_values[conf->bank_data[num].sensors[i]], > > + mt->thermal_base + conf->sensing_points[i].adcpnp); > > > > - writel((1 << cfg->num_sensors) - 1, mt->thermal_base + TEMP_MONCTL0); > > + writel((1 << conf->bank_data[num].num_sensors) - 1, > > + mt->thermal_base + TEMP_MONCTL0); > > > > writel(TEMP_ADCWRITECTRL_ADC_PNP_WRITE | > > TEMP_ADCWRITECTRL_ADC_MUX_WRITE, > > @@ -442,7 +502,7 @@ static int mtk_thermal_get_calibration_data(struct device *dev, > > > > /* Start with default values */ > > mt->adc_ge = 512; > > - for (i = 0; i < MT8173_NUM_SENSORS; i++) > > + for (i = 0; i < mt->conf->num_sensors; i++) > > mt->vts[i] = 260; > > mt->degc_cali = 40; > > mt->o_slope = 0; > > @@ -467,15 +527,15 @@ static int mtk_thermal_get_calibration_data(struct device *dev, > > goto out; > > } > > > > - if (buf[0] & MT8173_CALIB_BUF0_VALID) { > > - mt->adc_ge = MT8173_CALIB_BUF1_ADC_GE(buf[1]); > > - mt->vts[MT8173_TS1] = MT8173_CALIB_BUF0_VTS_TS1(buf[0]); > > - mt->vts[MT8173_TS2] = MT8173_CALIB_BUF0_VTS_TS2(buf[0]); > > - mt->vts[MT8173_TS3] = MT8173_CALIB_BUF1_VTS_TS3(buf[1]); > > - mt->vts[MT8173_TS4] = MT8173_CALIB_BUF2_VTS_TS4(buf[2]); > > - mt->vts[MT8173_TSABB] = MT8173_CALIB_BUF2_VTS_TSABB(buf[2]); > > - mt->degc_cali = MT8173_CALIB_BUF0_DEGC_CALI(buf[0]); > > - mt->o_slope = MT8173_CALIB_BUF0_O_SLOPE(buf[0]); > > + if (buf[0] & CALIB_BUF0_VALID) { > > + mt->adc_ge = CALIB_BUF1_ADC_GE(buf[1]); > > + mt->vts[NVMEM_TS1] = CALIB_BUF0_VTS_TS1(buf[0]); > > + mt->vts[NVMEM_TS2] = CALIB_BUF0_VTS_TS2(buf[0]); > > + mt->vts[NVMEM_TS3] = CALIB_BUF1_VTS_TS3(buf[1]); > > + mt->vts[NVMEM_TS4] = CALIB_BUF2_VTS_TS4(buf[1]); > > + mt->vts[NVMEM_TS5] = CALIB_BUF2_VTS_TS5(buf[2]); > > + mt->degc_cali = CALIB_BUF0_DEGC_CALI(buf[0]); > > + mt->o_slope = CALIB_BUF0_O_SLOPE(buf[0]); > > I guess even the above code changes can be avoided if we just retain > macros starting with MT8173? > > Best Regards, > Keerthy > Yes, I think so, only different on the array size for vts since sensors number different between MT8173 & MT2701, I might separate it by SoC type on next version. BR, Dawei > > } else { > > dev_info(dev, "Device not calibrated, using default calibration values\n"); > > } > > @@ -486,18 +546,36 @@ out: > > return ret; > > } > > > > +static const struct of_device_id mtk_thermal_of_match[] = { > > + { > > + .compatible = "mediatek,mt8173-thermal", > > + .data = (void *)&mt8173_thermal_data, > > + }, > > + { > > + .compatible = "mediatek,mt2701-thermal", > > + .data = (void *)&mt2701_thermal_data, > > + }, { > > + }, > > +}; > > +MODULE_DEVICE_TABLE(of, mtk_thermal_of_match); > > + > > static int mtk_thermal_probe(struct platform_device *pdev) > > { > > int ret, i; > > struct device_node *auxadc, *apmixedsys, *np = pdev->dev.of_node; > > struct mtk_thermal *mt; > > struct resource *res; > > + const struct of_device_id *of_id; > > u64 auxadc_phys_base, apmixed_phys_base; > > > > mt = devm_kzalloc(&pdev->dev, sizeof(*mt), GFP_KERNEL); > > if (!mt) > > return -ENOMEM; > > > > + of_id = of_match_device(mtk_thermal_of_match, &pdev->dev); > > + if (of_id) > > + mt->conf = (const struct mtk_thermal_data *)of_id->data; > > + > > mt->clk_peri_therm = devm_clk_get(&pdev->dev, "therm"); > > if (IS_ERR(mt->clk_peri_therm)) > > return PTR_ERR(mt->clk_peri_therm); > > @@ -565,7 +643,7 @@ static int mtk_thermal_probe(struct platform_device *pdev) > > goto err_disable_clk_auxadc; > > } > > > > - for (i = 0; i < MT8173_NUM_ZONES; i++) > > + for (i = 0; i < mt->conf->num_banks; i++) > > mtk_thermal_init_bank(mt, i, apmixed_phys_base, > > auxadc_phys_base); > > > > @@ -592,13 +670,6 @@ static int mtk_thermal_remove(struct platform_device *pdev) > > return 0; > > } > > > > -static const struct of_device_id mtk_thermal_of_match[] = { > > - { > > - .compatible = "mediatek,mt8173-thermal", > > - }, { > > - }, > > -}; > > - > > static struct platform_driver mtk_thermal_driver = { > > .probe = mtk_thermal_probe, > > .remove = mtk_thermal_remove, > > @@ -610,6 +681,7 @@ static struct platform_driver mtk_thermal_driver = { > > > > module_platform_driver(mtk_thermal_driver); > > > > +MODULE_AUTHOR("Dawei Chien <dawei.chien@mediatek.com>"); > > MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); > > MODULE_AUTHOR("Hanyi Wu <hanyi.wu@mediatek.com>"); > > MODULE_DESCRIPTION("Mediatek thermal driver"); > > ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 2/3] thermal: Add Mediatek thermal driver for mt2701. 2016-07-11 8:56 ` dawei chien @ 2016-08-09 5:55 ` dawei chien 2016-08-09 5:57 ` Keerthy 0 siblings, 1 reply; 32+ messages in thread From: dawei chien @ 2016-08-09 5:55 UTC (permalink / raw) To: linux-arm-kernel Dear Keerthy, On Mon, 2016-07-11 at 16:56 +0800, dawei chien wrote: > Dear Keerthy, > > On Thu, 2016-07-07 at 17:24 +0530, Keerthy wrote: > > Hi Dawei Chien, > > > > > > On Thursday 07 July 2016 02:36 PM, Dawei Chien wrote: > > > This patch adds support for mt2701 chip to mtk_thermal.c, > > > and integrate both mt8173 and mt2701 on the same driver. > > > MT8173 has four banks and five sensors, and MT2701 has > > > only one bank and three sensors. > > > > > > Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> > > > --- > > > drivers/thermal/mtk_thermal.c | 258 ++++++++++++++++++++++++++--------------- > > > 1 file changed, 165 insertions(+), 93 deletions(-) > > > > > > diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c > > > index 262ab0a..860f2e2 100644 > > > --- a/drivers/thermal/mtk_thermal.c > > > +++ b/drivers/thermal/mtk_thermal.c > > > @@ -2,6 +2,7 @@ > > > * Copyright (c) 2015 MediaTek Inc. > > > * Author: Hanyi Wu <hanyi.wu@mediatek.com> > > > * Sascha Hauer <s.hauer@pengutronix.de> > > > + * Dawei Chien <dawei.chien@mediatek.com> > > > * > > > * This program is free software; you can redistribute it and/or modify > > > * it under the terms of the GNU General Public License version 2 as > > > @@ -21,6 +22,7 @@ > > > #include <linux/nvmem-consumer.h> > > > #include <linux/of.h> > > > #include <linux/of_address.h> > > > +#include <linux/of_device.h> > > > #include <linux/platform_device.h> > > > #include <linux/slab.h> > > > #include <linux/io.h> > > > @@ -88,6 +90,7 @@ > > > #define TEMP_ADCVALIDMASK_VALID_HIGH BIT(5) > > > #define TEMP_ADCVALIDMASK_VALID_POS(bit) (bit) > > > > > > +/* MT8173 thermal sensors */ > > > #define MT8173_TS1 0 > > > #define MT8173_TS2 1 > > > #define MT8173_TS3 2 > > > @@ -97,35 +100,62 @@ > > > /* AUXADC channel 11 is used for the temperature sensors */ > > > #define MT8173_TEMP_AUXADC_CHANNEL 11 > > > > > > -/* The total number of temperature sensors in the MT8173 */ > > > -#define MT8173_NUM_SENSORS 5 > > > - > > > -/* The number of banks in the MT8173 */ > > > -#define MT8173_NUM_ZONES 4 > > > - > > > -/* The number of sensing points per bank */ > > > -#define MT8173_NUM_SENSORS_PER_ZONE 4 > > > - > > > /* Layout of the fuses providing the calibration data */ > > > -#define MT8173_CALIB_BUF0_VALID BIT(0) > > > -#define MT8173_CALIB_BUF1_ADC_GE(x) (((x) >> 22) & 0x3ff) > > > -#define MT8173_CALIB_BUF0_VTS_TS1(x) (((x) >> 17) & 0x1ff) > > > -#define MT8173_CALIB_BUF0_VTS_TS2(x) (((x) >> 8) & 0x1ff) > > > -#define MT8173_CALIB_BUF1_VTS_TS3(x) (((x) >> 0) & 0x1ff) > > > -#define MT8173_CALIB_BUF2_VTS_TS4(x) (((x) >> 23) & 0x1ff) > > > -#define MT8173_CALIB_BUF2_VTS_TSABB(x) (((x) >> 14) & 0x1ff) > > > -#define MT8173_CALIB_BUF0_DEGC_CALI(x) (((x) >> 1) & 0x3f) > > > -#define MT8173_CALIB_BUF0_O_SLOPE(x) (((x) >> 26) & 0x3f) > > > +#define CALIB_BUF0_VALID BIT(0) > > > +#define CALIB_BUF1_ADC_GE(x) (((x) >> 22) & 0x3ff) > > > +#define CALIB_BUF0_VTS_TS1(x) (((x) >> 17) & 0x1ff) > > > +#define CALIB_BUF0_VTS_TS2(x) (((x) >> 8) & 0x1ff) > > > +#define CALIB_BUF1_VTS_TS3(x) (((x) >> 0) & 0x1ff) > > > +#define CALIB_BUF2_VTS_TS4(x) (((x) >> 23) & 0x1ff) > > > +#define CALIB_BUF2_VTS_TS5(x) (((x) >> 14) & 0x1ff) > > > +#define CALIB_BUF0_DEGC_CALI(x) (((x) >> 1) & 0x3f) > > > +#define CALIB_BUF0_O_SLOPE(x) (((x) >> 26) & 0x3f) > > > + > > > > IMHO the above changes from defining CALIB_BUF1_ADC_GE(x) to > > CALIB_BUF0_O_SLOPE(x) can be avoided. We are just renaming the same > > defines to a generic name. Instead the macro starting with MT8173 can > > only be used wherever needed commonly both by 8173 instance and for > > 2701 instance. > > > > I would have a try to keep MT8173 original one and add some comment for > the macro starting on next version. Just confirm again, we don't need change common macro name, and just need to add comment for MT8173/MT2701, right? > > > +#define NVMEM_TS1 0 > > > +#define NVMEM_TS2 1 > > > +#define NVMEM_TS3 2 > > > +#define NVMEM_TS4 3 > > > +#define NVMEM_TS5 4 > > > + > > Does these need to keep the old one > MT8173_TS1/MT8173_TS2/MT8173_TS3/MT8173_TS4/MT8173_TSABB MT8173 has 5 sensors, so it need 5 address for calibration data. And MT2701 has three sensors, so it need 3 address for that. Do you think we need either keep the original one or rename for these. > > > > > +/* MT2701 thermal sensors */ > > > +#define MT2701_TS1 0 > > > +#define MT2701_TS2 1 > > > +#define MT2701_TSABB 2 > > > + > > > +/* AUXADC channel 11 is used for the temperature sensors */ > > > +#define MT2701_TEMP_AUXADC_CHANNEL 11 > > > > > > #define THERMAL_NAME "mtk-thermal" > > > > > > +/* Maximum support banks */ > > > +#define MAX_NUM_BANK 5 > > > > Why is this 5? > > Commit message states: MT8173 has four banks and five sensors, and > > MT2701 has only one bank and three sensors. Am i missing something here? > > > > This is my miss, it should be 4, but it line might remove since I would > depend on SoC type to assign array for next version. > > > > + > > > struct mtk_thermal; > > > > > > +struct thermal_bank_cfg { > > > + unsigned int num_sensors; > > > + unsigned int sensors[MAX_NUM_BANK]; > > > +}; > > > + > > > struct mtk_thermal_bank { > > > struct mtk_thermal *mt; > > > int id; > > > }; > > > > > > +struct mtk_thermal_sense_point { > > > + int msr; > > > + int adcpnp; > > > +}; > > > + > > > +struct mtk_thermal_data { > > > + struct thermal_bank_cfg bank_data[MAX_NUM_BANK]; > > > > So for MT8173 we are allocating one bank extra and for MT2701 we are > > allocating 4 banks extra right? Why not do something like this: > > > > struct thermal_bank *banks_data > > Assign the array based on the SoC type? > > > > Yes, I agree with you, I would update it on next version. > > > > + struct mtk_thermal_sense_point sensing_points[MAX_NUM_BANK]; > > > + int sensor_mux_values[MAX_NUM_BANK]; > > > + s32 num_banks; > > > + s32 num_sensors; > > > + s32 auxadc_channel; > > > +}; > > > + > > > struct mtk_thermal { > > > struct device *dev; > > > void __iomem *thermal_base; > > > @@ -133,27 +163,20 @@ struct mtk_thermal { > > > struct clk *clk_peri_therm; > > > struct clk *clk_auxadc; > > > > > > - struct mtk_thermal_bank banks[MT8173_NUM_ZONES]; > > > - > > > + struct mtk_thermal_bank banks[MAX_NUM_BANK]; > > > > Here again some extra memory allocation. > > > > Why not keep a pointer which points to the desired array? > > > > > + const struct mtk_thermal_data *conf; > > > /* lock: for getting and putting banks */ > > > struct mutex lock; > > > + struct thermal_zone_device *tzd; > > > > > > /* Calibration values */ > > > s32 adc_ge; > > > s32 degc_cali; > > > s32 o_slope; > > > - s32 vts[MT8173_NUM_SENSORS]; > > > - > > > -}; > > > - > > > -struct mtk_thermal_bank_cfg { > > > - unsigned int num_sensors; > > > - unsigned int sensors[MT8173_NUM_SENSORS_PER_ZONE]; > > > + s32 vts[MAX_NUM_BANK]; > > > }; > > > > > > -static const int sensor_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 }; > > > - > > > -/* > > > +/** > > > * The MT8173 thermal controller has four banks. Each bank can read up to > > > * four temperature sensors simultaneously. The MT8173 has a total of 5 > > > * temperature sensors. We use each bank to measure a certain area of the > > > @@ -166,42 +189,76 @@ static const int sensor_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 }; > > > * data, and this indeed needs the temperatures of the individual banks > > > * for making better decisions. > > > */ > > > -static const struct mtk_thermal_bank_cfg bank_data[] = { > > > - { > > > - .num_sensors = 2, > > > - .sensors = { MT8173_TS2, MT8173_TS3 }, > > > - }, { > > > - .num_sensors = 2, > > > - .sensors = { MT8173_TS2, MT8173_TS4 }, > > > - }, { > > > - .num_sensors = 3, > > > - .sensors = { MT8173_TS1, MT8173_TS2, MT8173_TSABB }, > > > - }, { > > > - .num_sensors = 1, > > > - .sensors = { MT8173_TS2 }, > > > +static const struct mtk_thermal_data mt8173_thermal_data = { > > > + .auxadc_channel = MT8173_TEMP_AUXADC_CHANNEL, > > > + .num_banks = 4, > > > + .num_sensors = 5, > > > + .bank_data = { > > > + { > > > + .num_sensors = 2, > > > + .sensors = { MT8173_TS2, MT8173_TS3 }, > > > + }, { > > > + .num_sensors = 2, > > > + .sensors = { MT8173_TS2, MT8173_TS4 }, > > > + }, { > > > + .num_sensors = 3, > > > + .sensors = { MT8173_TS1, MT8173_TS2, MT8173_TSABB }, > > > + }, { > > > + .num_sensors = 1, > > > + .sensors = { MT8173_TS2 }, > > > + }, > > > }, > > > + .sensing_points = { > > > + { > > > + .msr = TEMP_MSR0, > > > + .adcpnp = TEMP_ADCPNP0, > > > + }, { > > > + .msr = TEMP_MSR1, > > > + .adcpnp = TEMP_ADCPNP1, > > > + }, { > > > + .msr = TEMP_MSR2, > > > + .adcpnp = TEMP_ADCPNP2, > > > + }, { > > > + .msr = TEMP_MSR3, > > > + .adcpnp = TEMP_ADCPNP3, > > > + }, > > > + }, > > > + .sensor_mux_values = { 0, 1, 2, 3, 16 }, > > > }; > > > > > > -struct mtk_thermal_sense_point { > > > - int msr; > > > - int adcpnp; > > > -}; > > > - > > > -static const struct mtk_thermal_sense_point > > > - sensing_points[MT8173_NUM_SENSORS_PER_ZONE] = { > > > - { > > > - .msr = TEMP_MSR0, > > > - .adcpnp = TEMP_ADCPNP0, > > > - }, { > > > - .msr = TEMP_MSR1, > > > - .adcpnp = TEMP_ADCPNP1, > > > - }, { > > > - .msr = TEMP_MSR2, > > > - .adcpnp = TEMP_ADCPNP2, > > > - }, { > > > - .msr = TEMP_MSR3, > > > - .adcpnp = TEMP_ADCPNP3, > > > +/** > > > + * The MT2701 thermal controller has one bank, which can read up to > > > + * three temperature sensors simultaneously. The MT2701 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 mt2701_thermal_data = { > > > + .auxadc_channel = MT2701_TEMP_AUXADC_CHANNEL, > > > + .num_banks = 1, > > > + .num_sensors = 3, > > > + .bank_data = { > > > + { > > > + .num_sensors = 3, > > > + .sensors = { MT2701_TS1, MT2701_TS2, MT2701_TSABB }, > > > + }, > > > }, > > > + .sensing_points = { > > > + { > > > + .msr = TEMP_MSR0, > > > + .adcpnp = TEMP_ADCPNP0, > > > + }, { > > > + .msr = TEMP_MSR1, > > > + .adcpnp = TEMP_ADCPNP1, > > > + }, { > > > + .msr = TEMP_MSR2, > > > + .adcpnp = TEMP_ADCPNP2, > > > + }, > > > + }, > > > + .sensor_mux_values = { 0, 1, 16}, > > > }; > > > > > > /** > > > @@ -270,13 +327,15 @@ static void mtk_thermal_put_bank(struct mtk_thermal_bank *bank) > > > static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank) > > > { > > > struct mtk_thermal *mt = bank->mt; > > > + const struct mtk_thermal_data *conf = mt->conf; > > > int i, temp = INT_MIN, max = INT_MIN; > > > u32 raw; > > > > > > - for (i = 0; i < bank_data[bank->id].num_sensors; i++) { > > > - raw = readl(mt->thermal_base + sensing_points[i].msr); > > > + for (i = 0; i < conf->bank_data[bank->id].num_sensors; i++) { > > > + raw = readl(mt->thermal_base + conf->sensing_points[i].msr); > > > > > > - temp = raw_to_mcelsius(mt, bank_data[bank->id].sensors[i], raw); > > > + temp = raw_to_mcelsius(mt, conf->bank_data[bank->id].sensors[i], > > > + raw); > > > > > > /* > > > * The first read of a sensor often contains very high bogus > > > @@ -299,7 +358,7 @@ static int mtk_read_temp(void *data, int *temperature) > > > int i; > > > int tempmax = INT_MIN; > > > > > > - for (i = 0; i < MT8173_NUM_ZONES; i++) { > > > + for (i = 0; i < mt->conf->num_banks; i++) { > > > struct mtk_thermal_bank *bank = &mt->banks[i]; > > > > > > mtk_thermal_get_bank(bank); > > > @@ -322,7 +381,7 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > > > u32 apmixed_phys_base, u32 auxadc_phys_base) > > > { > > > struct mtk_thermal_bank *bank = &mt->banks[num]; > > > - const struct mtk_thermal_bank_cfg *cfg = &bank_data[num]; > > > + const struct mtk_thermal_data *conf = mt->conf; > > > int i; > > > > > > bank->id = num; > > > @@ -368,7 +427,7 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > > > * this value will be stored to TEMP_PNPMUXADDR (TEMP_SPARE0) > > > * automatically by hw > > > */ > > > - writel(BIT(MT8173_TEMP_AUXADC_CHANNEL), mt->thermal_base + TEMP_ADCMUX); > > > + writel(BIT(conf->auxadc_channel), mt->thermal_base + TEMP_ADCMUX); > > > > > > /* AHB address for auxadc mux selection */ > > > writel(auxadc_phys_base + AUXADC_CON1_CLR_V, > > > @@ -379,18 +438,18 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > > > mt->thermal_base + TEMP_PNPMUXADDR); > > > > > > /* AHB value for auxadc enable */ > > > - writel(BIT(MT8173_TEMP_AUXADC_CHANNEL), mt->thermal_base + TEMP_ADCEN); > > > + writel(BIT(conf->auxadc_channel), mt->thermal_base + TEMP_ADCEN); > > > > > > /* AHB address for auxadc enable (channel 0 immediate mode selected) */ > > > writel(auxadc_phys_base + AUXADC_CON1_SET_V, > > > mt->thermal_base + TEMP_ADCENADDR); > > > > > > /* AHB address for auxadc valid bit */ > > > - writel(auxadc_phys_base + AUXADC_DATA(MT8173_TEMP_AUXADC_CHANNEL), > > > + writel(auxadc_phys_base + AUXADC_DATA(conf->auxadc_channel), > > > mt->thermal_base + TEMP_ADCVALIDADDR); > > > > > > /* AHB address for auxadc voltage output */ > > > - writel(auxadc_phys_base + AUXADC_DATA(MT8173_TEMP_AUXADC_CHANNEL), > > > + writel(auxadc_phys_base + AUXADC_DATA(conf->auxadc_channel), > > > mt->thermal_base + TEMP_ADCVOLTADDR); > > > > > > /* read valid & voltage are at the same register */ > > > @@ -407,11 +466,12 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > > > writel(TEMP_ADCWRITECTRL_ADC_MUX_WRITE, > > > mt->thermal_base + TEMP_ADCWRITECTRL); > > > > > > - for (i = 0; i < cfg->num_sensors; i++) > > > - writel(sensor_mux_values[cfg->sensors[i]], > > > - mt->thermal_base + sensing_points[i].adcpnp); > > > + for (i = 0; i < conf->bank_data[num].num_sensors; i++) > > > + writel(conf->sensor_mux_values[conf->bank_data[num].sensors[i]], > > > + mt->thermal_base + conf->sensing_points[i].adcpnp); > > > > > > - writel((1 << cfg->num_sensors) - 1, mt->thermal_base + TEMP_MONCTL0); > > > + writel((1 << conf->bank_data[num].num_sensors) - 1, > > > + mt->thermal_base + TEMP_MONCTL0); > > > > > > writel(TEMP_ADCWRITECTRL_ADC_PNP_WRITE | > > > TEMP_ADCWRITECTRL_ADC_MUX_WRITE, > > > @@ -442,7 +502,7 @@ static int mtk_thermal_get_calibration_data(struct device *dev, > > > > > > /* Start with default values */ > > > mt->adc_ge = 512; > > > - for (i = 0; i < MT8173_NUM_SENSORS; i++) > > > + for (i = 0; i < mt->conf->num_sensors; i++) > > > mt->vts[i] = 260; > > > mt->degc_cali = 40; > > > mt->o_slope = 0; > > > @@ -467,15 +527,15 @@ static int mtk_thermal_get_calibration_data(struct device *dev, > > > goto out; > > > } > > > > > > - if (buf[0] & MT8173_CALIB_BUF0_VALID) { > > > - mt->adc_ge = MT8173_CALIB_BUF1_ADC_GE(buf[1]); > > > - mt->vts[MT8173_TS1] = MT8173_CALIB_BUF0_VTS_TS1(buf[0]); > > > - mt->vts[MT8173_TS2] = MT8173_CALIB_BUF0_VTS_TS2(buf[0]); > > > - mt->vts[MT8173_TS3] = MT8173_CALIB_BUF1_VTS_TS3(buf[1]); > > > - mt->vts[MT8173_TS4] = MT8173_CALIB_BUF2_VTS_TS4(buf[2]); > > > - mt->vts[MT8173_TSABB] = MT8173_CALIB_BUF2_VTS_TSABB(buf[2]); > > > - mt->degc_cali = MT8173_CALIB_BUF0_DEGC_CALI(buf[0]); > > > - mt->o_slope = MT8173_CALIB_BUF0_O_SLOPE(buf[0]); > > > + if (buf[0] & CALIB_BUF0_VALID) { > > > + mt->adc_ge = CALIB_BUF1_ADC_GE(buf[1]); > > > + mt->vts[NVMEM_TS1] = CALIB_BUF0_VTS_TS1(buf[0]); > > > + mt->vts[NVMEM_TS2] = CALIB_BUF0_VTS_TS2(buf[0]); > > > + mt->vts[NVMEM_TS3] = CALIB_BUF1_VTS_TS3(buf[1]); > > > + mt->vts[NVMEM_TS4] = CALIB_BUF2_VTS_TS4(buf[1]); > > > + mt->vts[NVMEM_TS5] = CALIB_BUF2_VTS_TS5(buf[2]); > > > + mt->degc_cali = CALIB_BUF0_DEGC_CALI(buf[0]); > > > + mt->o_slope = CALIB_BUF0_O_SLOPE(buf[0]); > > > > I guess even the above code changes can be avoided if we just retain > > macros starting with MT8173? > > > > Best Regards, > > Keerthy > > > > Yes, I think so, only different on the array size for vts since sensors > number different between MT8173 & MT2701, I might separate it by SoC > type on next version. > > BR, > Dawei > > > > } else { > > > dev_info(dev, "Device not calibrated, using default calibration values\n"); > > > } > > > @@ -486,18 +546,36 @@ out: > > > return ret; > > > } > > > > > > +static const struct of_device_id mtk_thermal_of_match[] = { > > > + { > > > + .compatible = "mediatek,mt8173-thermal", > > > + .data = (void *)&mt8173_thermal_data, > > > + }, > > > + { > > > + .compatible = "mediatek,mt2701-thermal", > > > + .data = (void *)&mt2701_thermal_data, > > > + }, { > > > + }, > > > +}; > > > +MODULE_DEVICE_TABLE(of, mtk_thermal_of_match); > > > + > > > static int mtk_thermal_probe(struct platform_device *pdev) > > > { > > > int ret, i; > > > struct device_node *auxadc, *apmixedsys, *np = pdev->dev.of_node; > > > struct mtk_thermal *mt; > > > struct resource *res; > > > + const struct of_device_id *of_id; > > > u64 auxadc_phys_base, apmixed_phys_base; > > > > > > mt = devm_kzalloc(&pdev->dev, sizeof(*mt), GFP_KERNEL); > > > if (!mt) > > > return -ENOMEM; > > > > > > + of_id = of_match_device(mtk_thermal_of_match, &pdev->dev); > > > + if (of_id) > > > + mt->conf = (const struct mtk_thermal_data *)of_id->data; > > > + > > > mt->clk_peri_therm = devm_clk_get(&pdev->dev, "therm"); > > > if (IS_ERR(mt->clk_peri_therm)) > > > return PTR_ERR(mt->clk_peri_therm); > > > @@ -565,7 +643,7 @@ static int mtk_thermal_probe(struct platform_device *pdev) > > > goto err_disable_clk_auxadc; > > > } > > > > > > - for (i = 0; i < MT8173_NUM_ZONES; i++) > > > + for (i = 0; i < mt->conf->num_banks; i++) > > > mtk_thermal_init_bank(mt, i, apmixed_phys_base, > > > auxadc_phys_base); > > > > > > @@ -592,13 +670,6 @@ static int mtk_thermal_remove(struct platform_device *pdev) > > > return 0; > > > } > > > > > > -static const struct of_device_id mtk_thermal_of_match[] = { > > > - { > > > - .compatible = "mediatek,mt8173-thermal", > > > - }, { > > > - }, > > > -}; > > > - > > > static struct platform_driver mtk_thermal_driver = { > > > .probe = mtk_thermal_probe, > > > .remove = mtk_thermal_remove, > > > @@ -610,6 +681,7 @@ static struct platform_driver mtk_thermal_driver = { > > > > > > module_platform_driver(mtk_thermal_driver); > > > > > > +MODULE_AUTHOR("Dawei Chien <dawei.chien@mediatek.com>"); > > > MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); > > > MODULE_AUTHOR("Hanyi Wu <hanyi.wu@mediatek.com>"); > > > MODULE_DESCRIPTION("Mediatek thermal driver"); > > > > ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 2/3] thermal: Add Mediatek thermal driver for mt2701. 2016-08-09 5:55 ` dawei chien @ 2016-08-09 5:57 ` Keerthy 0 siblings, 0 replies; 32+ messages in thread From: Keerthy @ 2016-08-09 5:57 UTC (permalink / raw) To: linux-arm-kernel On Tuesday 09 August 2016 11:25 AM, dawei chien wrote: > Dear Keerthy, > > On Mon, 2016-07-11 at 16:56 +0800, dawei chien wrote: >> Dear Keerthy, >> >> On Thu, 2016-07-07 at 17:24 +0530, Keerthy wrote: >>> Hi Dawei Chien, >>> >>> >>> On Thursday 07 July 2016 02:36 PM, Dawei Chien wrote: >>>> This patch adds support for mt2701 chip to mtk_thermal.c, >>>> and integrate both mt8173 and mt2701 on the same driver. >>>> MT8173 has four banks and five sensors, and MT2701 has >>>> only one bank and three sensors. >>>> >>>> Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> >>>> --- >>>> drivers/thermal/mtk_thermal.c | 258 ++++++++++++++++++++++++++--------------- >>>> 1 file changed, 165 insertions(+), 93 deletions(-) >>>> >>>> diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c >>>> index 262ab0a..860f2e2 100644 >>>> --- a/drivers/thermal/mtk_thermal.c >>>> +++ b/drivers/thermal/mtk_thermal.c >>>> @@ -2,6 +2,7 @@ >>>> * Copyright (c) 2015 MediaTek Inc. >>>> * Author: Hanyi Wu <hanyi.wu@mediatek.com> >>>> * Sascha Hauer <s.hauer@pengutronix.de> >>>> + * Dawei Chien <dawei.chien@mediatek.com> >>>> * >>>> * This program is free software; you can redistribute it and/or modify >>>> * it under the terms of the GNU General Public License version 2 as >>>> @@ -21,6 +22,7 @@ >>>> #include <linux/nvmem-consumer.h> >>>> #include <linux/of.h> >>>> #include <linux/of_address.h> >>>> +#include <linux/of_device.h> >>>> #include <linux/platform_device.h> >>>> #include <linux/slab.h> >>>> #include <linux/io.h> >>>> @@ -88,6 +90,7 @@ >>>> #define TEMP_ADCVALIDMASK_VALID_HIGH BIT(5) >>>> #define TEMP_ADCVALIDMASK_VALID_POS(bit) (bit) >>>> >>>> +/* MT8173 thermal sensors */ >>>> #define MT8173_TS1 0 >>>> #define MT8173_TS2 1 >>>> #define MT8173_TS3 2 >>>> @@ -97,35 +100,62 @@ >>>> /* AUXADC channel 11 is used for the temperature sensors */ >>>> #define MT8173_TEMP_AUXADC_CHANNEL 11 >>>> >>>> -/* The total number of temperature sensors in the MT8173 */ >>>> -#define MT8173_NUM_SENSORS 5 >>>> - >>>> -/* The number of banks in the MT8173 */ >>>> -#define MT8173_NUM_ZONES 4 >>>> - >>>> -/* The number of sensing points per bank */ >>>> -#define MT8173_NUM_SENSORS_PER_ZONE 4 >>>> - >>>> /* Layout of the fuses providing the calibration data */ >>>> -#define MT8173_CALIB_BUF0_VALID BIT(0) >>>> -#define MT8173_CALIB_BUF1_ADC_GE(x) (((x) >> 22) & 0x3ff) >>>> -#define MT8173_CALIB_BUF0_VTS_TS1(x) (((x) >> 17) & 0x1ff) >>>> -#define MT8173_CALIB_BUF0_VTS_TS2(x) (((x) >> 8) & 0x1ff) >>>> -#define MT8173_CALIB_BUF1_VTS_TS3(x) (((x) >> 0) & 0x1ff) >>>> -#define MT8173_CALIB_BUF2_VTS_TS4(x) (((x) >> 23) & 0x1ff) >>>> -#define MT8173_CALIB_BUF2_VTS_TSABB(x) (((x) >> 14) & 0x1ff) >>>> -#define MT8173_CALIB_BUF0_DEGC_CALI(x) (((x) >> 1) & 0x3f) >>>> -#define MT8173_CALIB_BUF0_O_SLOPE(x) (((x) >> 26) & 0x3f) >>>> +#define CALIB_BUF0_VALID BIT(0) >>>> +#define CALIB_BUF1_ADC_GE(x) (((x) >> 22) & 0x3ff) >>>> +#define CALIB_BUF0_VTS_TS1(x) (((x) >> 17) & 0x1ff) >>>> +#define CALIB_BUF0_VTS_TS2(x) (((x) >> 8) & 0x1ff) >>>> +#define CALIB_BUF1_VTS_TS3(x) (((x) >> 0) & 0x1ff) >>>> +#define CALIB_BUF2_VTS_TS4(x) (((x) >> 23) & 0x1ff) >>>> +#define CALIB_BUF2_VTS_TS5(x) (((x) >> 14) & 0x1ff) >>>> +#define CALIB_BUF0_DEGC_CALI(x) (((x) >> 1) & 0x3f) >>>> +#define CALIB_BUF0_O_SLOPE(x) (((x) >> 26) & 0x3f) >>>> + >>> >>> IMHO the above changes from defining CALIB_BUF1_ADC_GE(x) to >>> CALIB_BUF0_O_SLOPE(x) can be avoided. We are just renaming the same >>> defines to a generic name. Instead the macro starting with MT8173 can >>> only be used wherever needed commonly both by 8173 instance and for >>> 2701 instance. >>> >> >> I would have a try to keep MT8173 original one and add some comment for >> the macro starting on next version. > > Just confirm again, > we don't need change common macro name, and just need to add comment for > MT8173/MT2701, right? Yes > >>>> +#define NVMEM_TS1 0 >>>> +#define NVMEM_TS2 1 >>>> +#define NVMEM_TS3 2 >>>> +#define NVMEM_TS4 3 >>>> +#define NVMEM_TS5 4 >>>> + >> >> Does these need to keep the old one >> MT8173_TS1/MT8173_TS2/MT8173_TS3/MT8173_TS4/MT8173_TSABB > > MT8173 has 5 sensors, so it need 5 address for calibration data. > And MT2701 has three sensors, so it need 3 address for that. > > Do you think we need either keep the original one or rename for these. > >> >> >>>> +/* MT2701 thermal sensors */ >>>> +#define MT2701_TS1 0 >>>> +#define MT2701_TS2 1 >>>> +#define MT2701_TSABB 2 >>>> + >>>> +/* AUXADC channel 11 is used for the temperature sensors */ >>>> +#define MT2701_TEMP_AUXADC_CHANNEL 11 >>>> >>>> #define THERMAL_NAME "mtk-thermal" >>>> >>>> +/* Maximum support banks */ >>>> +#define MAX_NUM_BANK 5 >>> >>> Why is this 5? >>> Commit message states: MT8173 has four banks and five sensors, and >>> MT2701 has only one bank and three sensors. Am i missing something here? >>> >> >> This is my miss, it should be 4, but it line might remove since I would >> depend on SoC type to assign array for next version. >> >>>> + >>>> struct mtk_thermal; >>>> >>>> +struct thermal_bank_cfg { >>>> + unsigned int num_sensors; >>>> + unsigned int sensors[MAX_NUM_BANK]; >>>> +}; >>>> + >>>> struct mtk_thermal_bank { >>>> struct mtk_thermal *mt; >>>> int id; >>>> }; >>>> >>>> +struct mtk_thermal_sense_point { >>>> + int msr; >>>> + int adcpnp; >>>> +}; >>>> + >>>> +struct mtk_thermal_data { >>>> + struct thermal_bank_cfg bank_data[MAX_NUM_BANK]; >>> >>> So for MT8173 we are allocating one bank extra and for MT2701 we are >>> allocating 4 banks extra right? Why not do something like this: >>> >>> struct thermal_bank *banks_data >>> Assign the array based on the SoC type? >>> >> >> Yes, I agree with you, I would update it on next version. >> >>>> + struct mtk_thermal_sense_point sensing_points[MAX_NUM_BANK]; >>>> + int sensor_mux_values[MAX_NUM_BANK]; >>>> + s32 num_banks; >>>> + s32 num_sensors; >>>> + s32 auxadc_channel; >>>> +}; >>>> + >>>> struct mtk_thermal { >>>> struct device *dev; >>>> void __iomem *thermal_base; >>>> @@ -133,27 +163,20 @@ struct mtk_thermal { >>>> struct clk *clk_peri_therm; >>>> struct clk *clk_auxadc; >>>> >>>> - struct mtk_thermal_bank banks[MT8173_NUM_ZONES]; >>>> - >>>> + struct mtk_thermal_bank banks[MAX_NUM_BANK]; >>> >>> Here again some extra memory allocation. >>> >>> Why not keep a pointer which points to the desired array? >>> >>>> + const struct mtk_thermal_data *conf; >>>> /* lock: for getting and putting banks */ >>>> struct mutex lock; >>>> + struct thermal_zone_device *tzd; >>>> >>>> /* Calibration values */ >>>> s32 adc_ge; >>>> s32 degc_cali; >>>> s32 o_slope; >>>> - s32 vts[MT8173_NUM_SENSORS]; >>>> - >>>> -}; >>>> - >>>> -struct mtk_thermal_bank_cfg { >>>> - unsigned int num_sensors; >>>> - unsigned int sensors[MT8173_NUM_SENSORS_PER_ZONE]; >>>> + s32 vts[MAX_NUM_BANK]; >>>> }; >>>> >>>> -static const int sensor_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 }; >>>> - >>>> -/* >>>> +/** >>>> * The MT8173 thermal controller has four banks. Each bank can read up to >>>> * four temperature sensors simultaneously. The MT8173 has a total of 5 >>>> * temperature sensors. We use each bank to measure a certain area of the >>>> @@ -166,42 +189,76 @@ static const int sensor_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 }; >>>> * data, and this indeed needs the temperatures of the individual banks >>>> * for making better decisions. >>>> */ >>>> -static const struct mtk_thermal_bank_cfg bank_data[] = { >>>> - { >>>> - .num_sensors = 2, >>>> - .sensors = { MT8173_TS2, MT8173_TS3 }, >>>> - }, { >>>> - .num_sensors = 2, >>>> - .sensors = { MT8173_TS2, MT8173_TS4 }, >>>> - }, { >>>> - .num_sensors = 3, >>>> - .sensors = { MT8173_TS1, MT8173_TS2, MT8173_TSABB }, >>>> - }, { >>>> - .num_sensors = 1, >>>> - .sensors = { MT8173_TS2 }, >>>> +static const struct mtk_thermal_data mt8173_thermal_data = { >>>> + .auxadc_channel = MT8173_TEMP_AUXADC_CHANNEL, >>>> + .num_banks = 4, >>>> + .num_sensors = 5, >>>> + .bank_data = { >>>> + { >>>> + .num_sensors = 2, >>>> + .sensors = { MT8173_TS2, MT8173_TS3 }, >>>> + }, { >>>> + .num_sensors = 2, >>>> + .sensors = { MT8173_TS2, MT8173_TS4 }, >>>> + }, { >>>> + .num_sensors = 3, >>>> + .sensors = { MT8173_TS1, MT8173_TS2, MT8173_TSABB }, >>>> + }, { >>>> + .num_sensors = 1, >>>> + .sensors = { MT8173_TS2 }, >>>> + }, >>>> }, >>>> + .sensing_points = { >>>> + { >>>> + .msr = TEMP_MSR0, >>>> + .adcpnp = TEMP_ADCPNP0, >>>> + }, { >>>> + .msr = TEMP_MSR1, >>>> + .adcpnp = TEMP_ADCPNP1, >>>> + }, { >>>> + .msr = TEMP_MSR2, >>>> + .adcpnp = TEMP_ADCPNP2, >>>> + }, { >>>> + .msr = TEMP_MSR3, >>>> + .adcpnp = TEMP_ADCPNP3, >>>> + }, >>>> + }, >>>> + .sensor_mux_values = { 0, 1, 2, 3, 16 }, >>>> }; >>>> >>>> -struct mtk_thermal_sense_point { >>>> - int msr; >>>> - int adcpnp; >>>> -}; >>>> - >>>> -static const struct mtk_thermal_sense_point >>>> - sensing_points[MT8173_NUM_SENSORS_PER_ZONE] = { >>>> - { >>>> - .msr = TEMP_MSR0, >>>> - .adcpnp = TEMP_ADCPNP0, >>>> - }, { >>>> - .msr = TEMP_MSR1, >>>> - .adcpnp = TEMP_ADCPNP1, >>>> - }, { >>>> - .msr = TEMP_MSR2, >>>> - .adcpnp = TEMP_ADCPNP2, >>>> - }, { >>>> - .msr = TEMP_MSR3, >>>> - .adcpnp = TEMP_ADCPNP3, >>>> +/** >>>> + * The MT2701 thermal controller has one bank, which can read up to >>>> + * three temperature sensors simultaneously. The MT2701 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 mt2701_thermal_data = { >>>> + .auxadc_channel = MT2701_TEMP_AUXADC_CHANNEL, >>>> + .num_banks = 1, >>>> + .num_sensors = 3, >>>> + .bank_data = { >>>> + { >>>> + .num_sensors = 3, >>>> + .sensors = { MT2701_TS1, MT2701_TS2, MT2701_TSABB }, >>>> + }, >>>> }, >>>> + .sensing_points = { >>>> + { >>>> + .msr = TEMP_MSR0, >>>> + .adcpnp = TEMP_ADCPNP0, >>>> + }, { >>>> + .msr = TEMP_MSR1, >>>> + .adcpnp = TEMP_ADCPNP1, >>>> + }, { >>>> + .msr = TEMP_MSR2, >>>> + .adcpnp = TEMP_ADCPNP2, >>>> + }, >>>> + }, >>>> + .sensor_mux_values = { 0, 1, 16}, >>>> }; >>>> >>>> /** >>>> @@ -270,13 +327,15 @@ static void mtk_thermal_put_bank(struct mtk_thermal_bank *bank) >>>> static int mtk_thermal_bank_temperature(struct mtk_thermal_bank *bank) >>>> { >>>> struct mtk_thermal *mt = bank->mt; >>>> + const struct mtk_thermal_data *conf = mt->conf; >>>> int i, temp = INT_MIN, max = INT_MIN; >>>> u32 raw; >>>> >>>> - for (i = 0; i < bank_data[bank->id].num_sensors; i++) { >>>> - raw = readl(mt->thermal_base + sensing_points[i].msr); >>>> + for (i = 0; i < conf->bank_data[bank->id].num_sensors; i++) { >>>> + raw = readl(mt->thermal_base + conf->sensing_points[i].msr); >>>> >>>> - temp = raw_to_mcelsius(mt, bank_data[bank->id].sensors[i], raw); >>>> + temp = raw_to_mcelsius(mt, conf->bank_data[bank->id].sensors[i], >>>> + raw); >>>> >>>> /* >>>> * The first read of a sensor often contains very high bogus >>>> @@ -299,7 +358,7 @@ static int mtk_read_temp(void *data, int *temperature) >>>> int i; >>>> int tempmax = INT_MIN; >>>> >>>> - for (i = 0; i < MT8173_NUM_ZONES; i++) { >>>> + for (i = 0; i < mt->conf->num_banks; i++) { >>>> struct mtk_thermal_bank *bank = &mt->banks[i]; >>>> >>>> mtk_thermal_get_bank(bank); >>>> @@ -322,7 +381,7 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, >>>> u32 apmixed_phys_base, u32 auxadc_phys_base) >>>> { >>>> struct mtk_thermal_bank *bank = &mt->banks[num]; >>>> - const struct mtk_thermal_bank_cfg *cfg = &bank_data[num]; >>>> + const struct mtk_thermal_data *conf = mt->conf; >>>> int i; >>>> >>>> bank->id = num; >>>> @@ -368,7 +427,7 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, >>>> * this value will be stored to TEMP_PNPMUXADDR (TEMP_SPARE0) >>>> * automatically by hw >>>> */ >>>> - writel(BIT(MT8173_TEMP_AUXADC_CHANNEL), mt->thermal_base + TEMP_ADCMUX); >>>> + writel(BIT(conf->auxadc_channel), mt->thermal_base + TEMP_ADCMUX); >>>> >>>> /* AHB address for auxadc mux selection */ >>>> writel(auxadc_phys_base + AUXADC_CON1_CLR_V, >>>> @@ -379,18 +438,18 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, >>>> mt->thermal_base + TEMP_PNPMUXADDR); >>>> >>>> /* AHB value for auxadc enable */ >>>> - writel(BIT(MT8173_TEMP_AUXADC_CHANNEL), mt->thermal_base + TEMP_ADCEN); >>>> + writel(BIT(conf->auxadc_channel), mt->thermal_base + TEMP_ADCEN); >>>> >>>> /* AHB address for auxadc enable (channel 0 immediate mode selected) */ >>>> writel(auxadc_phys_base + AUXADC_CON1_SET_V, >>>> mt->thermal_base + TEMP_ADCENADDR); >>>> >>>> /* AHB address for auxadc valid bit */ >>>> - writel(auxadc_phys_base + AUXADC_DATA(MT8173_TEMP_AUXADC_CHANNEL), >>>> + writel(auxadc_phys_base + AUXADC_DATA(conf->auxadc_channel), >>>> mt->thermal_base + TEMP_ADCVALIDADDR); >>>> >>>> /* AHB address for auxadc voltage output */ >>>> - writel(auxadc_phys_base + AUXADC_DATA(MT8173_TEMP_AUXADC_CHANNEL), >>>> + writel(auxadc_phys_base + AUXADC_DATA(conf->auxadc_channel), >>>> mt->thermal_base + TEMP_ADCVOLTADDR); >>>> >>>> /* read valid & voltage are at the same register */ >>>> @@ -407,11 +466,12 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, >>>> writel(TEMP_ADCWRITECTRL_ADC_MUX_WRITE, >>>> mt->thermal_base + TEMP_ADCWRITECTRL); >>>> >>>> - for (i = 0; i < cfg->num_sensors; i++) >>>> - writel(sensor_mux_values[cfg->sensors[i]], >>>> - mt->thermal_base + sensing_points[i].adcpnp); >>>> + for (i = 0; i < conf->bank_data[num].num_sensors; i++) >>>> + writel(conf->sensor_mux_values[conf->bank_data[num].sensors[i]], >>>> + mt->thermal_base + conf->sensing_points[i].adcpnp); >>>> >>>> - writel((1 << cfg->num_sensors) - 1, mt->thermal_base + TEMP_MONCTL0); >>>> + writel((1 << conf->bank_data[num].num_sensors) - 1, >>>> + mt->thermal_base + TEMP_MONCTL0); >>>> >>>> writel(TEMP_ADCWRITECTRL_ADC_PNP_WRITE | >>>> TEMP_ADCWRITECTRL_ADC_MUX_WRITE, >>>> @@ -442,7 +502,7 @@ static int mtk_thermal_get_calibration_data(struct device *dev, >>>> >>>> /* Start with default values */ >>>> mt->adc_ge = 512; >>>> - for (i = 0; i < MT8173_NUM_SENSORS; i++) >>>> + for (i = 0; i < mt->conf->num_sensors; i++) >>>> mt->vts[i] = 260; >>>> mt->degc_cali = 40; >>>> mt->o_slope = 0; >>>> @@ -467,15 +527,15 @@ static int mtk_thermal_get_calibration_data(struct device *dev, >>>> goto out; >>>> } >>>> >>>> - if (buf[0] & MT8173_CALIB_BUF0_VALID) { >>>> - mt->adc_ge = MT8173_CALIB_BUF1_ADC_GE(buf[1]); >>>> - mt->vts[MT8173_TS1] = MT8173_CALIB_BUF0_VTS_TS1(buf[0]); >>>> - mt->vts[MT8173_TS2] = MT8173_CALIB_BUF0_VTS_TS2(buf[0]); >>>> - mt->vts[MT8173_TS3] = MT8173_CALIB_BUF1_VTS_TS3(buf[1]); >>>> - mt->vts[MT8173_TS4] = MT8173_CALIB_BUF2_VTS_TS4(buf[2]); >>>> - mt->vts[MT8173_TSABB] = MT8173_CALIB_BUF2_VTS_TSABB(buf[2]); >>>> - mt->degc_cali = MT8173_CALIB_BUF0_DEGC_CALI(buf[0]); >>>> - mt->o_slope = MT8173_CALIB_BUF0_O_SLOPE(buf[0]); >>>> + if (buf[0] & CALIB_BUF0_VALID) { >>>> + mt->adc_ge = CALIB_BUF1_ADC_GE(buf[1]); >>>> + mt->vts[NVMEM_TS1] = CALIB_BUF0_VTS_TS1(buf[0]); >>>> + mt->vts[NVMEM_TS2] = CALIB_BUF0_VTS_TS2(buf[0]); >>>> + mt->vts[NVMEM_TS3] = CALIB_BUF1_VTS_TS3(buf[1]); >>>> + mt->vts[NVMEM_TS4] = CALIB_BUF2_VTS_TS4(buf[1]); >>>> + mt->vts[NVMEM_TS5] = CALIB_BUF2_VTS_TS5(buf[2]); >>>> + mt->degc_cali = CALIB_BUF0_DEGC_CALI(buf[0]); >>>> + mt->o_slope = CALIB_BUF0_O_SLOPE(buf[0]); >>> >>> I guess even the above code changes can be avoided if we just retain >>> macros starting with MT8173? >>> >>> Best Regards, >>> Keerthy >>> >> >> Yes, I think so, only different on the array size for vts since sensors >> number different between MT8173 & MT2701, I might separate it by SoC >> type on next version. >> >> BR, >> Dawei >> >>>> } else { >>>> dev_info(dev, "Device not calibrated, using default calibration values\n"); >>>> } >>>> @@ -486,18 +546,36 @@ out: >>>> return ret; >>>> } >>>> >>>> +static const struct of_device_id mtk_thermal_of_match[] = { >>>> + { >>>> + .compatible = "mediatek,mt8173-thermal", >>>> + .data = (void *)&mt8173_thermal_data, >>>> + }, >>>> + { >>>> + .compatible = "mediatek,mt2701-thermal", >>>> + .data = (void *)&mt2701_thermal_data, >>>> + }, { >>>> + }, >>>> +}; >>>> +MODULE_DEVICE_TABLE(of, mtk_thermal_of_match); >>>> + >>>> static int mtk_thermal_probe(struct platform_device *pdev) >>>> { >>>> int ret, i; >>>> struct device_node *auxadc, *apmixedsys, *np = pdev->dev.of_node; >>>> struct mtk_thermal *mt; >>>> struct resource *res; >>>> + const struct of_device_id *of_id; >>>> u64 auxadc_phys_base, apmixed_phys_base; >>>> >>>> mt = devm_kzalloc(&pdev->dev, sizeof(*mt), GFP_KERNEL); >>>> if (!mt) >>>> return -ENOMEM; >>>> >>>> + of_id = of_match_device(mtk_thermal_of_match, &pdev->dev); >>>> + if (of_id) >>>> + mt->conf = (const struct mtk_thermal_data *)of_id->data; >>>> + >>>> mt->clk_peri_therm = devm_clk_get(&pdev->dev, "therm"); >>>> if (IS_ERR(mt->clk_peri_therm)) >>>> return PTR_ERR(mt->clk_peri_therm); >>>> @@ -565,7 +643,7 @@ static int mtk_thermal_probe(struct platform_device *pdev) >>>> goto err_disable_clk_auxadc; >>>> } >>>> >>>> - for (i = 0; i < MT8173_NUM_ZONES; i++) >>>> + for (i = 0; i < mt->conf->num_banks; i++) >>>> mtk_thermal_init_bank(mt, i, apmixed_phys_base, >>>> auxadc_phys_base); >>>> >>>> @@ -592,13 +670,6 @@ static int mtk_thermal_remove(struct platform_device *pdev) >>>> return 0; >>>> } >>>> >>>> -static const struct of_device_id mtk_thermal_of_match[] = { >>>> - { >>>> - .compatible = "mediatek,mt8173-thermal", >>>> - }, { >>>> - }, >>>> -}; >>>> - >>>> static struct platform_driver mtk_thermal_driver = { >>>> .probe = mtk_thermal_probe, >>>> .remove = mtk_thermal_remove, >>>> @@ -610,6 +681,7 @@ static struct platform_driver mtk_thermal_driver = { >>>> >>>> module_platform_driver(mtk_thermal_driver); >>>> >>>> +MODULE_AUTHOR("Dawei Chien <dawei.chien@mediatek.com>"); >>>> MODULE_AUTHOR("Sascha Hauer <s.hauer@pengutronix.de>"); >>>> MODULE_AUTHOR("Hanyi Wu <hanyi.wu@mediatek.com>"); >>>> MODULE_DESCRIPTION("Mediatek thermal driver"); >>>> >> > > ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] arm: dts: thermal: add thermal/auxadc node. 2016-07-07 9:06 [PATCH 0/3] thermal: Add Mediatek thermal driver for mt2701 Dawei Chien 2016-07-07 9:06 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Dawei Chien 2016-07-07 9:06 ` [PATCH 2/3] thermal: Add Mediatek thermal driver for mt2701 Dawei Chien @ 2016-07-07 9:06 ` Dawei Chien 2016-07-07 12:09 ` Keerthy 2016-08-11 15:51 ` Matthias Brugger 2 siblings, 2 replies; 32+ messages in thread From: Dawei Chien @ 2016-07-07 9:06 UTC (permalink / raw) To: linux-arm-kernel This adds the thermal controller and auxadc nodes to the Mediatek MT2701 dtsi file. Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> --- This patch depned on: https://patchwork.kernel.org/patch/9213545/ --- arch/arm/boot/dts/mt2701.dtsi | 43 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi index 2ac8b50..0834a23 100644 --- a/arch/arm/boot/dts/mt2701.dtsi +++ b/arch/arm/boot/dts/mt2701.dtsi @@ -77,6 +77,36 @@ #clock-cells = <0>; }; + thermal-zones { + cpu_thermal: cpu_thermal { + polling-delay-passive = <1000>; /* milliseconds */ + polling-delay = <1000>; /* milliseconds */ + + thermal-sensors = <&thermal 0>; + sustainable-power = <1000>; + + trips { + threshold: trip-point at 0 { + temperature = <68000>; + hysteresis = <2000>; + type = "passive"; + }; + + target: trip-point at 1 { + temperature = <85000>; + hysteresis = <2000>; + type = "passive"; + }; + + cpu_crit: cpu_crit at 0 { + temperature = <115000>; + hysteresis = <2000>; + type = "critical"; + }; + }; + }; + }; + timer { compatible = "arm,armv7-timer"; interrupt-parent = <&gic>; @@ -183,4 +213,17 @@ clocks = <&uart_clk>; status = "disabled"; }; + + thermal: thermal at 1100b000 { + #thermal-sensor-cells = <0>; + compatible = "mediatek,mt2701-thermal"; + reg = <0 0x1100b000 0 0x1000>; + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; + clock-names = "therm", "auxadc"; + resets = <&pericfg 0x10>; + reset-names = "therm"; + mediatek,auxadc = <&auxadc>; + mediatek,apmixedsys = <&apmixedsys>; + }; }; -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 3/3] arm: dts: thermal: add thermal/auxadc node. 2016-07-07 9:06 ` [PATCH 3/3] arm: dts: thermal: add thermal/auxadc node Dawei Chien @ 2016-07-07 12:09 ` Keerthy 2016-07-11 8:56 ` dawei chien 2016-08-11 15:51 ` Matthias Brugger 1 sibling, 1 reply; 32+ messages in thread From: Keerthy @ 2016-07-07 12:09 UTC (permalink / raw) To: linux-arm-kernel On Thursday 07 July 2016 02:36 PM, Dawei Chien wrote: > This adds the thermal controller and auxadc nodes > to the Mediatek MT2701 dtsi file. > > Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> > --- > This patch depned on: > https://patchwork.kernel.org/patch/9213545/ > --- > arch/arm/boot/dts/mt2701.dtsi | 43 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 43 insertions(+) > > diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi > index 2ac8b50..0834a23 100644 > --- a/arch/arm/boot/dts/mt2701.dtsi > +++ b/arch/arm/boot/dts/mt2701.dtsi > @@ -77,6 +77,36 @@ > #clock-cells = <0>; > }; > > + thermal-zones { > + cpu_thermal: cpu_thermal { > + polling-delay-passive = <1000>; /* milliseconds */ > + polling-delay = <1000>; /* milliseconds */ > + > + thermal-sensors = <&thermal 0>; > + sustainable-power = <1000>; > + > + trips { > + threshold: trip-point at 0 { > + temperature = <68000>; > + hysteresis = <2000>; > + type = "passive"; > + }; > + > + target: trip-point at 1 { > + temperature = <85000>; > + hysteresis = <2000>; > + type = "passive"; > + }; > + > + cpu_crit: cpu_crit at 0 { > + temperature = <115000>; > + hysteresis = <2000>; > + type = "critical"; > + }; > + }; > + }; > + }; > + are there any corresponding cooling-maps? > timer { > compatible = "arm,armv7-timer"; > interrupt-parent = <&gic>; > @@ -183,4 +213,17 @@ > clocks = <&uart_clk>; > status = "disabled"; > }; > + > + thermal: thermal at 1100b000 { > + #thermal-sensor-cells = <0>; > + compatible = "mediatek,mt2701-thermal"; > + reg = <0 0x1100b000 0 0x1000>; > + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_LOW>; > + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; > + clock-names = "therm", "auxadc"; > + resets = <&pericfg 0x10>; > + reset-names = "therm"; > + mediatek,auxadc = <&auxadc>; > + mediatek,apmixedsys = <&apmixedsys>; > + }; > }; > ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] arm: dts: thermal: add thermal/auxadc node. 2016-07-07 12:09 ` Keerthy @ 2016-07-11 8:56 ` dawei chien 2016-07-11 9:09 ` Keerthy 0 siblings, 1 reply; 32+ messages in thread From: dawei chien @ 2016-07-11 8:56 UTC (permalink / raw) To: linux-arm-kernel Dear Keerthy, On Thu, 2016-07-07 at 17:39 +0530, Keerthy wrote: > > On Thursday 07 July 2016 02:36 PM, Dawei Chien wrote: > > This adds the thermal controller and auxadc nodes > > to the Mediatek MT2701 dtsi file. > > > > Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> > > --- > > This patch depned on: > > https://patchwork.kernel.org/patch/9213545/ > > --- > > arch/arm/boot/dts/mt2701.dtsi | 43 +++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 43 insertions(+) > > > > diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi > > index 2ac8b50..0834a23 100644 > > --- a/arch/arm/boot/dts/mt2701.dtsi > > +++ b/arch/arm/boot/dts/mt2701.dtsi > > @@ -77,6 +77,36 @@ > > #clock-cells = <0>; > > }; > > > > + thermal-zones { > > + cpu_thermal: cpu_thermal { > > + polling-delay-passive = <1000>; /* milliseconds */ > > + polling-delay = <1000>; /* milliseconds */ > > + > > + thermal-sensors = <&thermal 0>; > > + sustainable-power = <1000>; > > + > > + trips { > > + threshold: trip-point at 0 { > > + temperature = <68000>; > > + hysteresis = <2000>; > > + type = "passive"; > > + }; > > + > > + target: trip-point at 1 { > > + temperature = <85000>; > > + hysteresis = <2000>; > > + type = "passive"; > > + }; > > + > > + cpu_crit: cpu_crit at 0 { > > + temperature = <115000>; > > + hysteresis = <2000>; > > + type = "critical"; > > + }; > > + }; > > + }; > > + }; > > + > > are there any corresponding cooling-maps? Since MT2701 does not register CPUFREQ cooling device and its' own device node, I could not add cooling-maps so far. Could we add cooling map after CPUFREQ ready, thank you. > > > timer { > > compatible = "arm,armv7-timer"; > > interrupt-parent = <&gic>; > > @@ -183,4 +213,17 @@ > > clocks = <&uart_clk>; > > status = "disabled"; > > }; > > + > > + thermal: thermal at 1100b000 { > > + #thermal-sensor-cells = <0>; > > + compatible = "mediatek,mt2701-thermal"; > > + reg = <0 0x1100b000 0 0x1000>; > > + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_LOW>; > > + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; > > + clock-names = "therm", "auxadc"; > > + resets = <&pericfg 0x10>; > > + reset-names = "therm"; > > + mediatek,auxadc = <&auxadc>; > > + mediatek,apmixedsys = <&apmixedsys>; > > + }; > > }; > > ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] arm: dts: thermal: add thermal/auxadc node. 2016-07-11 8:56 ` dawei chien @ 2016-07-11 9:09 ` Keerthy 0 siblings, 0 replies; 32+ messages in thread From: Keerthy @ 2016-07-11 9:09 UTC (permalink / raw) To: linux-arm-kernel On Monday 11 July 2016 02:26 PM, dawei chien wrote: > Dear Keerthy, > > On Thu, 2016-07-07 at 17:39 +0530, Keerthy wrote: >> >> On Thursday 07 July 2016 02:36 PM, Dawei Chien wrote: >>> This adds the thermal controller and auxadc nodes >>> to the Mediatek MT2701 dtsi file. >>> >>> Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> >>> --- >>> This patch depned on: >>> https://patchwork.kernel.org/patch/9213545/ >>> --- >>> arch/arm/boot/dts/mt2701.dtsi | 43 +++++++++++++++++++++++++++++++++++++++++ >>> 1 file changed, 43 insertions(+) >>> >>> diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi >>> index 2ac8b50..0834a23 100644 >>> --- a/arch/arm/boot/dts/mt2701.dtsi >>> +++ b/arch/arm/boot/dts/mt2701.dtsi >>> @@ -77,6 +77,36 @@ >>> #clock-cells = <0>; >>> }; >>> >>> + thermal-zones { >>> + cpu_thermal: cpu_thermal { >>> + polling-delay-passive = <1000>; /* milliseconds */ >>> + polling-delay = <1000>; /* milliseconds */ >>> + >>> + thermal-sensors = <&thermal 0>; >>> + sustainable-power = <1000>; >>> + >>> + trips { >>> + threshold: trip-point at 0 { >>> + temperature = <68000>; >>> + hysteresis = <2000>; >>> + type = "passive"; >>> + }; >>> + >>> + target: trip-point at 1 { >>> + temperature = <85000>; >>> + hysteresis = <2000>; >>> + type = "passive"; >>> + }; >>> + >>> + cpu_crit: cpu_crit at 0 { >>> + temperature = <115000>; >>> + hysteresis = <2000>; >>> + type = "critical"; >>> + }; >>> + }; >>> + }; >>> + }; >>> + >> >> are there any corresponding cooling-maps? > > Since MT2701 does not register CPUFREQ cooling device and its' own > device node, I could not add cooling-maps so far. > Could we add cooling map after CPUFREQ ready, thank you. Okay. I was curious to know about the cooling agents. > >> >>> timer { >>> compatible = "arm,armv7-timer"; >>> interrupt-parent = <&gic>; >>> @@ -183,4 +213,17 @@ >>> clocks = <&uart_clk>; >>> status = "disabled"; >>> }; >>> + >>> + thermal: thermal at 1100b000 { >>> + #thermal-sensor-cells = <0>; >>> + compatible = "mediatek,mt2701-thermal"; >>> + reg = <0 0x1100b000 0 0x1000>; >>> + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_LOW>; >>> + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; >>> + clock-names = "therm", "auxadc"; >>> + resets = <&pericfg 0x10>; >>> + reset-names = "therm"; >>> + mediatek,auxadc = <&auxadc>; >>> + mediatek,apmixedsys = <&apmixedsys>; >>> + }; >>> }; >>> > > ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] arm: dts: thermal: add thermal/auxadc node. 2016-07-07 9:06 ` [PATCH 3/3] arm: dts: thermal: add thermal/auxadc node Dawei Chien 2016-07-07 12:09 ` Keerthy @ 2016-08-11 15:51 ` Matthias Brugger 2016-08-15 7:14 ` dawei chien 1 sibling, 1 reply; 32+ messages in thread From: Matthias Brugger @ 2016-08-11 15:51 UTC (permalink / raw) To: linux-arm-kernel On 07/07/16 11:06, Dawei Chien wrote: > This adds the thermal controller and auxadc nodes > to the Mediatek MT2701 dtsi file. > > Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> > --- > This patch depned on: > https://patchwork.kernel.org/patch/9213545/ > --- > arch/arm/boot/dts/mt2701.dtsi | 43 +++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 43 insertions(+) > > diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi > index 2ac8b50..0834a23 100644 > --- a/arch/arm/boot/dts/mt2701.dtsi > +++ b/arch/arm/boot/dts/mt2701.dtsi > @@ -77,6 +77,36 @@ > #clock-cells = <0>; > }; > > + thermal-zones { > + cpu_thermal: cpu_thermal { > + polling-delay-passive = <1000>; /* milliseconds */ > + polling-delay = <1000>; /* milliseconds */ > + > + thermal-sensors = <&thermal 0>; > + sustainable-power = <1000>; > + > + trips { > + threshold: trip-point at 0 { > + temperature = <68000>; > + hysteresis = <2000>; > + type = "passive"; > + }; > + > + target: trip-point at 1 { > + temperature = <85000>; > + hysteresis = <2000>; > + type = "passive"; > + }; > + > + cpu_crit: cpu_crit at 0 { > + temperature = <115000>; > + hysteresis = <2000>; > + type = "critical"; > + }; > + }; > + }; > + }; > + > timer { > compatible = "arm,armv7-timer"; > interrupt-parent = <&gic>; > @@ -183,4 +213,17 @@ > clocks = <&uart_clk>; > status = "disabled"; > }; > + > + thermal: thermal at 1100b000 { > + #thermal-sensor-cells = <0>; > + compatible = "mediatek,mt2701-thermal"; > + reg = <0 0x1100b000 0 0x1000>; > + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_LOW>; > + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; > + clock-names = "therm", "auxadc"; > + resets = <&pericfg 0x10>; > + reset-names = "therm"; > + mediatek,auxadc = <&auxadc>; > + mediatek,apmixedsys = <&apmixedsys>; > + }; > }; > what about: status = "disabled"; ? ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] arm: dts: thermal: add thermal/auxadc node. 2016-08-11 15:51 ` Matthias Brugger @ 2016-08-15 7:14 ` dawei chien 2016-08-22 17:09 ` Matthias Brugger 0 siblings, 1 reply; 32+ messages in thread From: dawei chien @ 2016-08-15 7:14 UTC (permalink / raw) To: linux-arm-kernel Hi Matthias, On Thu, 2016-08-11 at 17:51 +0200, Matthias Brugger wrote: > > On 07/07/16 11:06, Dawei Chien wrote: > > This adds the thermal controller and auxadc nodes > > to the Mediatek MT2701 dtsi file. > > > > Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> > > --- > > This patch depned on: > > https://patchwork.kernel.org/patch/9213545/ > > --- > > arch/arm/boot/dts/mt2701.dtsi | 43 +++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 43 insertions(+) > > > > diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi > > index 2ac8b50..0834a23 100644 > > --- a/arch/arm/boot/dts/mt2701.dtsi > > +++ b/arch/arm/boot/dts/mt2701.dtsi > > @@ -77,6 +77,36 @@ > > #clock-cells = <0>; > > }; > > > > + thermal-zones { > > + cpu_thermal: cpu_thermal { > > + polling-delay-passive = <1000>; /* milliseconds */ > > + polling-delay = <1000>; /* milliseconds */ > > + > > + thermal-sensors = <&thermal 0>; > > + sustainable-power = <1000>; > > + > > + trips { > > + threshold: trip-point at 0 { > > + temperature = <68000>; > > + hysteresis = <2000>; > > + type = "passive"; > > + }; > > + > > + target: trip-point at 1 { > > + temperature = <85000>; > > + hysteresis = <2000>; > > + type = "passive"; > > + }; > > + > > + cpu_crit: cpu_crit at 0 { > > + temperature = <115000>; > > + hysteresis = <2000>; > > + type = "critical"; > > + }; > > + }; > > + }; > > + }; > > + > > timer { > > compatible = "arm,armv7-timer"; > > interrupt-parent = <&gic>; > > @@ -183,4 +213,17 @@ > > clocks = <&uart_clk>; > > status = "disabled"; > > }; > > + > > + thermal: thermal at 1100b000 { > > + #thermal-sensor-cells = <0>; > > + compatible = "mediatek,mt2701-thermal"; > > + reg = <0 0x1100b000 0 0x1000>; > > + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_LOW>; > > + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; > > + clock-names = "therm", "auxadc"; > > + resets = <&pericfg 0x10>; > > + reset-names = "therm"; > > + mediatek,auxadc = <&auxadc>; > > + mediatek,apmixedsys = <&apmixedsys>; > > + }; > > }; > > > > what about: > status = "disabled"; ? Since thermal driver would protect our platform by shutdown method once SoC temperature over critical point, I prefer keep this rather than disabling, how do you think, thank you. BR, Dawei ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 3/3] arm: dts: thermal: add thermal/auxadc node. 2016-08-15 7:14 ` dawei chien @ 2016-08-22 17:09 ` Matthias Brugger 0 siblings, 0 replies; 32+ messages in thread From: Matthias Brugger @ 2016-08-22 17:09 UTC (permalink / raw) To: linux-arm-kernel On 15/08/16 09:14, dawei chien wrote: > Hi Matthias, > > On Thu, 2016-08-11 at 17:51 +0200, Matthias Brugger wrote: >> >> On 07/07/16 11:06, Dawei Chien wrote: >>> This adds the thermal controller and auxadc nodes >>> to the Mediatek MT2701 dtsi file. >>> >>> Signed-off-by: Dawei Chien <dawei.chien@mediatek.com> >>> --- >>> This patch depned on: >>> https://patchwork.kernel.org/patch/9213545/ >>> --- >>> arch/arm/boot/dts/mt2701.dtsi | 43 +++++++++++++++++++++++++++++++++++++++++ >>> 1 file changed, 43 insertions(+) >>> >>> diff --git a/arch/arm/boot/dts/mt2701.dtsi b/arch/arm/boot/dts/mt2701.dtsi >>> index 2ac8b50..0834a23 100644 >>> --- a/arch/arm/boot/dts/mt2701.dtsi >>> +++ b/arch/arm/boot/dts/mt2701.dtsi >>> @@ -77,6 +77,36 @@ >>> #clock-cells = <0>; >>> }; >>> >>> + thermal-zones { >>> + cpu_thermal: cpu_thermal { >>> + polling-delay-passive = <1000>; /* milliseconds */ >>> + polling-delay = <1000>; /* milliseconds */ >>> + >>> + thermal-sensors = <&thermal 0>; >>> + sustainable-power = <1000>; >>> + >>> + trips { >>> + threshold: trip-point at 0 { >>> + temperature = <68000>; >>> + hysteresis = <2000>; >>> + type = "passive"; >>> + }; >>> + >>> + target: trip-point at 1 { >>> + temperature = <85000>; >>> + hysteresis = <2000>; >>> + type = "passive"; >>> + }; >>> + >>> + cpu_crit: cpu_crit at 0 { >>> + temperature = <115000>; >>> + hysteresis = <2000>; >>> + type = "critical"; >>> + }; >>> + }; >>> + }; >>> + }; >>> + >>> timer { >>> compatible = "arm,armv7-timer"; >>> interrupt-parent = <&gic>; >>> @@ -183,4 +213,17 @@ >>> clocks = <&uart_clk>; >>> status = "disabled"; >>> }; >>> + >>> + thermal: thermal at 1100b000 { >>> + #thermal-sensor-cells = <0>; >>> + compatible = "mediatek,mt2701-thermal"; >>> + reg = <0 0x1100b000 0 0x1000>; >>> + interrupts = <GIC_SPI 70 IRQ_TYPE_LEVEL_LOW>; >>> + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; >>> + clock-names = "therm", "auxadc"; >>> + resets = <&pericfg 0x10>; >>> + reset-names = "therm"; >>> + mediatek,auxadc = <&auxadc>; >>> + mediatek,apmixedsys = <&apmixedsys>; >>> + }; >>> }; >>> >> >> what about: >> status = "disabled"; ? > > Since thermal driver would protect our platform by shutdown method once > SoC temperature over critical point, I prefer keep this rather than > disabling, how do you think, thank you. > Sounds reasonable. Thanks ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH v12] Add Mediatek thermal support
@ 2015-11-30 11:42 Sascha Hauer
2015-11-30 11:42 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer
0 siblings, 1 reply; 32+ messages in thread
From: Sascha Hauer @ 2015-11-30 11:42 UTC (permalink / raw)
To: linux-arm-kernel
This series adds support for the thermal sensors included in the
MT8173 SoC. Currently only basic temperature reading is supported
without any interrupt support.
The cpufreq driver for MT8173 is currently under review, so there's no
real cooling device available in mainline. Until this is available the
thermal driver can be tested with the following dts snippet. It creates
a fake gpio fan and a fake trip point which is so low that it can easily
be reached with a "cat /dev/zero > /dev/null" on the command line.
Sascha
Changes since v11:
- Fix usage of uninitialized variable gcc didn't warn about
changes since v10:
- Some style cleanup
- Add comment to make clear why we use the sensors in banks even if we
currently only use the maximum of all banks
changes since v9:
- rebase on v4.3
- Add support for reading the calibration values from nvmem fuses
- Only register a single thermal zone instead of four as it seems
that's everything needed
changes since v8:
- Add commit description to binding patch
- rebase on v4.3-rc2
changes since v7:
- re-add some used defines removed in v5
- Use MT8173_THERMAL_ZONE_* defines as array indices in static initializers
changes since v6:
- remove dot in Hanyi Wus name
changes since v5:
- update copyright
- remove unused defines
Changes since v4:
- give calibration constants more meaningful names (offset, slope)
- Use define instead of 0x00c for register access.
Changes since v3:
- add include/dt-bindings/thermal/mt8173.h for to be able to use sensor names
in dts files
- fix disabling wrong clock in error path
- remove now unused reset-names property from binding document
- rename MT8173_NUM_BANKS -> MT8173_NUM_ZONES
- rename MT8173_NUM_SENSING_POINTS -> MT8173_NUM_SENSORS_PER_ZONE
- rename struct thermal_zone_device *tz -> struct thermal_zone_device *tzd
Changes since v2:
- sort #includes alphabetically
- Add prefix to register defines
- drop some members from struct mtk_thermal
- simplify raw_to_mcelsius()
- add and use more register bit defines
- use device_reset() instead of devm_reset_control_get()/reset_control_reset()
- misc other stuff
Changes since v1:
- Use "mediatek," prefix for custom properties
- Drop "thermal: consistently use int for temperatures" dependency
-------------
fan: gpio_fan {
compatible = "gpio-fan";
gpios = <&pio 24 0>;
gpio-fan,speed-map = <0 0
4500 1>;
#cooling-cells = <2>;
};
thermal-zones {
cpu_thermal: cpu_thermal {
polling-delay-passive = <1000>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */
thermal-sensors = <&thermal>;
trips {
cpu_passive: cpu_passive {
temperature = <47000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
cpu_crit {
temperature = <90000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "critical";
};
};
cooling-maps {
map0 {
trip = <&cpu_passive>;
cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
};
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-11-30 11:42 [PATCH v12] Add Mediatek thermal support Sascha Hauer @ 2015-11-30 11:42 ` Sascha Hauer 2015-12-16 11:23 ` Daniel Kurtz 0 siblings, 1 reply; 32+ messages in thread From: Sascha Hauer @ 2015-11-30 11:42 UTC (permalink / raw) To: linux-arm-kernel This adds the device tree binding documentation for the mediatek thermal controller found on Mediatek MT8173 and other SoCs. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> Acked-by: Rob Herring <robh@kernel.org> --- .../bindings/thermal/mediatek-thermal.txt | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt new file mode 100644 index 0000000..81f9a51 --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt @@ -0,0 +1,43 @@ +* Mediatek Thermal + +This describes the device tree binding for the Mediatek thermal controller +which measures the on-SoC temperatures. This device does not have its own ADC, +instead it directly controls the AUXADC via AHB bus accesses. For this reason +this device needs phandles to the AUXADC. Also it controls a mux in the +apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS +is also needed. + +Required properties: +- compatible: "mediatek,mt8173-thermal" +- reg: Address range of the thermal controller +- interrupts: IRQ for the thermal controller +- clocks, clock-names: Clocks needed for the thermal controller. required + clocks are: + "therm": Main clock needed for register access + "auxadc": The AUXADC clock +- resets: Reference to the reset controller controlling the thermal controller. +- mediatek,auxadc: A phandle to the AUXADC which the thermal controller uses +- mediatek,apmixedsys: A phandle to the APMIXEDSYS controller. +- #thermal-sensor-cells : Should be 0. See ./thermal.txt for a description. + +Optional properties: +- nvmem-cells: A phandle to the calibration data provided by a nvmem device. If + unspecified default values shall be used. +- nvmem-cell-names: Should be "calibration-data" + +Example: + + thermal: thermal at 1100b000 { + #thermal-sensor-cells = <1>; + compatible = "mediatek,mt8173-thermal"; + reg = <0 0x1100b000 0 0x1000>; + interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; + clock-names = "therm", "auxadc"; + resets = <&pericfg MT8173_PERI_THERM_SW_RST>; + reset-names = "therm"; + mediatek,auxadc = <&auxadc>; + mediatek,apmixedsys = <&apmixedsys>; + nvmem-cells = <&thermal_calibration_data>; + nvmem-cell-names = "calibration-data"; + }; -- 2.6.2 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-11-30 11:42 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer @ 2015-12-16 11:23 ` Daniel Kurtz 2015-12-17 19:23 ` Eduardo Valentin 0 siblings, 1 reply; 32+ messages in thread From: Daniel Kurtz @ 2015-12-16 11:23 UTC (permalink / raw) To: linux-arm-kernel On Mon, Nov 30, 2015 at 7:42 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > This adds the device tree binding documentation for the mediatek thermal > controller found on Mediatek MT8173 and other SoCs. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> > Acked-by: Rob Herring <robh@kernel.org> > --- > .../bindings/thermal/mediatek-thermal.txt | 43 ++++++++++++++++++++++ > 1 file changed, 43 insertions(+) > create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > > diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > new file mode 100644 > index 0000000..81f9a51 > --- /dev/null > +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > @@ -0,0 +1,43 @@ > +* Mediatek Thermal > + > +This describes the device tree binding for the Mediatek thermal controller > +which measures the on-SoC temperatures. This device does not have its own ADC, > +instead it directly controls the AUXADC via AHB bus accesses. For this reason > +this device needs phandles to the AUXADC. Also it controls a mux in the > +apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS > +is also needed. > + > +Required properties: > +- compatible: "mediatek,mt8173-thermal" > +- reg: Address range of the thermal controller > +- interrupts: IRQ for the thermal controller > +- clocks, clock-names: Clocks needed for the thermal controller. required > + clocks are: > + "therm": Main clock needed for register access > + "auxadc": The AUXADC clock > +- resets: Reference to the reset controller controlling the thermal controller. > +- mediatek,auxadc: A phandle to the AUXADC which the thermal controller uses > +- mediatek,apmixedsys: A phandle to the APMIXEDSYS controller. > +- #thermal-sensor-cells : Should be 0. See ./thermal.txt for a description. > + > +Optional properties: > +- nvmem-cells: A phandle to the calibration data provided by a nvmem device. If > + unspecified default values shall be used. > +- nvmem-cell-names: Should be "calibration-data" > + > +Example: > + > + thermal: thermal at 1100b000 { > + #thermal-sensor-cells = <1>; Tiny nit: this should now be: #thermal-sensor-cells = <0>; > + compatible = "mediatek,mt8173-thermal"; > + reg = <0 0x1100b000 0 0x1000>; > + interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; > + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; > + clock-names = "therm", "auxadc"; > + resets = <&pericfg MT8173_PERI_THERM_SW_RST>; > + reset-names = "therm"; > + mediatek,auxadc = <&auxadc>; > + mediatek,apmixedsys = <&apmixedsys>; > + nvmem-cells = <&thermal_calibration_data>; > + nvmem-cell-names = "calibration-data"; > + }; > -- > 2.6.2 > > > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek at lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-12-16 11:23 ` Daniel Kurtz @ 2015-12-17 19:23 ` Eduardo Valentin 2015-12-18 7:16 ` Sascha Hauer 0 siblings, 1 reply; 32+ messages in thread From: Eduardo Valentin @ 2015-12-17 19:23 UTC (permalink / raw) To: linux-arm-kernel On Wed, Dec 16, 2015 at 07:23:22PM +0800, Daniel Kurtz wrote: > On Mon, Nov 30, 2015 at 7:42 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > > This adds the device tree binding documentation for the mediatek thermal > > controller found on Mediatek MT8173 and other SoCs. > > > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > > Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> > > Acked-by: Rob Herring <robh@kernel.org> > > --- > > .../bindings/thermal/mediatek-thermal.txt | 43 ++++++++++++++++++++++ > > 1 file changed, 43 insertions(+) > > create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > > > > diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > > new file mode 100644 > > index 0000000..81f9a51 > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > > @@ -0,0 +1,43 @@ > > +* Mediatek Thermal > > + > > +This describes the device tree binding for the Mediatek thermal controller > > +which measures the on-SoC temperatures. This device does not have its own ADC, > > +instead it directly controls the AUXADC via AHB bus accesses. For this reason > > +this device needs phandles to the AUXADC. Also it controls a mux in the > > +apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS > > +is also needed. > > + > > +Required properties: > > +- compatible: "mediatek,mt8173-thermal" > > +- reg: Address range of the thermal controller > > +- interrupts: IRQ for the thermal controller > > +- clocks, clock-names: Clocks needed for the thermal controller. required > > + clocks are: > > + "therm": Main clock needed for register access > > + "auxadc": The AUXADC clock > > +- resets: Reference to the reset controller controlling the thermal controller. > > +- mediatek,auxadc: A phandle to the AUXADC which the thermal controller uses > > +- mediatek,apmixedsys: A phandle to the APMIXEDSYS controller. > > +- #thermal-sensor-cells : Should be 0. See ./thermal.txt for a description. > > + > > +Optional properties: > > +- nvmem-cells: A phandle to the calibration data provided by a nvmem device. If > > + unspecified default values shall be used. > > +- nvmem-cell-names: Should be "calibration-data" > > + > > +Example: > > + > > + thermal: thermal at 1100b000 { > > + #thermal-sensor-cells = <1>; > > Tiny nit: this should now be: > > #thermal-sensor-cells = <0>; This is actually not so tiny'shy. Why does this driver masks out all sensors available? Why don't we expose all of them and use id property to expose and identify each of them? ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-12-17 19:23 ` Eduardo Valentin @ 2015-12-18 7:16 ` Sascha Hauer 2015-12-20 2:12 ` Eduardo Valentin 0 siblings, 1 reply; 32+ messages in thread From: Sascha Hauer @ 2015-12-18 7:16 UTC (permalink / raw) To: linux-arm-kernel On Thu, Dec 17, 2015 at 11:23:31AM -0800, Eduardo Valentin wrote: > On Wed, Dec 16, 2015 at 07:23:22PM +0800, Daniel Kurtz wrote: > > On Mon, Nov 30, 2015 at 7:42 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > > > This adds the device tree binding documentation for the mediatek thermal > > > controller found on Mediatek MT8173 and other SoCs. > > > > > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > > > Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> > > > Acked-by: Rob Herring <robh@kernel.org> > > > --- > > > .../bindings/thermal/mediatek-thermal.txt | 43 ++++++++++++++++++++++ > > > 1 file changed, 43 insertions(+) > > > create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > > > > > > diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > > > new file mode 100644 > > > index 0000000..81f9a51 > > > --- /dev/null > > > +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > > > @@ -0,0 +1,43 @@ > > > +* Mediatek Thermal > > > + > > > +This describes the device tree binding for the Mediatek thermal controller > > > +which measures the on-SoC temperatures. This device does not have its own ADC, > > > +instead it directly controls the AUXADC via AHB bus accesses. For this reason > > > +this device needs phandles to the AUXADC. Also it controls a mux in the > > > +apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS > > > +is also needed. > > > + > > > +Required properties: > > > +- compatible: "mediatek,mt8173-thermal" > > > +- reg: Address range of the thermal controller > > > +- interrupts: IRQ for the thermal controller > > > +- clocks, clock-names: Clocks needed for the thermal controller. required > > > + clocks are: > > > + "therm": Main clock needed for register access > > > + "auxadc": The AUXADC clock > > > +- resets: Reference to the reset controller controlling the thermal controller. > > > +- mediatek,auxadc: A phandle to the AUXADC which the thermal controller uses > > > +- mediatek,apmixedsys: A phandle to the APMIXEDSYS controller. > > > +- #thermal-sensor-cells : Should be 0. See ./thermal.txt for a description. > > > + > > > +Optional properties: > > > +- nvmem-cells: A phandle to the calibration data provided by a nvmem device. If > > > + unspecified default values shall be used. > > > +- nvmem-cell-names: Should be "calibration-data" > > > + > > > +Example: > > > + > > > + thermal: thermal at 1100b000 { > > > + #thermal-sensor-cells = <1>; > > > > Tiny nit: this should now be: > > > > #thermal-sensor-cells = <0>; > > > This is actually not so tiny'shy. Why does this driver masks out all > sensors available? Why don't we expose all of them and use id property > to expose and identify each of them? This has been the case until v9 of this series. It was requested by Mediatek that the CPU frequency regulation works better when the maximum of all sensors is taken instead of only single sensors. We decided to expose the maximum of all sensors in the device tree. IN the end it will be easier to add additional sensors should we need them later than it is to get rid of sensors we don't need. Sascha -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-12-18 7:16 ` Sascha Hauer @ 2015-12-20 2:12 ` Eduardo Valentin 0 siblings, 0 replies; 32+ messages in thread From: Eduardo Valentin @ 2015-12-20 2:12 UTC (permalink / raw) To: linux-arm-kernel Hello Sascha, On Fri, Dec 18, 2015 at 08:16:33AM +0100, Sascha Hauer wrote: > On Thu, Dec 17, 2015 at 11:23:31AM -0800, Eduardo Valentin wrote: > > On Wed, Dec 16, 2015 at 07:23:22PM +0800, Daniel Kurtz wrote: > > > On Mon, Nov 30, 2015 at 7:42 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > > > > +Example: <cut> > > > > + > > > > + thermal: thermal at 1100b000 { > > > > + #thermal-sensor-cells = <1>; > > > > > > Tiny nit: this should now be: > > > > > > #thermal-sensor-cells = <0>; > > > > > > This is actually not so tiny'shy. Why does this driver masks out all > > sensors available? Why don't we expose all of them and use id property > > to expose and identify each of them? > > This has been the case until v9 of this series. It was requested by > Mediatek that the CPU frequency regulation works better when the maximum > of all sensors is taken instead of only single sensors. We decided to > expose the maximum of all sensors in the device tree. IN the end it will > be easier to add additional sensors should we need them later than it is > to get rid of sensors we don't need. Apologize as I completely missed this transition from v9 to v10. In fact, I really cannot understand the benefit of having such constraint implemented in the driver. In device tree you can mark a thermal zone as status disabled and it won't appear in your system. One can select which sensors / thermal zones are required. And even reuse same dtsi, and change status on dts per board. The combination of the above, with the possibility to select the maximum from thermal core / sysfs, would be bring much more flexibility for a system engineer, than having the maximum coded in the driver, because, well, changing that relation would require changing the code. If you keep the driver as simple as possible, changing the this setup later would be as simple as changing the dts(i). What do you think? BR, > > Sascha > > -- > Pengutronix e.K. | | > Industrial Linux Solutions | http://www.pengutronix.de/ | > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH v11] Add Mediatek thermal support
@ 2015-11-18 8:24 Sascha Hauer
2015-11-18 8:24 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer
0 siblings, 1 reply; 32+ messages in thread
From: Sascha Hauer @ 2015-11-18 8:24 UTC (permalink / raw)
To: linux-arm-kernel
This series adds support for the thermal sensors included in the
MT8173 SoC. Currently only basic temperature reading is supported
without any interrupt support.
The cpufreq driver for MT8173 is currently under review, so there's no
real cooling device available in mainline. Until this is available the
thermal driver can be tested with the following dts snippet. It creates
a fake gpio fan and a fake trip point which is so low that it can easily
be reached with a "cat /dev/zero > /dev/null" on the command line.
Sascha
changes since v10:
- Some style cleanup
- Add comment to make clear why we use the sensors in banks even if we
currently only use the maximum of all banks
changes since v9:
- rebase on v4.3
- Add support for reading the calibration values from nvmem fuses
- Only register a single thermal zone instead of four as it seems
that's everything needed
changes since v8:
- Add commit description to binding patch
- rebase on v4.3-rc2
changes since v7:
- re-add some used defines removed in v5
- Use MT8173_THERMAL_ZONE_* defines as array indices in static initializers
changes since v6:
- remove dot in Hanyi Wus name
changes since v5:
- update copyright
- remove unused defines
Changes since v4:
- give calibration constants more meaningful names (offset, slope)
- Use define instead of 0x00c for register access.
Changes since v3:
- add include/dt-bindings/thermal/mt8173.h for to be able to use sensor names
in dts files
- fix disabling wrong clock in error path
- remove now unused reset-names property from binding document
- rename MT8173_NUM_BANKS -> MT8173_NUM_ZONES
- rename MT8173_NUM_SENSING_POINTS -> MT8173_NUM_SENSORS_PER_ZONE
- rename struct thermal_zone_device *tz -> struct thermal_zone_device *tzd
Changes since v2:
- sort #includes alphabetically
- Add prefix to register defines
- drop some members from struct mtk_thermal
- simplify raw_to_mcelsius()
- add and use more register bit defines
- use device_reset() instead of devm_reset_control_get()/reset_control_reset()
- misc other stuff
Changes since v1:
- Use "mediatek," prefix for custom properties
- Drop "thermal: consistently use int for temperatures" dependency
-------------
fan: gpio_fan {
compatible = "gpio-fan";
gpios = <&pio 24 0>;
gpio-fan,speed-map = <0 0
4500 1>;
#cooling-cells = <2>;
};
thermal-zones {
cpu_thermal: cpu_thermal {
polling-delay-passive = <1000>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */
thermal-sensors = <&thermal>;
trips {
cpu_passive: cpu_passive {
temperature = <47000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
cpu_crit {
temperature = <90000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "critical";
};
};
cooling-maps {
map0 {
trip = <&cpu_passive>;
cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
};
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJWQHCkAAoJEPFlmONMx+ezneEP/265kyAMT71c7/HewE7kA1aZ
3/ah5w7gtOjBlY0y3VNaVCs0u0gJEUqa/JFIBRvXm61mNoDt/uKH1hP5IroHVFHa
uW9wc1nOgr8G185IZRYszIePwchoKE0lBLTpt1DplK8NwUv6k9NXdAlXlDrLkejQ
fDnvGbIq0Ok5OLntjp81hGUxOYcyfoQrqHTLUWohzsovRwVegVOMOh08gwnWNJuI
DKMaKlv4XpUiX8roeUEgQdrVnTLsddR85mvPonLcjIwpCMNooLygNKDmlTHf3C4g
VFpdoUH04cc1XdxtxJ6oAetCq+/C6z9BA22nVWm+tRecN8VU+ywjB9xo2qUR+xjv
aqEhKZMq8eTWNKWYUIhBh/LBPtoqZb5rYoS+Z76xFD/e+/umviscoh/QhavuohvZ
bEMGIY4jziUMccFzklzZGyfxPPcVx9yIwB0+q4IgkWxGYznFyXcuNi4+J3xcxtid
xYq1B6kcbca7G2UgEtt+JMSl9ukZYSeOAXGgYGQWsP0VyZWohvm+bH7FX455eHyX
FLd+b3CpUEyxT3yL7ZpuJeiwzpnpsOgbqSu5Djzd5KpgUNnl4QCRAFAv4L9BqKZM
L1ugFAhFJFcBIhjhgthws5WLhAY/hEI2gDaesYq2Wu5GgXiqZNIJyp7D1EA9RRpO
RQjaXpX7u47O5HgQpfBA
=4rKu
-----END PGP SIGNATURE-----
commit 53fcb89e372f49218e33889286a1812595e38cf3
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue May 12 09:22:29 2015 +0200
ARM64: dts: mt8173: Add thermal/auxadc device nodes
This adds the thermal controller and auxadc nodes to the Mediatek MT8173
dtsi file.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index 06a1564..e2ddd03 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -277,6 +277,11 @@
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
};
+ auxadc: auxadc at 11001000 {
+ compatible = "mediatek,mt8173-auxadc";
+ reg = <0 0x11001000 0 0x1000>;
+ };
+
uart0: serial at 11002000 {
compatible = "mediatek,mt8173-uart",
"mediatek,mt6577-uart";
@@ -487,6 +492,18 @@
clock-names = "source", "hclk";
status = "disabled";
};
+
+ thermal: thermal at 1100b000 {
+ #thermal-sensor-cells = <0>;
+ compatible = "mediatek,mt8173-thermal";
+ reg = <0 0x1100b000 0 0x1000>;
+ interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>;
+ clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>;
+ clock-names = "therm", "auxadc";
+ resets = <&pericfg MT8173_PERI_THERM_SW_RST>;
+ mediatek,auxadc = <&auxadc>;
+ mediatek,apmixedsys = <&apmixedsys>;
+ };
};
};
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJWTDT9AAoJEPFlmONMx+ez3RMQAKgHbBxQNJGKeINIetHYbKjS
chdOWL5OWtRwgi/vQbwq0b35qdvRhPMS5Ufgipjf4xO1BVSu5EOKWFuzgMQ6wh0r
xdFVe1VR188TcEDgc5YfJNMwiJ/eYreATE7EWF5uufXVVk9TAQLKl6b4o/Si2KtU
4Zy2uGQT6ZkwlMn8R1XDRoy0sSW3mnzs4it43YI/dJXYTw8S/OJlPFkUNT8jSFKU
LyIAhnU/Zux9Ueh4YNmRu/csiwuKI+Wpkbyu6fFb224SOmfE9Nz3hAQTmIIMV/FS
WwZ7V3CKCmh4xG7fRmjUu/naHnmWx6esVvdXPPKwr2qRDNX9ELRhq88R5Cue/wrX
gJgFTch6cBDRuNyAfCk1T29FebR0Y9BCuWLpUXGUj1/Rh+wSj/q7q6wNeKwW9TJ5
hIDdMio0fcR1ahmqIwG1NU3zJXpLNDnimD0MVtz/vfE85qBtahnClC9+4kcN0W3r
I6n0qQ/YxFp/xNJuHiBKRfw15RuTKyJBT6VtI+/lNd8YejPwdtqESrEJhL3yN9JM
bJ5sEZeGSOSi0KCXgC2bUq/aYEiedKhEsT0EoqnuIZu4wxk7/DL5Fb+F8py5gllZ
9haA2ryZYDEGLcZbhb8z0wHJD5MDLNFv5MRQw+TpG3oP75Jj5/Ejp+jjmBV9nBZM
PkyZGMUNPcEmvuXPqTR/
=Lp5z
-----END PGP SIGNATURE-----
commit 54d2d3b91b271f0edba2d8dbdf34eb76e37286c7
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue May 12 09:22:29 2015 +0200
ARM64: dts: mt8173: Add thermal/auxadc device nodes
This adds the thermal controller and auxadc nodes to the Mediatek MT8173
dtsi file.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index 06a1564..e2ddd03 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -277,6 +277,11 @@
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
};
+ auxadc: auxadc at 11001000 {
+ compatible = "mediatek,mt8173-auxadc";
+ reg = <0 0x11001000 0 0x1000>;
+ };
+
uart0: serial at 11002000 {
compatible = "mediatek,mt8173-uart",
"mediatek,mt6577-uart";
@@ -487,6 +492,18 @@
clock-names = "source", "hclk";
status = "disabled";
};
+
+ thermal: thermal at 1100b000 {
+ #thermal-sensor-cells = <0>;
+ compatible = "mediatek,mt8173-thermal";
+ reg = <0 0x1100b000 0 0x1000>;
+ interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>;
+ clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>;
+ clock-names = "therm", "auxadc";
+ resets = <&pericfg MT8173_PERI_THERM_SW_RST>;
+ mediatek,auxadc = <&auxadc>;
+ mediatek,apmixedsys = <&apmixedsys>;
+ };
};
};
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-11-18 8:24 [PATCH v11] Add Mediatek thermal support Sascha Hauer @ 2015-11-18 8:24 ` Sascha Hauer 0 siblings, 0 replies; 32+ messages in thread From: Sascha Hauer @ 2015-11-18 8:24 UTC (permalink / raw) To: linux-arm-kernel This adds the device tree binding documentation for the mediatek thermal controller found on Mediatek MT8173 and other SoCs. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> Acked-by: Rob Herring <robh@kernel.org> --- .../bindings/thermal/mediatek-thermal.txt | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt new file mode 100644 index 0000000..81f9a51 --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt @@ -0,0 +1,43 @@ +* Mediatek Thermal + +This describes the device tree binding for the Mediatek thermal controller +which measures the on-SoC temperatures. This device does not have its own ADC, +instead it directly controls the AUXADC via AHB bus accesses. For this reason +this device needs phandles to the AUXADC. Also it controls a mux in the +apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS +is also needed. + +Required properties: +- compatible: "mediatek,mt8173-thermal" +- reg: Address range of the thermal controller +- interrupts: IRQ for the thermal controller +- clocks, clock-names: Clocks needed for the thermal controller. required + clocks are: + "therm": Main clock needed for register access + "auxadc": The AUXADC clock +- resets: Reference to the reset controller controlling the thermal controller. +- mediatek,auxadc: A phandle to the AUXADC which the thermal controller uses +- mediatek,apmixedsys: A phandle to the APMIXEDSYS controller. +- #thermal-sensor-cells : Should be 0. See ./thermal.txt for a description. + +Optional properties: +- nvmem-cells: A phandle to the calibration data provided by a nvmem device. If + unspecified default values shall be used. +- nvmem-cell-names: Should be "calibration-data" + +Example: + + thermal: thermal at 1100b000 { + #thermal-sensor-cells = <1>; + compatible = "mediatek,mt8173-thermal"; + reg = <0 0x1100b000 0 0x1000>; + interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; + clock-names = "therm", "auxadc"; + resets = <&pericfg MT8173_PERI_THERM_SW_RST>; + reset-names = "therm"; + mediatek,auxadc = <&auxadc>; + mediatek,apmixedsys = <&apmixedsys>; + nvmem-cells = <&thermal_calibration_data>; + nvmem-cell-names = "calibration-data"; + }; -- 2.6.2 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH v10] Add Mediatek thermal support
@ 2015-11-09 10:13 Sascha Hauer
2015-11-09 10:13 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer
0 siblings, 1 reply; 32+ messages in thread
From: Sascha Hauer @ 2015-11-09 10:13 UTC (permalink / raw)
To: linux-arm-kernel
This series adds support for the thermal sensors included in the
MT8173 SoC. Currently only basic temperature reading is supported
without any interrupt support.
The cpufreq driver for MT8173 is currently under review, so there's no
real cooling device available in mainline. Until this is available the
thermal driver can be tested with the following dts snippet. It creates
a fake gpio fan and a fake trip point which is so low that it can easily
be reached with a "cat /dev/zero > /dev/null" on the command line.
Sascha
changes since v9:
- rebase on v4.3
- Add support for reading the calibration values from nvmem fuses
- Only register a single thermal zone instead of four as it seems
that's everything needed
changes since v8:
- Add commit description to binding patch
- rebase on v4.3-rc2
changes since v7:
- re-add some used defines removed in v5
- Use MT8173_THERMAL_ZONE_* defines as array indices in static initializers
changes since v6:
- remove dot in Hanyi Wus name
changes since v5:
- update copyright
- remove unused defines
Changes since v4:
- give calibration constants more meaningful names (offset, slope)
- Use define instead of 0x00c for register access.
Changes since v3:
- add include/dt-bindings/thermal/mt8173.h for to be able to use sensor names
in dts files
- fix disabling wrong clock in error path
- remove now unused reset-names property from binding document
- rename MT8173_NUM_BANKS -> MT8173_NUM_ZONES
- rename MT8173_NUM_SENSING_POINTS -> MT8173_NUM_SENSORS_PER_ZONE
- rename struct thermal_zone_device *tz -> struct thermal_zone_device *tzd
Changes since v2:
- sort #includes alphabetically
- Add prefix to register defines
- drop some members from struct mtk_thermal
- simplify raw_to_mcelsius()
- add and use more register bit defines
- use device_reset() instead of devm_reset_control_get()/reset_control_reset()
- misc other stuff
Changes since v1:
- Use "mediatek," prefix for custom properties
- Drop "thermal: consistently use int for temperatures" dependency
-------------
fan: gpio_fan {
compatible = "gpio-fan";
gpios = <&pio 24 0>;
gpio-fan,speed-map = <0 0
4500 1>;
#cooling-cells = <2>;
};
thermal-zones {
cpu_thermal: cpu_thermal {
polling-delay-passive = <1000>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */
thermal-sensors = <&thermal>;
trips {
cpu_passive: cpu_passive {
temperature = <47000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
cpu_crit {
temperature = <90000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "critical";
};
};
cooling-maps {
map0 {
trip = <&cpu_passive>;
cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
};
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-11-09 10:13 [PATCH v10] Add Mediatek thermal support Sascha Hauer @ 2015-11-09 10:13 ` Sascha Hauer 2015-11-09 15:59 ` Rob Herring 0 siblings, 1 reply; 32+ messages in thread From: Sascha Hauer @ 2015-11-09 10:13 UTC (permalink / raw) To: linux-arm-kernel This adds the device tree binding documentation for the mediatek thermal controller found on Mediatek MT8173 and other SoCs. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> --- .../bindings/thermal/mediatek-thermal.txt | 43 ++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt new file mode 100644 index 0000000..81f9a51 --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt @@ -0,0 +1,43 @@ +* Mediatek Thermal + +This describes the device tree binding for the Mediatek thermal controller +which measures the on-SoC temperatures. This device does not have its own ADC, +instead it directly controls the AUXADC via AHB bus accesses. For this reason +this device needs phandles to the AUXADC. Also it controls a mux in the +apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS +is also needed. + +Required properties: +- compatible: "mediatek,mt8173-thermal" +- reg: Address range of the thermal controller +- interrupts: IRQ for the thermal controller +- clocks, clock-names: Clocks needed for the thermal controller. required + clocks are: + "therm": Main clock needed for register access + "auxadc": The AUXADC clock +- resets: Reference to the reset controller controlling the thermal controller. +- mediatek,auxadc: A phandle to the AUXADC which the thermal controller uses +- mediatek,apmixedsys: A phandle to the APMIXEDSYS controller. +- #thermal-sensor-cells : Should be 0. See ./thermal.txt for a description. + +Optional properties: +- nvmem-cells: A phandle to the calibration data provided by a nvmem device. If + unspecified default values shall be used. +- nvmem-cell-names: Should be "calibration-data" + +Example: + + thermal: thermal at 1100b000 { + #thermal-sensor-cells = <1>; + compatible = "mediatek,mt8173-thermal"; + reg = <0 0x1100b000 0 0x1000>; + interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; + clock-names = "therm", "auxadc"; + resets = <&pericfg MT8173_PERI_THERM_SW_RST>; + reset-names = "therm"; + mediatek,auxadc = <&auxadc>; + mediatek,apmixedsys = <&apmixedsys>; + nvmem-cells = <&thermal_calibration_data>; + nvmem-cell-names = "calibration-data"; + }; -- 2.6.1 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-11-09 10:13 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer @ 2015-11-09 15:59 ` Rob Herring 0 siblings, 0 replies; 32+ messages in thread From: Rob Herring @ 2015-11-09 15:59 UTC (permalink / raw) To: linux-arm-kernel On Mon, Nov 09, 2015 at 11:13:31AM +0100, Sascha Hauer wrote: > This adds the device tree binding documentation for the mediatek thermal > controller found on Mediatek MT8173 and other SoCs. > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> Acked-by: Rob Herring <robh@kernel.org> > --- > .../bindings/thermal/mediatek-thermal.txt | 43 ++++++++++++++++++++++ > 1 file changed, 43 insertions(+) > create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > > diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > new file mode 100644 > index 0000000..81f9a51 > --- /dev/null > +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > @@ -0,0 +1,43 @@ > +* Mediatek Thermal > + > +This describes the device tree binding for the Mediatek thermal controller > +which measures the on-SoC temperatures. This device does not have its own ADC, > +instead it directly controls the AUXADC via AHB bus accesses. For this reason > +this device needs phandles to the AUXADC. Also it controls a mux in the > +apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS > +is also needed. > + > +Required properties: > +- compatible: "mediatek,mt8173-thermal" > +- reg: Address range of the thermal controller > +- interrupts: IRQ for the thermal controller > +- clocks, clock-names: Clocks needed for the thermal controller. required > + clocks are: > + "therm": Main clock needed for register access > + "auxadc": The AUXADC clock > +- resets: Reference to the reset controller controlling the thermal controller. > +- mediatek,auxadc: A phandle to the AUXADC which the thermal controller uses > +- mediatek,apmixedsys: A phandle to the APMIXEDSYS controller. > +- #thermal-sensor-cells : Should be 0. See ./thermal.txt for a description. > + > +Optional properties: > +- nvmem-cells: A phandle to the calibration data provided by a nvmem device. If > + unspecified default values shall be used. > +- nvmem-cell-names: Should be "calibration-data" > + > +Example: > + > + thermal: thermal at 1100b000 { > + #thermal-sensor-cells = <1>; > + compatible = "mediatek,mt8173-thermal"; > + reg = <0 0x1100b000 0 0x1000>; > + interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; > + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; > + clock-names = "therm", "auxadc"; > + resets = <&pericfg MT8173_PERI_THERM_SW_RST>; > + reset-names = "therm"; > + mediatek,auxadc = <&auxadc>; > + mediatek,apmixedsys = <&apmixedsys>; > + nvmem-cells = <&thermal_calibration_data>; > + nvmem-cell-names = "calibration-data"; > + }; > -- > 2.6.1 > ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH v9] Add Mediatek thermal support
@ 2015-09-23 13:37 Sascha Hauer
2015-09-23 13:37 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer
0 siblings, 1 reply; 32+ messages in thread
From: Sascha Hauer @ 2015-09-23 13:37 UTC (permalink / raw)
To: linux-arm-kernel
This series adds support for the thermal sensors included in the
MT8173 SoC. Currently only basic temperature reading is supported
without any interrupt support.
The cpufreq driver for MT8173 is currently under review, so there's no
real cooling device available in mainline. Until this is available the
thermal driver can be tested with the following dts snippet. It creates
a fake gpio fan and a fake trip point which is so low that it can easily
be reached with a "cat /dev/zero > /dev/null" on the command line.
Please review and let me know what's missing to be included in mainline.
changes since v8:
- Add commit description to binding patch
- rebase on v4.3-rc2
changes since v7:
- re-add some used defines removed in v5
- Use MT8173_THERMAL_ZONE_* defines as array indices in static initializers
changes since v6:
- remove dot in Hanyi Wus name
changes since v5:
- update copyright
- remove unused defines
Changes since v4:
- give calibration constants more meaningful names (offset, slope)
- Use define instead of 0x00c for register access.
Changes since v3:
- add include/dt-bindings/thermal/mt8173.h for to be able to use sensor names
in dts files
- fix disabling wrong clock in error path
- remove now unused reset-names property from binding document
- rename MT8173_NUM_BANKS -> MT8173_NUM_ZONES
- rename MT8173_NUM_SENSING_POINTS -> MT8173_NUM_SENSORS_PER_ZONE
- rename struct thermal_zone_device *tz -> struct thermal_zone_device *tzd
Changes since v2:
- sort #includes alphabetically
- Add prefix to register defines
- drop some members from struct mtk_thermal
- simplify raw_to_mcelsius()
- add and use more register bit defines
- use device_reset() instead of devm_reset_control_get()/reset_control_reset()
- misc other stuff
Changes since v1:
- Use "mediatek," prefix for custom properties
- Drop "thermal: consistently use int for temperatures" dependency
Sascha
fan: gpio_fan {
compatible = "gpio-fan";
gpios = <&pio 24 0>;
gpio-fan,speed-map = <0 0
4500 1>;
#cooling-cells = <2>;
};
thermal-zones {
cpu_thermal: cpu_thermal {
polling-delay-passive = <1000>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */
thermal-sensors = <&thermal 0>;
trips {
cpu_passive: cpu_passive {
temperature = <47000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
cpu_crit {
temperature = <90000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "critical";
};
};
cooling-maps {
map0 {
trip = <&cpu_passive>;
cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
};
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1
iQIcBAABCAAGBQJWAqrzAAoJEPFlmONMx+ezud4QAK3BODYyBYKDPHRF3M6bwcRR
Hc5gO9RuA3asA9eyxS+BCIyo9kuJW1Usb1xAE/YL8ryrXlMHMAGBxJH6jnlkuDTS
hNZRXdjIfCSLypWOxOLotDuH8RlRQVW4faNHjGYFxflXSL3YNGQlNPjxS2LLAKdU
flLSvwg9aWvtdeIwOyIL/tWbpMgF3sluLIz1K2iElqGKDFSDzwBfYEMlf27d6CKw
B3PoqDI0rRR6iDiMBoZFJLYzjyyNSKz9Xqqe9y6osOfPnlC7SRmwbBQ19df/Sqxl
+Cd4VsuWedqDmP5WD1MCr5SzYqocUnM54t7aarz5TmVf1Ehd3Z+hBW8ItGJsFPDp
Itn75HHiIDxm2GrIIkVs82dr3dUpw3v1vThEke3JqfrOvOi2H0bZ2C5jXCqbFr6M
bLKVADmyNDHfP/av+v224zMffmJVqRIedfnBKMV6nDLbTzzjlKVf2n1KeBKjwntS
PfEY/E4Qg/PM95E/G1qZCuInAN7w53dNZCGMnm+KCNVAcdkMsEwpNWT1lf8+18ng
brXWYXcDCniwr1Ye31NuakGdkWLzSolbpmWS5ValUtA/K9flfZBcnqJ5obF8ooD1
cMnyq4FMpYozhgRYoPVD3pooIBl+yqKNmNtphBftyozZKgPfdOjhPkoCx0hlpBuH
270RN+jva0dOJWk+FXGR
=bcx6
-----END PGP SIGNATURE-----
commit de42d22304311e6d5d711b85e66a281fe1035ba2
Author: Sascha Hauer <s.hauer@pengutronix.de>
Date: Tue May 12 09:22:29 2015 +0200
ARM64: dts: mt8173: Add thermal/auxadc device nodes
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: Daniel Kurtz <djkurtz@chromium.org>
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
index d18ee42..3b18f37 100644
--- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi
@@ -277,6 +277,11 @@
(GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_HIGH)>;
};
+ auxadc: auxadc at 11001000 {
+ compatible = "mediatek,mt8173-auxadc";
+ reg = <0 0x11001000 0 0x1000>;
+ };
+
uart0: serial at 11002000 {
compatible = "mediatek,mt8173-uart",
"mediatek,mt6577-uart";
@@ -487,6 +492,18 @@
clock-names = "source", "hclk";
status = "disabled";
};
+
+ thermal: thermal at 1100b000 {
+ #thermal-sensor-cells = <1>;
+ compatible = "mediatek,mt8173-thermal";
+ reg = <0 0x1100b000 0 0x1000>;
+ interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>;
+ clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>;
+ clock-names = "therm", "auxadc";
+ resets = <&pericfg MT8173_PERI_THERM_SW_RST>;
+ mediatek,auxadc = <&auxadc>;
+ mediatek,apmixedsys = <&apmixedsys>;
+ };
};
};
^ permalink raw reply related [flat|nested] 32+ messages in thread* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-09-23 13:37 [PATCH v9] Add Mediatek thermal support Sascha Hauer @ 2015-09-23 13:37 ` Sascha Hauer 0 siblings, 0 replies; 32+ messages in thread From: Sascha Hauer @ 2015-09-23 13:37 UTC (permalink / raw) To: linux-arm-kernel This adds the device tree binding documentation for the mediatek thermal controller found on Mediatek MT8173 and other SoCs. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> --- .../bindings/thermal/mediatek-thermal.txt | 38 ++++++++++++++++++++++ include/dt-bindings/thermal/mt8173.h | 13 ++++++++ 2 files changed, 51 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt create mode 100644 include/dt-bindings/thermal/mt8173.h diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt new file mode 100644 index 0000000..1697375 --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt @@ -0,0 +1,38 @@ +* Mediatek Thermal + +This describes the device tree binding for the Mediatek thermal controller +which measures the on-SoC temperatures. This device does not have its own ADC, +instead it directly controls the AUXADC via AHB bus accesses. For this reason +this device needs phandles to the AUXADC. Also it controls a mux in the +apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS +is also needed. + +Required properties: +- compatible: "mediatek,mt8173-thermal" +- reg: Address range of the thermal controller +- interrupts: IRQ for the thermal controller +- clocks, clock-names: Clocks needed for the thermal controller. required + clocks are: + "therm": Main clock needed for register access + "auxadc": The AUXADC clock +- resets: Reference to the reset controller controlling the thermal controller. +- mediatek,auxadc: A phandle to the AUXADC which the thermal controller uses +- mediatek,apmixedsys: A phandle to the APMIXEDSYS controller. +- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description. See + include/dt-bindings/thermal/mt8173.h for valid sensor + numbers. + +Example: + + thermal: thermal at 1100b000 { + #thermal-sensor-cells = <1>; + compatible = "mediatek,mt8173-thermal"; + reg = <0 0x1100b000 0 0x1000>; + interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; + clock-names = "therm", "auxadc"; + resets = <&pericfg MT8173_PERI_THERM_SW_RST>; + reset-names = "therm"; + mediatek,auxadc = <&auxadc>; + mediatek,apmixedsys = <&apmixedsys>; + }; diff --git a/include/dt-bindings/thermal/mt8173.h b/include/dt-bindings/thermal/mt8173.h new file mode 100644 index 0000000..692e74c --- /dev/null +++ b/include/dt-bindings/thermal/mt8173.h @@ -0,0 +1,13 @@ +/* + * This header provides constants for mediatek,mt8173-thermal + */ + +#ifndef _DT_BINDINGS_THERMAL_MEDIATEK_MT8173_H +#define _DT_BINDINGS_THERMAL_MEDIATEK_MT8173_H + +#define MT8173_THERMAL_ZONE_CA53 0 +#define MT8173_THERMAL_ZONE_CA57 1 +#define MT8173_THERMAL_ZONE_GPU 2 +#define MT8173_THERMAL_ZONE_CORE 3 + +#endif /* _DT_BINDINGS_THERMAL_MEDIATEK_MT8173_H */ -- 2.5.1 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH v8] Add Mediatek thermal support
@ 2015-08-31 7:34 Sascha Hauer
2015-08-31 7:34 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer
0 siblings, 1 reply; 32+ messages in thread
From: Sascha Hauer @ 2015-08-31 7:34 UTC (permalink / raw)
To: linux-arm-kernel
This series adds support for the thermal sensors included in the
MT8173 SoC. Currently only basic temperature reading is supported
without any interrupt support.
The cpufreq driver for MT8173 is currently under review, so there's no
real cooling device available in mainline. Until this is available the
thermal driver can be tested with the following dts snippet. It creates
a fake gpio fan and a fake trip point which is so low that it can easily
be reached with a "cat /dev/zero > /dev/null" on the command line.
Please review and let me know what's missing to be included in mainline.
changes since v7:
- re-add some used defines removed in v5
- Use MT8173_THERMAL_ZONE_* defines as array indices in static initializers
changes since v6:
- remove dot in Hanyi Wus name
changes since v5:
- update copyright
- remove unused defines
Changes since v4:
- give calibration constants more meaningful names (offset, slope)
- Use define instead of 0x00c for register access.
Changes since v3:
- add include/dt-bindings/thermal/mt8173.h for to be able to use sensor names
in dts files
- fix disabling wrong clock in error path
- remove now unused reset-names property from binding document
- rename MT8173_NUM_BANKS -> MT8173_NUM_ZONES
- rename MT8173_NUM_SENSING_POINTS -> MT8173_NUM_SENSORS_PER_ZONE
- rename struct thermal_zone_device *tz -> struct thermal_zone_device *tzd
Changes since v2:
- sort #includes alphabetically
- Add prefix to register defines
- drop some members from struct mtk_thermal
- simplify raw_to_mcelsius()
- add and use more register bit defines
- use device_reset() instead of devm_reset_control_get()/reset_control_reset()
- misc other stuff
Changes since v1:
- Use "mediatek," prefix for custom properties
- Drop "thermal: consistently use int for temperatures" dependency
Sascha
fan: gpio_fan {
compatible = "gpio-fan";
gpios = <&pio 24 0>;
gpio-fan,speed-map = <0 0
4500 1>;
#cooling-cells = <2>;
};
thermal-zones {
cpu_thermal: cpu_thermal {
polling-delay-passive = <1000>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */
thermal-sensors = <&thermal 0>;
trips {
cpu_passive: cpu_passive {
temperature = <47000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
cpu_crit {
temperature = <90000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "critical";
};
};
cooling-maps {
map0 {
trip = <&cpu_passive>;
cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
};
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-08-31 7:34 [PATCH v8] Add Mediatek thermal support Sascha Hauer @ 2015-08-31 7:34 ` Sascha Hauer 2015-09-01 5:26 ` Sascha Hauer 0 siblings, 1 reply; 32+ messages in thread From: Sascha Hauer @ 2015-08-31 7:34 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> --- .../bindings/thermal/mediatek-thermal.txt | 38 ++++++++++++++++++++++ include/dt-bindings/thermal/mt8173.h | 13 ++++++++ 2 files changed, 51 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt create mode 100644 include/dt-bindings/thermal/mt8173.h diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt new file mode 100644 index 0000000..1697375 --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt @@ -0,0 +1,38 @@ +* Mediatek Thermal + +This describes the device tree binding for the Mediatek thermal controller +which measures the on-SoC temperatures. This device does not have its own ADC, +instead it directly controls the AUXADC via AHB bus accesses. For this reason +this device needs phandles to the AUXADC. Also it controls a mux in the +apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS +is also needed. + +Required properties: +- compatible: "mediatek,mt8173-thermal" +- reg: Address range of the thermal controller +- interrupts: IRQ for the thermal controller +- clocks, clock-names: Clocks needed for the thermal controller. required + clocks are: + "therm": Main clock needed for register access + "auxadc": The AUXADC clock +- resets: Reference to the reset controller controlling the thermal controller. +- mediatek,auxadc: A phandle to the AUXADC which the thermal controller uses +- mediatek,apmixedsys: A phandle to the APMIXEDSYS controller. +- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description. See + include/dt-bindings/thermal/mt8173.h for valid sensor + numbers. + +Example: + + thermal: thermal at 1100b000 { + #thermal-sensor-cells = <1>; + compatible = "mediatek,mt8173-thermal"; + reg = <0 0x1100b000 0 0x1000>; + interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; + clock-names = "therm", "auxadc"; + resets = <&pericfg MT8173_PERI_THERM_SW_RST>; + reset-names = "therm"; + mediatek,auxadc = <&auxadc>; + mediatek,apmixedsys = <&apmixedsys>; + }; diff --git a/include/dt-bindings/thermal/mt8173.h b/include/dt-bindings/thermal/mt8173.h new file mode 100644 index 0000000..692e74c --- /dev/null +++ b/include/dt-bindings/thermal/mt8173.h @@ -0,0 +1,13 @@ +/* + * This header provides constants for mediatek,mt8173-thermal + */ + +#ifndef _DT_BINDINGS_THERMAL_MEDIATEK_MT8173_H +#define _DT_BINDINGS_THERMAL_MEDIATEK_MT8173_H + +#define MT8173_THERMAL_ZONE_CA53 0 +#define MT8173_THERMAL_ZONE_CA57 1 +#define MT8173_THERMAL_ZONE_GPU 2 +#define MT8173_THERMAL_ZONE_CORE 3 + +#endif /* _DT_BINDINGS_THERMAL_MEDIATEK_MT8173_H */ -- 2.5.0 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-08-31 7:34 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer @ 2015-09-01 5:26 ` Sascha Hauer 0 siblings, 0 replies; 32+ messages in thread From: Sascha Hauer @ 2015-09-01 5:26 UTC (permalink / raw) To: linux-arm-kernel On Mon, Aug 31, 2015 at 09:34:04AM +0200, Sascha Hauer wrote: > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > Reviewed-by: Daniel Kurtz <djkurtz@chromium.org> Uh, still forgot the commit log. Will add something like: This adds the device tree binding documentation for the mediatek thermal controller found on Mediatek MT8173 and other SoCs. Sascha > --- > .../bindings/thermal/mediatek-thermal.txt | 38 ++++++++++++++++++++++ > include/dt-bindings/thermal/mt8173.h | 13 ++++++++ > 2 files changed, 51 insertions(+) > create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > create mode 100644 include/dt-bindings/thermal/mt8173.h > > diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > new file mode 100644 > index 0000000..1697375 > --- /dev/null > +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > @@ -0,0 +1,38 @@ > +* Mediatek Thermal > + > +This describes the device tree binding for the Mediatek thermal controller > +which measures the on-SoC temperatures. This device does not have its own ADC, > +instead it directly controls the AUXADC via AHB bus accesses. For this reason > +this device needs phandles to the AUXADC. Also it controls a mux in the > +apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS > +is also needed. > + > +Required properties: > +- compatible: "mediatek,mt8173-thermal" > +- reg: Address range of the thermal controller > +- interrupts: IRQ for the thermal controller > +- clocks, clock-names: Clocks needed for the thermal controller. required > + clocks are: > + "therm": Main clock needed for register access > + "auxadc": The AUXADC clock > +- resets: Reference to the reset controller controlling the thermal controller. > +- mediatek,auxadc: A phandle to the AUXADC which the thermal controller uses > +- mediatek,apmixedsys: A phandle to the APMIXEDSYS controller. > +- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description. See > + include/dt-bindings/thermal/mt8173.h for valid sensor > + numbers. > + > +Example: > + > + thermal: thermal at 1100b000 { > + #thermal-sensor-cells = <1>; > + compatible = "mediatek,mt8173-thermal"; > + reg = <0 0x1100b000 0 0x1000>; > + interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; > + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; > + clock-names = "therm", "auxadc"; > + resets = <&pericfg MT8173_PERI_THERM_SW_RST>; > + reset-names = "therm"; > + mediatek,auxadc = <&auxadc>; > + mediatek,apmixedsys = <&apmixedsys>; > + }; > diff --git a/include/dt-bindings/thermal/mt8173.h b/include/dt-bindings/thermal/mt8173.h > new file mode 100644 > index 0000000..692e74c > --- /dev/null > +++ b/include/dt-bindings/thermal/mt8173.h > @@ -0,0 +1,13 @@ > +/* > + * This header provides constants for mediatek,mt8173-thermal > + */ > + > +#ifndef _DT_BINDINGS_THERMAL_MEDIATEK_MT8173_H > +#define _DT_BINDINGS_THERMAL_MEDIATEK_MT8173_H > + > +#define MT8173_THERMAL_ZONE_CA53 0 > +#define MT8173_THERMAL_ZONE_CA57 1 > +#define MT8173_THERMAL_ZONE_GPU 2 > +#define MT8173_THERMAL_ZONE_CORE 3 > + > +#endif /* _DT_BINDINGS_THERMAL_MEDIATEK_MT8173_H */ > -- > 2.5.0 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 | ^ permalink raw reply [flat|nested] 32+ messages in thread
* [PATCH v2] Add Mediatek thermal support
@ 2015-07-21 7:59 Sascha Hauer
2015-07-21 7:59 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer
0 siblings, 1 reply; 32+ messages in thread
From: Sascha Hauer @ 2015-07-21 7:59 UTC (permalink / raw)
To: linux-arm-kernel
This series adds support for the thermal sensors included in the
MT8173 SoC. Currently only basic temperature reading is supported
without any interrupt support.
The cpufreq driver for MT8173 is currently under review, so there's no
real cooling device available in mainline. Until this is available the
thermal driver can be tested with the following dts snippet. It creates
a fake gpio fan and a fake trip point which is so low that it can easily
be reached with a "cat /dev/zero > /dev/null" on the command line.
Please review and let me know what's missing to be included in mainline.
Changes since v1:
- Use "mediatek," prefix for custom properties
- Drop "thermal: consistently use int for temperatures" dependency
Sascha
fan: gpio_fan {
compatible = "gpio-fan";
gpios = <&pio 24 0>;
gpio-fan,speed-map = <0 0
4500 1>;
#cooling-cells = <2>;
};
thermal-zones {
cpu_thermal: cpu_thermal {
polling-delay-passive = <1000>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */
thermal-sensors = <&thermal 0>;
trips {
cpu_passive: cpu_passive {
temperature = <47000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
cpu_crit {
temperature = <90000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "critical";
};
};
cooling-maps {
map0 {
trip = <&cpu_passive>;
cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
};
----------------------------------------------------------------
Sascha Hauer (3):
dt-bindings: thermal: Add binding document for Mediatek thermal controller
thermal: Add Mediatek thermal controller support
ARM64: dts: mt8173: Add thermal/auxadc device nodes
.../bindings/thermal/mediatek-thermal.txt | 38 ++
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 18 +
drivers/thermal/Kconfig | 8 +
drivers/thermal/Makefile | 1 +
drivers/thermal/mtk_thermal.c | 602 +++++++++++++++++++++
5 files changed, 667 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt
create mode 100644 drivers/thermal/mtk_thermal.c
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-07-21 7:59 [PATCH v2] Add Mediatek thermal support Sascha Hauer @ 2015-07-21 7:59 ` Sascha Hauer 0 siblings, 0 replies; 32+ messages in thread From: Sascha Hauer @ 2015-07-21 7:59 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- .../bindings/thermal/mediatek-thermal.txt | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt new file mode 100644 index 0000000..d90e4dc --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt @@ -0,0 +1,38 @@ +* Mediatek Thermal + +This describes the device tree binding for the Mediatek thermal controller +which measures the on-SoC temperatures. This device does not have its own ADC, +instead it directly controls the AUXADC via AHB bus accesses. For this reason +this device needs phandles to the AUXADC. Also it controls a mux in the +apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS +is also needed. + +Required properties: +- compatible: "mediatek,mt8173-thermal" +- reg: Address range of the thermal controller +- interrupts: IRQ for the thermal controller +- clocks, clock-names: Clocks needed for the thermal controller. required + clocks are: + "therm": Main clock needed for register access + "auxadc": The AUXADC clock +- resets, reset-names: Reference to the reset controller controlling the thermal + controller. Required reset-names: + "therm": The main reset line +- auxadc: A phandle to the AUXADC which the thermal controller uses +- apmixedsys: A phandle to the APMIXEDSYS controller. +- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description + +Example: + + thermal: thermal at 1100b000 { + #thermal-sensor-cells = <1>; + compatible = "mediatek,mt8173-thermal"; + reg = <0 0x1100b000 0 0x1000>; + interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; + clock-names = "therm", "auxadc"; + resets = <&pericfg MT8173_PERI_THERM_SW_RST>; + reset-names = "therm"; + auxadc = <&auxadc>; + apmixedsys = <&apmixedsys>; + }; -- 2.1.4 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH] thermal: Add Mediatek thermal support
@ 2015-07-13 10:34 Sascha Hauer
2015-07-13 10:34 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer
0 siblings, 1 reply; 32+ messages in thread
From: Sascha Hauer @ 2015-07-13 10:34 UTC (permalink / raw)
To: linux-arm-kernel
This series adds support for the thermal sensors included in the
MT8173 SoC. Currently only basic temperature reading is supported
without any interrupt support.
The cpufreq driver for MT8173 is currently under review, so there's no
real cooling device available in mainline. Until this is available the
thermal driver can be tested with the following dts snippet. It creates
a fake gpio fan and a fake trip point which is so low that it can easily
be reached with a "cat /dev/zero > /dev/null" on the command line.
Please review and let me know what's missing to be included in mainline.
Sascha
fan: gpio_fan {
compatible = "gpio-fan";
gpios = <&pio 24 0>;
gpio-fan,speed-map = <0 0
4500 1>;
#cooling-cells = <2>;
};
thermal-zones {
cpu_thermal: cpu_thermal {
polling-delay-passive = <1000>; /* milliseconds */
polling-delay = <1000>; /* milliseconds */
thermal-sensors = <&thermal 0>;
trips {
cpu_passive: cpu_passive {
temperature = <47000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "passive";
};
cpu_crit {
temperature = <90000>; /* millicelsius */
hysteresis = <2000>; /* millicelsius */
type = "critical";
};
};
cooling-maps {
map0 {
trip = <&cpu_passive>;
cooling-device = <&fan THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
};
};
};
};
----------------------------------------------------------------
Sascha Hauer (3):
dt-bindings: thermal: Add binding document for Mediatek thermal controller
thermal: Add Mediatek thermal controller support
ARM64: dts: mt8173: Add thermal/auxadc device nodes
.../bindings/thermal/mediatek-thermal.txt | 38 ++
arch/arm64/boot/dts/mediatek/mt8173.dtsi | 18 +
drivers/thermal/Kconfig | 8 +
drivers/thermal/Makefile | 1 +
drivers/thermal/mtk_thermal.c | 602 +++++++++++++++++++++
5 files changed, 667 insertions(+)
create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt
create mode 100644 drivers/thermal/mtk_thermal.c
^ permalink raw reply [flat|nested] 32+ messages in thread* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-07-13 10:34 [PATCH] thermal: Add Mediatek thermal support Sascha Hauer @ 2015-07-13 10:34 ` Sascha Hauer 2015-07-15 17:41 ` Daniel Kurtz 0 siblings, 1 reply; 32+ messages in thread From: Sascha Hauer @ 2015-07-13 10:34 UTC (permalink / raw) To: linux-arm-kernel Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> --- .../bindings/thermal/mediatek-thermal.txt | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt new file mode 100644 index 0000000..d90e4dc --- /dev/null +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt @@ -0,0 +1,38 @@ +* Mediatek Thermal + +This describes the device tree binding for the Mediatek thermal controller +which measures the on-SoC temperatures. This device does not have its own ADC, +instead it directly controls the AUXADC via AHB bus accesses. For this reason +this device needs phandles to the AUXADC. Also it controls a mux in the +apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS +is also needed. + +Required properties: +- compatible: "mediatek,mt8173-thermal" +- reg: Address range of the thermal controller +- interrupts: IRQ for the thermal controller +- clocks, clock-names: Clocks needed for the thermal controller. required + clocks are: + "therm": Main clock needed for register access + "auxadc": The AUXADC clock +- resets, reset-names: Reference to the reset controller controlling the thermal + controller. Required reset-names: + "therm": The main reset line +- auxadc: A phandle to the AUXADC which the thermal controller uses +- apmixedsys: A phandle to the APMIXEDSYS controller. +- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description + +Example: + + thermal: thermal at 1100b000 { + #thermal-sensor-cells = <1>; + compatible = "mediatek,mt8173-thermal"; + reg = <0 0x1100b000 0 0x1000>; + interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; + clock-names = "therm", "auxadc"; + resets = <&pericfg MT8173_PERI_THERM_SW_RST>; + reset-names = "therm"; + auxadc = <&auxadc>; + apmixedsys = <&apmixedsys>; + }; -- 2.1.4 ^ permalink raw reply related [flat|nested] 32+ messages in thread
* [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller 2015-07-13 10:34 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer @ 2015-07-15 17:41 ` Daniel Kurtz 0 siblings, 0 replies; 32+ messages in thread From: Daniel Kurtz @ 2015-07-15 17:41 UTC (permalink / raw) To: linux-arm-kernel On Mon, Jul 13, 2015 at 6:34 PM, Sascha Hauer <s.hauer@pengutronix.de> wrote: > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > --- > .../bindings/thermal/mediatek-thermal.txt | 38 ++++++++++++++++++++++ > 1 file changed, 38 insertions(+) > create mode 100644 Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > > diff --git a/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > new file mode 100644 > index 0000000..d90e4dc > --- /dev/null > +++ b/Documentation/devicetree/bindings/thermal/mediatek-thermal.txt > @@ -0,0 +1,38 @@ > +* Mediatek Thermal > + > +This describes the device tree binding for the Mediatek thermal controller > +which measures the on-SoC temperatures. This device does not have its own ADC, > +instead it directly controls the AUXADC via AHB bus accesses. For this reason > +this device needs phandles to the AUXADC. Also it controls a mux in the > +apmixedsys register space via AHB bus accesses, so a phandle to the APMIXEDSYS > +is also needed. > + > +Required properties: > +- compatible: "mediatek,mt8173-thermal" > +- reg: Address range of the thermal controller > +- interrupts: IRQ for the thermal controller > +- clocks, clock-names: Clocks needed for the thermal controller. required > + clocks are: > + "therm": Main clock needed for register access > + "auxadc": The AUXADC clock > +- resets, reset-names: Reference to the reset controller controlling the thermal > + controller. Required reset-names: > + "therm": The main reset line > +- auxadc: A phandle to the AUXADC which the thermal controller uses > +- apmixedsys: A phandle to the APMIXEDSYS controller. Hmm, shouldn't these custom properties be prefixed with: "mediatek,..." -Dan > +- #thermal-sensor-cells : Should be 1. See ./thermal.txt for a description > + > +Example: > + > + thermal: thermal at 1100b000 { > + #thermal-sensor-cells = <1>; > + compatible = "mediatek,mt8173-thermal"; > + reg = <0 0x1100b000 0 0x1000>; > + interrupts = <0 70 IRQ_TYPE_LEVEL_LOW>; > + clocks = <&pericfg CLK_PERI_THERM>, <&pericfg CLK_PERI_AUXADC>; > + clock-names = "therm", "auxadc"; > + resets = <&pericfg MT8173_PERI_THERM_SW_RST>; > + reset-names = "therm"; > + auxadc = <&auxadc>; > + apmixedsys = <&apmixedsys>; > + }; > -- > 2.1.4 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo at vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ ^ permalink raw reply [flat|nested] 32+ messages in thread
end of thread, other threads:[~2016-08-22 17:09 UTC | newest] Thread overview: 32+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2016-07-07 9:06 [PATCH 0/3] thermal: Add Mediatek thermal driver for mt2701 Dawei Chien 2016-07-07 9:06 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Dawei Chien 2016-07-07 11:09 ` Keerthy 2016-07-11 8:52 ` dawei chien 2016-08-11 15:48 ` Matthias Brugger 2016-08-15 7:07 ` dawei chien 2016-07-07 9:06 ` [PATCH 2/3] thermal: Add Mediatek thermal driver for mt2701 Dawei Chien 2016-07-07 11:54 ` Keerthy 2016-07-11 8:56 ` dawei chien 2016-08-09 5:55 ` dawei chien 2016-08-09 5:57 ` Keerthy 2016-07-07 9:06 ` [PATCH 3/3] arm: dts: thermal: add thermal/auxadc node Dawei Chien 2016-07-07 12:09 ` Keerthy 2016-07-11 8:56 ` dawei chien 2016-07-11 9:09 ` Keerthy 2016-08-11 15:51 ` Matthias Brugger 2016-08-15 7:14 ` dawei chien 2016-08-22 17:09 ` Matthias Brugger -- strict thread matches above, loose matches on Subject: below -- 2015-11-30 11:42 [PATCH v12] Add Mediatek thermal support Sascha Hauer 2015-11-30 11:42 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer 2015-12-16 11:23 ` Daniel Kurtz 2015-12-17 19:23 ` Eduardo Valentin 2015-12-18 7:16 ` Sascha Hauer 2015-12-20 2:12 ` Eduardo Valentin 2015-11-18 8:24 [PATCH v11] Add Mediatek thermal support Sascha Hauer 2015-11-18 8:24 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer 2015-11-09 10:13 [PATCH v10] Add Mediatek thermal support Sascha Hauer 2015-11-09 10:13 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer 2015-11-09 15:59 ` Rob Herring 2015-09-23 13:37 [PATCH v9] Add Mediatek thermal support Sascha Hauer 2015-09-23 13:37 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer 2015-08-31 7:34 [PATCH v8] Add Mediatek thermal support Sascha Hauer 2015-08-31 7:34 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer 2015-09-01 5:26 ` Sascha Hauer 2015-07-21 7:59 [PATCH v2] Add Mediatek thermal support Sascha Hauer 2015-07-21 7:59 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer 2015-07-13 10:34 [PATCH] thermal: Add Mediatek thermal support Sascha Hauer 2015-07-13 10:34 ` [PATCH 1/3] dt-bindings: thermal: Add binding document for Mediatek thermal controller Sascha Hauer 2015-07-15 17:41 ` Daniel Kurtz
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).