[PATCH 1/2] thermal: rockchip: add RK3506 TSADC support

From: ZhuXiangyu

Date: Sat Nov 21 2026 - 01:33:48 EST


The RK3506 TSADC is based on the TSADCV13 register layout and provides
a single CPU sensor channel. Its analog front-end is enabled through
the GRF and the controller needs the TSEN clock for the sensor analog
supply.

Add the chip data, the conversion table, the initialization sequence
and a suspend callback that turns the analog front-end off while the
SoC is suspended. Also grab the optional TSEN clock so that it is not
disabled as unused.

Tested on an RK3506B EVB: the thermal zone registers successfully and
reports the on-chip temperature correctly.

Tested-by: ZhuXiangyu <1194781887@xxxxxx>
Signed-off-by: ZhuXiangyu <1194781887@xxxxxx>
---
drivers/thermal/rockchip_thermal.c | 101 +++++++++++++++++++++++++++++
1 file changed, 101 insertions(+)

diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index 5e327039..fbfd78a6 100644
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -104,6 +104,7 @@ struct rockchip_tsadc_chip {
/* Chip-wide methods */
void (*initialize)(struct regmap *grf,
void __iomem *reg, enum tshut_polarity p);
+ void (*suspend)(struct regmap *grf, void __iomem *reg);
void (*irq_ack)(void __iomem *reg);
void (*control)(void __iomem *reg, bool on);

@@ -146,6 +147,7 @@ struct rockchip_thermal_sensor {
* @sensors: array of thermal sensors
* @clk: the controller clock is divided by the exteral 24MHz
* @pclk: the advanced peripherals bus clock
+ * @tsen: the sensor analog clock, optional
* @grf: the general register file will be used to do static set by software
* @regs: the base address of tsadc controller
* @trim_base: major component of sensor trim value, in Celsius
@@ -165,6 +167,7 @@ struct rockchip_thermal_data {

struct clk *clk;
struct clk *pclk;
+ struct clk *tsen;

struct regmap *grf;
void __iomem *regs;
@@ -210,6 +213,7 @@ struct rockchip_thermal_data {
#define TSADCV2_AUTO_PERIOD_HT 0x6c
#define TSADCV3_AUTO_PERIOD 0x154
#define TSADCV3_AUTO_PERIOD_HT 0x158
+#define TSADCV9_Q_MAX 0x210

#define TSADCV2_AUTO_EN BIT(0)
#define TSADCV2_AUTO_EN_MASK BIT(16)
@@ -220,6 +224,7 @@ struct rockchip_thermal_data {
#define TSADCV2_AUTO_TSHUT_POLARITY_MASK BIT(24)

#define TSADCV3_AUTO_Q_SEL_EN BIT(1)
+#define TSADCV3_AUTO_Q_SEL_EN_MASK BIT(17)

#define TSADCV2_INT_SRC_EN(chn) BIT(chn)
#define TSADCV2_INT_SRC_EN_MASK(chn) BIT(16 + (chn))
@@ -246,6 +251,10 @@ struct rockchip_thermal_data {
#define TSADCV6_AUTO_PERIOD_TIME 5000 /* 2.5ms */
#define TSADCV6_AUTO_PERIOD_HT_TIME 5000 /* 2.5ms */

+#define TSADCV13_AUTO_PERIOD_TIME 2500 /* 2.5ms */
+#define TSADCV13_AUTO_PERIOD_HT_TIME 2500 /* 2.5ms */
+#define TSADCV13_Q_MAX_VAL 0x3ff /* 10bit 1023 */
+
#define TSADCV2_USER_INTER_PD_SOC 0x340 /* 13 clocks */
#define TSADCV5_USER_INTER_PD_SOC 0xfc0 /* 97us, at least 90us */

@@ -255,6 +264,10 @@ struct rockchip_thermal_data {

#define PX30_GRF_SOC_CON2 0x0408

+#define RK3506_GRF_TSADC_CON 0x0010
+#define RK3506_GRF_TSADC_TSEN (0x10001 << 8)
+#define RK3506_GRF_TSADC_ANA (0xff0007 << 0)
+
#define RK3568_GRF_TSADC_CON 0x0600
#define RK3568_GRF_TSADC_ANA_REG0 (0x10001 << 0)
#define RK3568_GRF_TSADC_ANA_REG1 (0x10001 << 1)
@@ -526,6 +539,17 @@ static const struct tsadc_table rk3399_code_table[] = {
{TSADCV3_DATA_MASK, 125000},
};

+static const struct tsadc_table rk3506_code_table[] = {
+ {0, -60000},
+ {362, -60000},
+ {395, -40000},
+ {503, 25000},
+ {604, 85000},
+ {672, 125000},
+ {757, 180000},
+ {TSADCV3_DATA_MASK, 180000},
+};
+
static const struct tsadc_table rk3568_code_table[] = {
{0, -40000},
{1584, -40000},
@@ -863,6 +887,40 @@ static void rk_tsadcv8_initialize(struct regmap *grf, void __iomem *regs,
regs + TSADCV2_AUTO_CON);
}

+static void rk_tsadcv13_initialize(struct regmap *grf, void __iomem *regs,
+ enum tshut_polarity tshut_polarity)
+{
+ regmap_write(grf, RK3506_GRF_TSADC_CON, RK3506_GRF_TSADC_TSEN);
+ usleep_range(10, 20);
+ regmap_write(grf, RK3506_GRF_TSADC_CON, RK3506_GRF_TSADC_ANA);
+ usleep_range(100, 200);
+
+ writel_relaxed(TSADCV13_AUTO_PERIOD_TIME, regs + TSADCV3_AUTO_PERIOD);
+ writel_relaxed(TSADCV13_AUTO_PERIOD_TIME,
+ regs + TSADCV3_AUTO_PERIOD_HT);
+ writel_relaxed(TSADCV2_HIGHT_INT_DEBOUNCE_COUNT,
+ regs + TSADCV3_HIGHT_INT_DEBOUNCE);
+ writel_relaxed(TSADCV2_HIGHT_TSHUT_DEBOUNCE_COUNT,
+ regs + TSADCV3_HIGHT_TSHUT_DEBOUNCE);
+ writel_relaxed(TSADCV13_Q_MAX_VAL, regs + TSADCV9_Q_MAX);
+ if (tshut_polarity == TSHUT_HIGH_ACTIVE)
+ writel_relaxed(TSADCV2_AUTO_TSHUT_POLARITY_HIGH |
+ TSADCV2_AUTO_TSHUT_POLARITY_MASK,
+ regs + TSADCV2_AUTO_CON);
+ else
+ writel_relaxed(TSADCV2_AUTO_TSHUT_POLARITY_MASK,
+ regs + TSADCV2_AUTO_CON);
+ writel_relaxed(TSADCV3_AUTO_Q_SEL_EN | TSADCV3_AUTO_Q_SEL_EN_MASK,
+ regs + TSADCV2_AUTO_CON);
+}
+
+static void rk3506_tsadc_suspend(struct regmap *grf, void __iomem *regs)
+{
+ /* Disable the analog front-end while the SoC is suspended. */
+ regmap_write(grf, RK3506_GRF_TSADC_CON,
+ RK3506_GRF_TSADC_TSEN & 0xffff0000);
+}
+
static void rk_tsadcv2_irq_ack(void __iomem *regs)
{
u32 val;
@@ -1280,6 +1338,29 @@ static const struct rockchip_tsadc_chip rk3399_tsadc_data = {
},
};

+static const struct rockchip_tsadc_chip rk3506_tsadc_data = {
+ .chn_offset = 0, /* cpu sensor is channel 0 */
+ .chn_num = 1, /* one channel for tsadc */
+ .grf_required = true,
+ .tshut_mode = TSHUT_MODE_CRU, /* default TSHUT via CRU */
+ .tshut_polarity = TSHUT_LOW_ACTIVE, /* default TSHUT LOW ACTIVE */
+ .tshut_temp = 95000,
+ .initialize = rk_tsadcv13_initialize,
+ .suspend = rk3506_tsadc_suspend,
+ .irq_ack = rk_tsadcv4_irq_ack,
+ .control = rk_tsadcv4_control,
+ .get_temp = rk_tsadcv4_get_temp,
+ .set_alarm_temp = rk_tsadcv3_alarm_temp,
+ .set_tshut_temp = rk_tsadcv3_tshut_temp,
+ .set_tshut_mode = rk_tsadcv4_tshut_mode,
+ .table = {
+ .id = rk3506_code_table,
+ .length = ARRAY_SIZE(rk3506_code_table),
+ .data_mask = TSADCV3_DATA_MASK,
+ .mode = ADC_INCREMENT,
+ },
+};
+
static const struct rockchip_tsadc_chip rk3568_tsadc_data = {
/* cpu, gpu */
.chn_offset = 0,
@@ -1383,6 +1464,10 @@ static const struct of_device_id of_rockchip_thermal_match[] = {
.compatible = "rockchip,rk3399-tsadc",
.data = (void *)&rk3399_tsadc_data,
},
+ {
+ .compatible = "rockchip,rk3506-tsadc",
+ .data = (void *)&rk3506_tsadc_data,
+ },
{
.compatible = "rockchip,rk3568-tsadc",
.data = (void *)&rk3568_tsadc_data,
@@ -1736,6 +1821,11 @@ static int rockchip_thermal_probe(struct platform_device *pdev)
return dev_err_probe(&pdev->dev, PTR_ERR(thermal->pclk),
"failed to get apb_pclk clock.\n");

+ thermal->tsen = devm_clk_get_optional_enabled(&pdev->dev, "tsen");
+ if (IS_ERR(thermal->tsen))
+ return dev_err_probe(&pdev->dev, PTR_ERR(thermal->tsen),
+ "failed to get tsen clock.\n");
+
rockchip_thermal_reset_controller(thermal->reset);

error = rockchip_configure_from_dt(&pdev->dev, np, thermal);
@@ -1815,6 +1905,10 @@ static int __maybe_unused rockchip_thermal_suspend(struct device *dev)

thermal->chip->control(thermal->regs, false);

+ if (thermal->chip->suspend)
+ thermal->chip->suspend(thermal->grf, thermal->regs);
+
+ clk_disable(thermal->tsen);
clk_disable(thermal->pclk);
clk_disable(thermal->clk);

@@ -1842,6 +1936,13 @@ static int __maybe_unused rockchip_thermal_resume(struct device *dev)
return error;
}

+ error = clk_enable(thermal->tsen);
+ if (error) {
+ clk_disable(thermal->pclk);
+ clk_disable(thermal->clk);
+ return error;
+ }
+
rockchip_thermal_reset_controller(thermal->reset);

tsadc->initialize(thermal->grf, thermal->regs, thermal->tshut_polarity);
--
2.47.3