From: Eduardo Valentin <edubezval@gmail.com> To: michael.kao@mediatek.com Cc: =Mark Rutland <mark.rutland@arm.com>, devicetree@vger.kernel.org, srv_heupstream@mediatek.com, linux-pm@vger.kernel.org, =Daniel Lezcano <daniel.lezcano@linaro.org>, linux-kernel@vger.kernel.org, =Rob Herring <robh+dt@kernel.org>, linux-mediatek@lists.infradead.org, =Matthias Brugger <matthias.bgg@gmail.com>, =Zhang Rui <rui.zhang@intel.com>, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 4/7] thermal: mediatek: add thermal controller offset Date: Tue, 5 Feb 2019 16:53:03 -0800 Message-ID: <20190206005300.GD19687@localhost.localdomain> (raw) In-Reply-To: <1549006693-11659-5-git-send-email-michael.kao@mediatek.com> On Fri, Feb 01, 2019 at 03:38:10PM +0800, michael.kao@mediatek.com wrote: > From: Michael Kao <michael.kao@mediatek.com> > > One thermal controller can read four sensors at most, > so we need to add controller_offset for the project with > more than four sensors to reuse the same register settings. > > Signed-off-by: Michael Kao <michael.kao@mediatek.com> > --- > drivers/thermal/mtk_thermal.c | 79 +++++++++++++++++++++++++++++-------------- > 1 file changed, 54 insertions(+), 25 deletions(-) > > diff --git a/drivers/thermal/mtk_thermal.c b/drivers/thermal/mtk_thermal.c > index 45c6587..e5cf3f4 100644 > --- a/drivers/thermal/mtk_thermal.c > +++ b/drivers/thermal/mtk_thermal.c > @@ -105,6 +105,9 @@ > /* The number of sensing points per bank */ > #define MT8173_NUM_SENSORS_PER_ZONE 4 > > +/* The number of controller in the MT8173 */ > +#define MT8173_NUM_CONTROLLER 1 > + > /* The calibration coefficient of sensor */ > #define MT8173_CALIBRATION 165 > > @@ -150,6 +153,9 @@ enum { > /* The number of sensing points per bank */ > #define MT2701_NUM_SENSORS_PER_ZONE 3 > > +/* The number of controller in the MT2701 */ > +#define MT2701_NUM_CONTROLLER 1 > + > /* The calibration coefficient of sensor */ > #define MT2701_CALIBRATION 165 > > @@ -168,6 +174,9 @@ enum { > /* The number of sensing points per bank */ > #define MT2712_NUM_SENSORS_PER_ZONE 4 > > +/* The number of controller in the MT2712 */ > +#define MT2712_NUM_CONTROLLER 1 > + > /* The calibration coefficient of sensor */ > #define MT2712_CALIBRATION 165 > > @@ -176,6 +185,7 @@ enum { > #define MT7622_NUM_ZONES 1 > #define MT7622_NUM_SENSORS_PER_ZONE 1 > #define MT7622_TS1 0 > +#define MT7622_NUM_CONTROLLER 1 > > /* The calibration coefficient of sensor */ > #define MT7622_CALIBRATION 165 > @@ -201,6 +211,8 @@ struct mtk_thermal_data { > const int *msr; > const int *adcpnp; > const int cali_val; > + const int num_controller; > + const int *controller_offset; > struct thermal_bank_cfg bank_data[]; > }; > > @@ -240,6 +252,7 @@ struct mtk_thermal { > }; > > static const int mt8173_mux_values[MT8173_NUM_SENSORS] = { 0, 1, 2, 3, 16 }; > +static const int mt8173_tc_offset[MT8173_NUM_CONTROLLER] = { 0x0, }; > > static const int mt8173_vts_index[MT8173_NUM_SENSORS] = { > VTS1, VTS2, VTS3, VTS4, VTSABB > @@ -259,6 +272,7 @@ struct mtk_thermal { > }; > > static const int mt2701_mux_values[MT2701_NUM_SENSORS] = { 0, 1, 16 }; > +static const int mt2701_tc_offset[MT2701_NUM_CONTROLLER] = { 0x0, }; > > static const int mt2701_vts_index[MT2701_NUM_SENSORS] = { > VTS1, VTS2, VTS3 > @@ -278,6 +292,7 @@ struct mtk_thermal { > }; > > static const int mt2712_mux_values[MT2712_NUM_SENSORS] = { 0, 1, 2, 3 }; > +static const int mt2712_tc_offset[MT2712_NUM_CONTROLLER] = { 0x0, }; > > static const int mt2712_vts_index[MT2712_NUM_SENSORS] = { > VTS1, VTS2, VTS3, VTS4 > @@ -289,6 +304,7 @@ struct mtk_thermal { > static const int mt7622_adcpnp[MT7622_NUM_SENSORS_PER_ZONE] = { TEMP_ADCPNP0, }; > static const int mt7622_mux_values[MT7622_NUM_SENSORS] = { 0, }; > static const int mt7622_vts_index[MT7622_NUM_SENSORS] = { VTS1 }; > +static const int mt7622_tc_offset[MT7622_NUM_CONTROLLER] = { 0x0, }; > > /** > * The MT8173 thermal controller has four banks. Each bank can read up to > @@ -309,6 +325,8 @@ struct mtk_thermal { > .num_sensors = MT8173_NUM_SENSORS, > .vts_index = mt8173_vts_index, > .cali_val = MT8173_CALIBRATION, > + .num_controller = MT8173_NUM_CONTROLLER, > + .controller_offset = mt8173_tc_offset, > .bank_data = { > { > .num_sensors = 2, > @@ -345,6 +363,8 @@ struct mtk_thermal { > .num_sensors = MT2701_NUM_SENSORS, > .vts_index = mt2701_vts_index, > .cali_val = MT2701_CALIBRATION, > + .num_controller = MT2701_NUM_CONTROLLER, > + .controller_offset = mt2701_tc_offset, > .bank_data = { > { > .num_sensors = 3, > @@ -372,6 +392,8 @@ struct mtk_thermal { > .num_sensors = MT2712_NUM_SENSORS, > .vts_index = mt2712_vts_index, > .cali_val = MT2712_CALIBRATION, > + .num_controller = MT2712_NUM_CONTROLLER, > + .controller_offset = mt2712_tc_offset, > .bank_data = { > { > .num_sensors = 4, > @@ -393,6 +415,8 @@ struct mtk_thermal { > .num_sensors = MT7622_NUM_SENSORS, > .vts_index = mt7622_vts_index, > .cali_val = MT7622_CALIBRATION, > + .num_controller = MT7622_NUM_CONTROLLER, > + .controller_offset = mt7622_tc_offset, > .bank_data = { > { > .num_sensors = 1, > @@ -523,19 +547,23 @@ static int mtk_read_temp(void *data, int *temperature) > }; > > static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > - u32 apmixed_phys_base, u32 auxadc_phys_base) > + u32 apmixed_phys_base, u32 auxadc_phys_base, > + int ctrl_id) > { > struct mtk_thermal_bank *bank = &mt->banks[num]; > const struct mtk_thermal_data *conf = mt->conf; > int i; > > + int offset = mt->conf->controller_offset[ctrl_id]; > + void *controller_base = mt->thermal_base + offset; This void * has to be at least __iomem, right? See the report of kbuild bot, fix it and send it back. > + > bank->id = num; > bank->mt = mt; > > mtk_thermal_get_bank(bank); > > /* bus clock 66M counting unit is 12 * 15.15ns * 256 = 46.540us */ > - writel(TEMP_MONCTL1_PERIOD_UNIT(12), mt->thermal_base + TEMP_MONCTL1); > + writel(TEMP_MONCTL1_PERIOD_UNIT(12), controller_base + TEMP_MONCTL1); > > /* > * filt interval is 1 * 46.540us = 46.54us, > @@ -543,21 +571,21 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > */ > writel(TEMP_MONCTL2_FILTER_INTERVAL(1) | > TEMP_MONCTL2_SENSOR_INTERVAL(429), > - mt->thermal_base + TEMP_MONCTL2); > + controller_base + TEMP_MONCTL2); > > /* poll is set to 10u */ > writel(TEMP_AHBPOLL_ADC_POLL_INTERVAL(768), > - mt->thermal_base + TEMP_AHBPOLL); > + controller_base + TEMP_AHBPOLL); > > /* temperature sampling control, 1 sample */ > - writel(0x0, mt->thermal_base + TEMP_MSRCTL0); > + writel(0x0, controller_base + TEMP_MSRCTL0); > > /* exceed this polling time, IRQ would be inserted */ > - writel(0xffffffff, mt->thermal_base + TEMP_AHBTO); > + writel(0xffffffff, controller_base + TEMP_AHBTO); > > /* number of interrupts per event, 1 is enough */ > - writel(0x0, mt->thermal_base + TEMP_MONIDET0); > - writel(0x0, mt->thermal_base + TEMP_MONIDET1); > + writel(0x0, controller_base + TEMP_MONIDET0); > + writel(0x0, controller_base + TEMP_MONIDET1); > > /* > * The MT8173 thermal controller does not have its own ADC. Instead it > @@ -572,44 +600,44 @@ 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(conf->auxadc_channel), mt->thermal_base + TEMP_ADCMUX); > + writel(BIT(conf->auxadc_channel), controller_base + TEMP_ADCMUX); > > /* AHB address for auxadc mux selection */ > writel(auxadc_phys_base + AUXADC_CON1_CLR_V, > - mt->thermal_base + TEMP_ADCMUXADDR); > + controller_base + TEMP_ADCMUXADDR); > > /* AHB address for pnp sensor mux selection */ > writel(apmixed_phys_base + APMIXED_SYS_TS_CON1, > - mt->thermal_base + TEMP_PNPMUXADDR); > + controller_base + TEMP_PNPMUXADDR); > > /* AHB value for auxadc enable */ > - writel(BIT(conf->auxadc_channel), mt->thermal_base + TEMP_ADCEN); > + writel(BIT(conf->auxadc_channel), controller_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); > + controller_base + TEMP_ADCENADDR); > > /* AHB address for auxadc valid bit */ > writel(auxadc_phys_base + AUXADC_DATA(conf->auxadc_channel), > - mt->thermal_base + TEMP_ADCVALIDADDR); > + controller_base + TEMP_ADCVALIDADDR); > > /* AHB address for auxadc voltage output */ > writel(auxadc_phys_base + AUXADC_DATA(conf->auxadc_channel), > - mt->thermal_base + TEMP_ADCVOLTADDR); > + controller_base + TEMP_ADCVOLTADDR); > > /* read valid & voltage are at the same register */ > - writel(0x0, mt->thermal_base + TEMP_RDCTRL); > + writel(0x0, controller_base + TEMP_RDCTRL); > > /* indicate where the valid bit is */ > writel(TEMP_ADCVALIDMASK_VALID_HIGH | TEMP_ADCVALIDMASK_VALID_POS(12), > - mt->thermal_base + TEMP_ADCVALIDMASK); > + controller_base + TEMP_ADCVALIDMASK); > > /* no shift */ > - writel(0x0, mt->thermal_base + TEMP_ADCVOLTAGESHIFT); > + writel(0x0, controller_base + TEMP_ADCVOLTAGESHIFT); > > /* enable auxadc mux write transaction */ > writel(TEMP_ADCWRITECTRL_ADC_MUX_WRITE, > - mt->thermal_base + TEMP_ADCWRITECTRL); > + controller_base + TEMP_ADCWRITECTRL); > > for (i = 0; i < conf->bank_data[num].num_sensors; i++) > writel(conf->sensor_mux_values[conf->bank_data[num].sensors[i]], > @@ -617,11 +645,11 @@ static void mtk_thermal_init_bank(struct mtk_thermal *mt, int num, > conf->adcpnp[conf->bank_data[num].sensors[i]]); > > writel((1 << conf->bank_data[num].num_sensors) - 1, > - mt->thermal_base + TEMP_MONCTL0); > + controller_base + TEMP_MONCTL0); > > writel(TEMP_ADCWRITECTRL_ADC_PNP_WRITE | > TEMP_ADCWRITECTRL_ADC_MUX_WRITE, > - mt->thermal_base + TEMP_ADCWRITECTRL); > + controller_base + TEMP_ADCWRITECTRL); > > mtk_thermal_put_bank(bank); > } > @@ -737,7 +765,7 @@ static int mtk_thermal_get_calibration_data(struct device *dev, > > static int mtk_thermal_probe(struct platform_device *pdev) > { > - int ret, i; > + int ret, i, ctrl_id; > struct device_node *auxadc, *apmixedsys, *np = pdev->dev.of_node; > struct mtk_thermal *mt; > struct resource *res; > @@ -817,9 +845,10 @@ static int mtk_thermal_probe(struct platform_device *pdev) > goto err_disable_clk_auxadc; > } > > - for (i = 0; i < mt->conf->num_banks; i++) > - mtk_thermal_init_bank(mt, i, apmixed_phys_base, > - auxadc_phys_base); > + for (ctrl_id = 0; ctrl_id < mt->conf->num_controller ; ctrl_id++) > + for (i = 0; i < mt->conf->num_banks; i++) > + mtk_thermal_init_bank(mt, i, apmixed_phys_base, > + auxadc_phys_base, ctrl_id); > > platform_set_drvdata(pdev, mt); > > -- > 1.9.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply index Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-02-01 7:38 [PATCH 0/7] Add Mediatek thermal dirver for mt8183 michael.kao 2019-02-01 7:38 ` [PATCH 1/7] thermal: mediatek: fix register index error michael.kao 2019-02-04 17:24 ` Matthias Brugger 2019-02-12 8:20 ` Michael Kao 2019-02-01 7:38 ` [PATCH 2/7] thermal: mediatek: add common index of vts settings michael.kao 2019-02-01 7:38 ` [PATCH 3/7] thermal: mediatek: add calibration item michael.kao 2019-02-04 17:31 ` Matthias Brugger 2019-02-06 0:48 ` Eduardo Valentin 2019-02-01 7:38 ` [PATCH 4/7] thermal: mediatek: add thermal controller offset michael.kao 2019-02-06 0:53 ` Eduardo Valentin [this message] 2019-02-12 9:55 ` Michael Kao 2019-02-01 7:38 ` [PATCH 5/7] thermal: mediatek: add flag for bank selection michael.kao 2019-02-01 7:38 ` [PATCH 6/7] dt-bindings: thermal: add binding document for mt8183 thermal controller michael.kao 2019-02-01 7:38 ` [PATCH 7/7] thermal: mediatek: add support for MT8183 michael.kao
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190206005300.GD19687@localhost.localdomain \ --to=edubezval@gmail.com \ --cc=daniel.lezcano@linaro.org \ --cc=devicetree@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mediatek@lists.infradead.org \ --cc=linux-pm@vger.kernel.org \ --cc=mark.rutland@arm.com \ --cc=matthias.bgg@gmail.com \ --cc=michael.kao@mediatek.com \ --cc=robh+dt@kernel.org \ --cc=rui.zhang@intel.com \ --cc=srv_heupstream@mediatek.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
Linux-ARM-Kernel Archive on lore.kernel.org Archives are clonable: git clone --mirror https://lore.kernel.org/linux-arm-kernel/0 linux-arm-kernel/git/0.git git clone --mirror https://lore.kernel.org/linux-arm-kernel/1 linux-arm-kernel/git/1.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 linux-arm-kernel linux-arm-kernel/ https://lore.kernel.org/linux-arm-kernel \ linux-arm-kernel@lists.infradead.org public-inbox-index linux-arm-kernel Example config snippet for mirrors Newsgroup available over NNTP: nntp://nntp.lore.kernel.org/org.infradead.lists.linux-arm-kernel AGPL code for this site: git clone https://public-inbox.org/public-inbox.git