From: "Alice Guo (OSS)" <alice.guo@oss.nxp.com>
To: "Alice Guo (OSS)" <alice.guo@oss.nxp.com>,
"rafael@kernel.org" <rafael@kernel.org>,
"daniel.lezcano@linaro.org" <daniel.lezcano@linaro.org>,
"amitk@kernel.org" <amitk@kernel.org>,
"rui.zhang@intel.com" <rui.zhang@intel.com>,
"robh+dt@kernel.org" <robh+dt@kernel.org>,
"krzysztof.kozlowski+dt@linaro.org"
<krzysztof.kozlowski+dt@linaro.org>,
"shawnguo@kernel.org" <shawnguo@kernel.org>,
"s.hauer@pengutronix.de" <s.hauer@pengutronix.de>,
"festevam@gmail.com" <festevam@gmail.com>
Cc: "linux-pm@vger.kernel.org" <linux-pm@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
dl-linux-imx <linux-imx@nxp.com>
Subject: RE: [PATCH v1 2/4] thermal: qoriq: add i.MX93 TMU support
Date: Tue, 31 Jan 2023 06:04:29 +0000 [thread overview]
Message-ID: <AM6PR04MB60536BE542CDF7E791157002E2D09@AM6PR04MB6053.eurprd04.prod.outlook.com> (raw)
In-Reply-To: <20230105101748.6714-3-alice.guo@oss.nxp.com>
Kindly ping...
Best Regards,
Alice Guo
> -----Original Message-----
> From: linux-arm-kernel <linux-arm-kernel-bounces@lists.infradead.org> On
> Behalf Of Alice Guo (OSS)
> Sent: Thursday, January 5, 2023 6:18 PM
> To: rafael@kernel.org; daniel.lezcano@linaro.org; amitk@kernel.org;
> rui.zhang@intel.com; robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org;
> shawnguo@kernel.org; s.hauer@pengutronix.de; festevam@gmail.com
> Cc: linux-pm@vger.kernel.org; linux-kernel@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org; devicetree@vger.kernel.org; dl-linux-imx
> <linux-imx@nxp.com>
> Subject: [PATCH v1 2/4] thermal: qoriq: add i.MX93 TMU support
>
> From: Alice Guo <alice.guo@nxp.com>
>
> The procedure to program the calibration table of i.MX93 TMU:
> 1. disable monitoring mode
> 2. configure TCMCFG
> 3. write TTCFGR with TTCFGR[CAL_PT] = n
> 4. write TSCFGR with the sensor value of the calibration point n 5. write
> TTRCRn associated with the calibration point n Need to repeat steps 3—5 for all
> calibration points from the calibration table provided by the TMU device node.
>
> When TRITSR[V] = 1 and TRITSR[TP5] = 1, need to add 0.5K to TRITSR[TEMP].
>
> IPBRR0s of lx2160ardb, lx2162aqds and i.MX93 have the same value
> 0x01900201 so that use the compatible to determine whether the current
> TMU belongs to i.MX93 or not.
>
> Signed-off-by: Alice Guo <alice.guo@nxp.com>
> Reviewed-by: Jacky Bai <ping.bai@nxp.com>
> Reviewed-by: Ye Li <ye.li@nxp.com>
> Acked-by: Jason Liu <jason.hui.liu@nxp.com>
> ---
> drivers/thermal/qoriq_thermal.c | 56
> ++++++++++++++++++++++++++++++---
> 1 file changed, 52 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
> index d111e218f362..18030bd68687 100644
> --- a/drivers/thermal/qoriq_thermal.c
> +++ b/drivers/thermal/qoriq_thermal.c
> @@ -24,9 +24,11 @@
> #define TMTMIR_DEFAULT 0x0000000f
> #define TIER_DISABLE 0x0
> #define TEUMR0_V2 0x51009c00
> +#define TEUMR0_V21 0x55010c00
> #define TMSARA_V2 0xe
> #define TMU_VER1 0x1
> #define TMU_VER2 0x2
> +#define TMU_VER93 0x3
>
> #define REGS_TMR 0x000 /* Mode Register */
> #define TMR_DISABLE 0x0
> @@ -52,6 +54,7 @@
> * Site Register
> */
> #define TRITSR_V BIT(31)
> +#define TRITSR_TP5 BIT(9)
> #define REGS_V2_TMSAR(n) (0x304 + 16 * (n)) /* TMU monitoring
> * site adjustment register
> */
> @@ -114,10 +117,16 @@ static int tmu_get_temp(struct
> thermal_zone_device *tz, int *temp)
> 10 * USEC_PER_MSEC))
> return -ENODATA;
>
> - if (qdata->ver == TMU_VER1)
> + if (qdata->ver == TMU_VER1) {
> *temp = (val & GENMASK(7, 0)) * MILLIDEGREE_PER_DEGREE;
> - else
> + } else if (qdata->ver == TMU_VER93) {
> + if (val & TRITSR_TP5)
> + *temp = milli_kelvin_to_millicelsius((val & GENMASK(8, 0)) *
> MILLIDEGREE_PER_DEGREE + 500);
> + else
> + *temp = kelvin_to_millicelsius(val & GENMASK(8, 0));
> + } else {
> *temp = kelvin_to_millicelsius(val & GENMASK(8, 0));
> + }
>
> return 0;
> }
> @@ -207,6 +216,33 @@ static int qoriq_tmu_calibration(struct device *dev,
> return 0;
> }
>
> +static int imx93_tmu_calibration(struct device *dev,
> + struct qoriq_tmu_data *data)
> +{
> + const u32 *calibration = NULL;
> + u32 cal_pt = 0;
> + u32 val = 0;
> + unsigned int len = 0;
> + unsigned int i = 0;
> +
> + calibration = of_get_property(dev->of_node, "fsl,tmu-calibration", &len);
> + if (calibration == NULL || len / 8 > 16 || len % 8) {
> + dev_err(dev, "invalid tmu calibration\n");
> + return -ENODEV;
> + }
> +
> + for (i = 0; i < len; i += 0x8, calibration += 2) {
> + cal_pt = i / 8;
> + regmap_write(data->regmap, REGS_TTCFGR, cal_pt);
> + val = of_read_number(calibration, 1);
> + regmap_write(data->regmap, REGS_TSCFGR, val);
> + val = of_read_number(calibration + 1, 1);
> + regmap_write(data->regmap, REGS_TTRnCR(cal_pt), val);
> + }
> +
> + return 0;
> +}
> +
> static void qoriq_tmu_init_device(struct qoriq_tmu_data *data) {
> int i;
> @@ -218,6 +254,11 @@ static void qoriq_tmu_init_device(struct
> qoriq_tmu_data *data)
>
> if (data->ver == TMU_VER1) {
> regmap_write(data->regmap, REGS_TMTMIR, TMTMIR_DEFAULT);
> + } else if (data->ver == TMU_VER93) {
> + regmap_write(data->regmap, REGS_V2_TMTMIR,
> TMTMIR_DEFAULT);
> + regmap_write(data->regmap, REGS_V2_TEUMR(0), TEUMR0_V21);
> + for (i = 0; i < SITES_MAX; i++)
> + regmap_write(data->regmap, REGS_V2_TMSAR(i), TMSARA_V2);
> } else {
> regmap_write(data->regmap, REGS_V2_TMTMIR,
> TMTMIR_DEFAULT);
> regmap_write(data->regmap, REGS_V2_TEUMR(0), TEUMR0_V2);
> @@ -231,7 +272,7 @@ static void qoriq_tmu_init_device(struct
> qoriq_tmu_data *data)
>
> static const struct regmap_range qoriq_yes_ranges[] = {
> regmap_reg_range(REGS_TMR, REGS_TSCFGR),
> - regmap_reg_range(REGS_TTRnCR(0), REGS_TTRnCR(3)),
> + regmap_reg_range(REGS_TTRnCR(0), REGS_TTRnCR(15)),
> regmap_reg_range(REGS_V2_TEUMR(0), REGS_V2_TEUMR(2)),
> regmap_reg_range(REGS_V2_TMSAR(0), REGS_V2_TMSAR(15)),
> regmap_reg_range(REGS_IPBRR(0), REGS_IPBRR(1)), @@ -319,9 +360,15
> @@ static int qoriq_tmu_probe(struct platform_device *pdev)
> }
> data->ver = (ver >> 8) & 0xff;
>
> + if (of_find_compatible_node(NULL, NULL, "fsl,imx93-tmu"))
> + data->ver = TMU_VER93;
> +
> qoriq_tmu_init_device(data); /* TMU initialization */
>
> - ret = qoriq_tmu_calibration(dev, data); /* TMU calibration */
> + if (data->ver == TMU_VER93)
> + ret = imx93_tmu_calibration(dev, data);
> + else
> + ret = qoriq_tmu_calibration(dev, data); /* TMU calibration */
> if (ret < 0)
> return ret;
>
> @@ -369,6 +416,7 @@ static SIMPLE_DEV_PM_OPS(qoriq_tmu_pm_ops,
> static const struct of_device_id qoriq_tmu_match[] = {
> { .compatible = "fsl,qoriq-tmu", },
> { .compatible = "fsl,imx8mq-tmu", },
> + { .compatible = "fsl,imx93-tmu", },
> {},
> };
> MODULE_DEVICE_TABLE(of, qoriq_tmu_match);
> --
> 2.17.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
WARNING: multiple messages have this Message-ID (diff)
From: "Alice Guo (OSS)" <alice.guo@oss.nxp.com>
To: "Alice Guo (OSS)" <alice.guo@oss.nxp.com>,
"rafael@kernel.org" <rafael@kernel.org>,
"daniel.lezcano@linaro.org" <daniel.lezcano@linaro.org>,
"amitk@kernel.org" <amitk@kernel.org>,
"rui.zhang@intel.com" <rui.zhang@intel.com>,
"robh+dt@kernel.org" <robh+dt@kernel.org>,
"krzysztof.kozlowski+dt@linaro.org"
<krzysztof.kozlowski+dt@linaro.org>,
"shawnguo@kernel.org" <shawnguo@kernel.org>,
"s.hauer@pengutronix.de" <s.hauer@pengutronix.de>,
"festevam@gmail.com" <festevam@gmail.com>
Cc: "linux-pm@vger.kernel.org" <linux-pm@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>,
dl-linux-imx <linux-imx@nxp.com>
Subject: RE: [PATCH v1 2/4] thermal: qoriq: add i.MX93 TMU support
Date: Tue, 31 Jan 2023 06:04:29 +0000 [thread overview]
Message-ID: <AM6PR04MB60536BE542CDF7E791157002E2D09@AM6PR04MB6053.eurprd04.prod.outlook.com> (raw)
In-Reply-To: <20230105101748.6714-3-alice.guo@oss.nxp.com>
Kindly ping...
Best Regards,
Alice Guo
> -----Original Message-----
> From: linux-arm-kernel <linux-arm-kernel-bounces@lists.infradead.org> On
> Behalf Of Alice Guo (OSS)
> Sent: Thursday, January 5, 2023 6:18 PM
> To: rafael@kernel.org; daniel.lezcano@linaro.org; amitk@kernel.org;
> rui.zhang@intel.com; robh+dt@kernel.org; krzysztof.kozlowski+dt@linaro.org;
> shawnguo@kernel.org; s.hauer@pengutronix.de; festevam@gmail.com
> Cc: linux-pm@vger.kernel.org; linux-kernel@vger.kernel.org;
> linux-arm-kernel@lists.infradead.org; devicetree@vger.kernel.org; dl-linux-imx
> <linux-imx@nxp.com>
> Subject: [PATCH v1 2/4] thermal: qoriq: add i.MX93 TMU support
>
> From: Alice Guo <alice.guo@nxp.com>
>
> The procedure to program the calibration table of i.MX93 TMU:
> 1. disable monitoring mode
> 2. configure TCMCFG
> 3. write TTCFGR with TTCFGR[CAL_PT] = n
> 4. write TSCFGR with the sensor value of the calibration point n 5. write
> TTRCRn associated with the calibration point n Need to repeat steps 3—5 for all
> calibration points from the calibration table provided by the TMU device node.
>
> When TRITSR[V] = 1 and TRITSR[TP5] = 1, need to add 0.5K to TRITSR[TEMP].
>
> IPBRR0s of lx2160ardb, lx2162aqds and i.MX93 have the same value
> 0x01900201 so that use the compatible to determine whether the current
> TMU belongs to i.MX93 or not.
>
> Signed-off-by: Alice Guo <alice.guo@nxp.com>
> Reviewed-by: Jacky Bai <ping.bai@nxp.com>
> Reviewed-by: Ye Li <ye.li@nxp.com>
> Acked-by: Jason Liu <jason.hui.liu@nxp.com>
> ---
> drivers/thermal/qoriq_thermal.c | 56
> ++++++++++++++++++++++++++++++---
> 1 file changed, 52 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
> index d111e218f362..18030bd68687 100644
> --- a/drivers/thermal/qoriq_thermal.c
> +++ b/drivers/thermal/qoriq_thermal.c
> @@ -24,9 +24,11 @@
> #define TMTMIR_DEFAULT 0x0000000f
> #define TIER_DISABLE 0x0
> #define TEUMR0_V2 0x51009c00
> +#define TEUMR0_V21 0x55010c00
> #define TMSARA_V2 0xe
> #define TMU_VER1 0x1
> #define TMU_VER2 0x2
> +#define TMU_VER93 0x3
>
> #define REGS_TMR 0x000 /* Mode Register */
> #define TMR_DISABLE 0x0
> @@ -52,6 +54,7 @@
> * Site Register
> */
> #define TRITSR_V BIT(31)
> +#define TRITSR_TP5 BIT(9)
> #define REGS_V2_TMSAR(n) (0x304 + 16 * (n)) /* TMU monitoring
> * site adjustment register
> */
> @@ -114,10 +117,16 @@ static int tmu_get_temp(struct
> thermal_zone_device *tz, int *temp)
> 10 * USEC_PER_MSEC))
> return -ENODATA;
>
> - if (qdata->ver == TMU_VER1)
> + if (qdata->ver == TMU_VER1) {
> *temp = (val & GENMASK(7, 0)) * MILLIDEGREE_PER_DEGREE;
> - else
> + } else if (qdata->ver == TMU_VER93) {
> + if (val & TRITSR_TP5)
> + *temp = milli_kelvin_to_millicelsius((val & GENMASK(8, 0)) *
> MILLIDEGREE_PER_DEGREE + 500);
> + else
> + *temp = kelvin_to_millicelsius(val & GENMASK(8, 0));
> + } else {
> *temp = kelvin_to_millicelsius(val & GENMASK(8, 0));
> + }
>
> return 0;
> }
> @@ -207,6 +216,33 @@ static int qoriq_tmu_calibration(struct device *dev,
> return 0;
> }
>
> +static int imx93_tmu_calibration(struct device *dev,
> + struct qoriq_tmu_data *data)
> +{
> + const u32 *calibration = NULL;
> + u32 cal_pt = 0;
> + u32 val = 0;
> + unsigned int len = 0;
> + unsigned int i = 0;
> +
> + calibration = of_get_property(dev->of_node, "fsl,tmu-calibration", &len);
> + if (calibration == NULL || len / 8 > 16 || len % 8) {
> + dev_err(dev, "invalid tmu calibration\n");
> + return -ENODEV;
> + }
> +
> + for (i = 0; i < len; i += 0x8, calibration += 2) {
> + cal_pt = i / 8;
> + regmap_write(data->regmap, REGS_TTCFGR, cal_pt);
> + val = of_read_number(calibration, 1);
> + regmap_write(data->regmap, REGS_TSCFGR, val);
> + val = of_read_number(calibration + 1, 1);
> + regmap_write(data->regmap, REGS_TTRnCR(cal_pt), val);
> + }
> +
> + return 0;
> +}
> +
> static void qoriq_tmu_init_device(struct qoriq_tmu_data *data) {
> int i;
> @@ -218,6 +254,11 @@ static void qoriq_tmu_init_device(struct
> qoriq_tmu_data *data)
>
> if (data->ver == TMU_VER1) {
> regmap_write(data->regmap, REGS_TMTMIR, TMTMIR_DEFAULT);
> + } else if (data->ver == TMU_VER93) {
> + regmap_write(data->regmap, REGS_V2_TMTMIR,
> TMTMIR_DEFAULT);
> + regmap_write(data->regmap, REGS_V2_TEUMR(0), TEUMR0_V21);
> + for (i = 0; i < SITES_MAX; i++)
> + regmap_write(data->regmap, REGS_V2_TMSAR(i), TMSARA_V2);
> } else {
> regmap_write(data->regmap, REGS_V2_TMTMIR,
> TMTMIR_DEFAULT);
> regmap_write(data->regmap, REGS_V2_TEUMR(0), TEUMR0_V2);
> @@ -231,7 +272,7 @@ static void qoriq_tmu_init_device(struct
> qoriq_tmu_data *data)
>
> static const struct regmap_range qoriq_yes_ranges[] = {
> regmap_reg_range(REGS_TMR, REGS_TSCFGR),
> - regmap_reg_range(REGS_TTRnCR(0), REGS_TTRnCR(3)),
> + regmap_reg_range(REGS_TTRnCR(0), REGS_TTRnCR(15)),
> regmap_reg_range(REGS_V2_TEUMR(0), REGS_V2_TEUMR(2)),
> regmap_reg_range(REGS_V2_TMSAR(0), REGS_V2_TMSAR(15)),
> regmap_reg_range(REGS_IPBRR(0), REGS_IPBRR(1)), @@ -319,9 +360,15
> @@ static int qoriq_tmu_probe(struct platform_device *pdev)
> }
> data->ver = (ver >> 8) & 0xff;
>
> + if (of_find_compatible_node(NULL, NULL, "fsl,imx93-tmu"))
> + data->ver = TMU_VER93;
> +
> qoriq_tmu_init_device(data); /* TMU initialization */
>
> - ret = qoriq_tmu_calibration(dev, data); /* TMU calibration */
> + if (data->ver == TMU_VER93)
> + ret = imx93_tmu_calibration(dev, data);
> + else
> + ret = qoriq_tmu_calibration(dev, data); /* TMU calibration */
> if (ret < 0)
> return ret;
>
> @@ -369,6 +416,7 @@ static SIMPLE_DEV_PM_OPS(qoriq_tmu_pm_ops,
> static const struct of_device_id qoriq_tmu_match[] = {
> { .compatible = "fsl,qoriq-tmu", },
> { .compatible = "fsl,imx8mq-tmu", },
> + { .compatible = "fsl,imx93-tmu", },
> {},
> };
> MODULE_DEVICE_TABLE(of, qoriq_tmu_match);
> --
> 2.17.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-01-31 6:04 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-05 10:17 [PATCH v1 0/4] add i.MX93 TMU support Alice Guo (OSS)
2023-01-05 10:17 ` Alice Guo (OSS)
2023-01-05 10:17 ` [PATCH v1 1/4] dt-bindings: thermal: qoriq-thermal: Add compatible for i.MX93 Alice Guo (OSS)
2023-01-05 10:17 ` Alice Guo (OSS)
2023-01-06 12:53 ` Krzysztof Kozlowski
2023-01-06 12:53 ` Krzysztof Kozlowski
2023-01-05 10:17 ` [PATCH v1 2/4] thermal: qoriq: add i.MX93 TMU support Alice Guo (OSS)
2023-01-05 10:17 ` Alice Guo (OSS)
2023-01-31 6:04 ` Alice Guo (OSS) [this message]
2023-01-31 6:04 ` Alice Guo (OSS)
2023-02-10 13:48 ` Daniel Lezcano
2023-02-10 13:48 ` Daniel Lezcano
2023-03-10 8:20 ` Alexander Stein
2023-03-10 8:20 ` Alexander Stein
2023-01-05 10:17 ` [PATCH v1 3/4] qoriq_thermal: No need to program site adjustment register Alice Guo (OSS)
2023-01-05 10:17 ` Alice Guo (OSS)
2023-01-05 10:17 ` [PATCH v1 4/4] arm64: dts: imx93: Add CPU thermal zone Alice Guo (OSS)
2023-01-05 10:17 ` Alice Guo (OSS)
2023-01-06 12:53 ` Krzysztof Kozlowski
2023-01-06 12:53 ` Krzysztof Kozlowski
2023-03-10 8:20 ` Alexander Stein
2023-03-10 8:20 ` Alexander Stein
2023-03-10 9:09 ` [PATCH v1 0/4] add i.MX93 TMU support Alexander Stein
2023-03-10 9:09 ` Alexander Stein
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=AM6PR04MB60536BE542CDF7E791157002E2D09@AM6PR04MB6053.eurprd04.prod.outlook.com \
--to=alice.guo@oss.nxp.com \
--cc=amitk@kernel.org \
--cc=daniel.lezcano@linaro.org \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=robh+dt@kernel.org \
--cc=rui.zhang@intel.com \
--cc=s.hauer@pengutronix.de \
--cc=shawnguo@kernel.org \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.