1 files changed, 38 insertions, 0 deletions

diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c
index 6dc7fc516abf..bda1ca199abd 100644
--- a/drivers/thermal/rockchip_thermal.c
+++ b/drivers/thermal/rockchip_thermal.c
@@ -225,11 +225,15 @@ struct rockchip_thermal_data {
 #define GRF_TSADC_TESTBIT_L                     0x0e648
 #define GRF_TSADC_TESTBIT_H                     0x0e64c
 
+#define PX30_GRF_SOC_CON2                       0x0408
+
 #define GRF_SARADC_TESTBIT_ON                   (0x10001 << 2)
 #define GRF_TSADC_TESTBIT_H_ON                  (0x10001 << 2)
 #define GRF_TSADC_VCM_EN_L                      (0x10001 << 7)
 #define GRF_TSADC_VCM_EN_H                      (0x10001 << 7)
 
+#define GRF_CON_TSADC_CH_INV                    (0x10001 << 1)
+
 /**
  * struct tsadc_table - code to temperature conversion table
  * @code: the value of adc channel
@@ -692,6 +696,13 @@ static void rk_tsadcv3_initialize(struct regmap *grf, void __iomem *regs,
                                regs + TSADCV2_AUTO_CON);
 }
 
+static void rk_tsadcv4_initialize(struct regmap *grf, void __iomem *regs,
+                                  enum tshut_polarity tshut_polarity)
+{
+        rk_tsadcv2_initialize(grf, regs, tshut_polarity);
+        regmap_write(grf, PX30_GRF_SOC_CON2, GRF_CON_TSADC_CH_INV);
+}
+
 static void rk_tsadcv2_irq_ack(void __iomem *regs)
 {
         u32 val;
@@ -821,6 +832,30 @@ static void rk_tsadcv2_tshut_mode(int chn, void __iomem *regs,
         writel_relaxed(val, regs + TSADCV2_INT_EN);
 }
 
+static const struct rockchip_tsadc_chip px30_tsadc_data = {
+        .chn_id[SENSOR_CPU] = 0, /* cpu sensor is channel 0 */
+        .chn_id[SENSOR_GPU] = 1, /* gpu sensor is channel 1 */
+        .chn_num = 2, /* 2 channels for tsadc */
+
+        .tshut_mode = TSHUT_MODE_CRU, /* default TSHUT via CRU */
+        .tshut_temp = 95000,
+
+        .initialize = rk_tsadcv4_initialize,
+        .irq_ack = rk_tsadcv3_irq_ack,
+        .control = rk_tsadcv3_control,
+        .get_temp = rk_tsadcv2_get_temp,
+        .set_alarm_temp = rk_tsadcv2_alarm_temp,
+        .set_tshut_temp = rk_tsadcv2_tshut_temp,
+        .set_tshut_mode = rk_tsadcv2_tshut_mode,
+
+        .table = {
+                .id = rk3328_code_table,
+                .length = ARRAY_SIZE(rk3328_code_table),
+                .data_mask = TSADCV2_DATA_MASK,
+                .mode = ADC_INCREMENT,
+        },
+};
+
 static const struct rockchip_tsadc_chip rv1108_tsadc_data = {
         .chn_id[SENSOR_CPU] = 0, /* cpu sensor is channel 0 */
         .chn_num = 1, /* one channel for tsadc */
@@ -993,6 +1028,9 @@ static const struct rockchip_tsadc_chip rk3399_tsadc_data = {
 };
 
 static const struct of_device_id of_rockchip_thermal_match[] = {
+        {       .compatible = "rockchip,px30-tsadc",
+                .data = (void *)&px30_tsadc_data,
+        },
         {
                 .compatible = "rockchip,rv1108-tsadc",
                 .data = (void *)&rv1108_tsadc_data,