target/linux/ipq806x/patches-5.10/104-3-drivers-thermal-tsens-Convert-msm8960-to-reg_field.patch

   1 From 6bac2e2fa36c2d7c304768a689d8b73155b90aa2 Mon Sep 17 00:00:00 2001
   2 From: Ansuel Smith <ansuelsmth@gmail.com>
   3 Date: Wed, 25 Nov 2020 17:15:51 +0100
   4 Subject: [PATCH 03/10] drivers: thermal: tsens: Convert msm8960 to reg_field
   5
   6 Convert msm9860 driver to reg_field to use the init_common
   7 function.
   8
   9 Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
  10 Acked-by: Thara Gopinath <thara.gopinath@linaro.org>
  11 ---
  12  drivers/thermal/qcom/tsens-8960.c | 80 ++++++++++++++++++++++++++++++-
  13  1 file changed, 79 insertions(+), 1 deletion(-)
  14
  15 diff --git a/drivers/thermal/qcom/tsens-8960.c b/drivers/thermal/qcom/tsens-8960.c
  16 index 2a28a5af209e..3f4fc1ffe679 100644
  17 --- a/drivers/thermal/qcom/tsens-8960.c
  18 +++ b/drivers/thermal/qcom/tsens-8960.c
  19 @@ -51,11 +51,22 @@
  20  #define MIN_LIMIT_TH           0x0
  21  #define MAX_LIMIT_TH           0xff
  22
  23 -#define S0_STATUS_ADDR         0x3628
  24  #define INT_STATUS_ADDR                0x363c
  25  #define TRDY_MASK              BIT(7)
  26  #define TIMEOUT_US             100
  27
  28 +#define S0_STATUS_OFF          0x3628
  29 +#define S1_STATUS_OFF          0x362c
  30 +#define S2_STATUS_OFF          0x3630
  31 +#define S3_STATUS_OFF          0x3634
  32 +#define S4_STATUS_OFF          0x3638
  33 +#define S5_STATUS_OFF          0x3664  /* Sensors 5-10 found on apq8064/msm8960 */
  34 +#define S6_STATUS_OFF          0x3668
  35 +#define S7_STATUS_OFF          0x366c
  36 +#define S8_STATUS_OFF          0x3670
  37 +#define S9_STATUS_OFF          0x3674
  38 +#define S10_STATUS_OFF         0x3678
  39 +
  40  static int suspend_8960(struct tsens_priv *priv)
  41  {
  42         int ret;
  43 @@ -269,6 +280,71 @@ static int get_temp_8960(const struct tsens_sensor *s, int *temp)
  44         return -ETIMEDOUT;
  45  }
  46
  47 +static struct tsens_features tsens_8960_feat = {
  48 +       .ver_major      = VER_0,
  49 +       .crit_int       = 0,
  50 +       .adc            = 1,
  51 +       .srot_split     = 0,
  52 +       .max_sensors    = 11,
  53 +};
  54 +
  55 +static const struct reg_field tsens_8960_regfields[MAX_REGFIELDS] = {
  56 +       /* ----- SROT ------ */
  57 +       /* No VERSION information */
  58 +
  59 +       /* CNTL */
  60 +       [TSENS_EN]     = REG_FIELD(CNTL_ADDR,  0, 0),
  61 +       [TSENS_SW_RST] = REG_FIELD(CNTL_ADDR,  1, 1),
  62 +       /* 8960 has 5 sensors, 8660 has 11, we only handle 5 */
  63 +       [SENSOR_EN]    = REG_FIELD(CNTL_ADDR,  3, 7),
  64 +
  65 +       /* ----- TM ------ */
  66 +       /* INTERRUPT ENABLE */
  67 +       /* NO INTERRUPT ENABLE */
  68 +
  69 +       /* Single UPPER/LOWER TEMPERATURE THRESHOLD for all sensors */
  70 +       [LOW_THRESH_0]   = REG_FIELD(THRESHOLD_ADDR,  0,  7),
  71 +       [UP_THRESH_0]    = REG_FIELD(THRESHOLD_ADDR,  8, 15),
  72 +       /* MIN_THRESH_0 and MAX_THRESH_0 are not present in the regfield
  73 +        * Recycle CRIT_THRESH_0 and 1 to set the required regs to hardcoded temp
  74 +        * MIN_THRESH_0 -> CRIT_THRESH_1
  75 +        * MAX_THRESH_0 -> CRIT_THRESH_0
  76 +        */
  77 +       [CRIT_THRESH_1]   = REG_FIELD(THRESHOLD_ADDR, 16, 23),
  78 +       [CRIT_THRESH_0]   = REG_FIELD(THRESHOLD_ADDR, 24, 31),
  79 +
  80 +       /* UPPER/LOWER INTERRUPT [CLEAR/STATUS] */
  81 +       /* 1 == clear, 0 == normal operation */
  82 +       [LOW_INT_CLEAR_0]   = REG_FIELD(CNTL_ADDR,  9,  9),
  83 +       [UP_INT_CLEAR_0]    = REG_FIELD(CNTL_ADDR, 10, 10),
  84 +
  85 +       /* NO CRITICAL INTERRUPT SUPPORT on 8960 */
  86 +
  87 +       /* Sn_STATUS */
  88 +       [LAST_TEMP_0]  = REG_FIELD(S0_STATUS_OFF,  0,  7),
  89 +       [LAST_TEMP_1]  = REG_FIELD(S1_STATUS_OFF,  0,  7),
  90 +       [LAST_TEMP_2]  = REG_FIELD(S2_STATUS_OFF,  0,  7),
  91 +       [LAST_TEMP_3]  = REG_FIELD(S3_STATUS_OFF,  0,  7),
  92 +       [LAST_TEMP_4]  = REG_FIELD(S4_STATUS_OFF,  0,  7),
  93 +       [LAST_TEMP_5]  = REG_FIELD(S5_STATUS_OFF,  0,  7),
  94 +       [LAST_TEMP_6]  = REG_FIELD(S6_STATUS_OFF,  0,  7),
  95 +       [LAST_TEMP_7]  = REG_FIELD(S7_STATUS_OFF,  0,  7),
  96 +       [LAST_TEMP_8]  = REG_FIELD(S8_STATUS_OFF,  0,  7),
  97 +       [LAST_TEMP_9]  = REG_FIELD(S9_STATUS_OFF,  0,  7),
  98 +       [LAST_TEMP_10] = REG_FIELD(S10_STATUS_OFF, 0,  7),
  99 +
 100 +       /* No VALID field on 8960 */
 101 +       /* TSENS_INT_STATUS bits: 1 == threshold violated */
 102 +       [MIN_STATUS_0] = REG_FIELD(INT_STATUS_ADDR, 0, 0),
 103 +       [LOWER_STATUS_0] = REG_FIELD(INT_STATUS_ADDR, 1, 1),
 104 +       [UPPER_STATUS_0] = REG_FIELD(INT_STATUS_ADDR, 2, 2),
 105 +       /* No CRITICAL field on 8960 */
 106 +       [MAX_STATUS_0] = REG_FIELD(INT_STATUS_ADDR, 3, 3),
 107 +
 108 +       /* TRDY: 1=ready, 0=in progress */
 109 +       [TRDY] = REG_FIELD(INT_STATUS_ADDR, 7, 7),
 110 +};
 111 +
 112  static const struct tsens_ops ops_8960 = {
 113         .init           = init_8960,
 114         .calibrate      = calibrate_8960,
 115 @@ -282,4 +358,6 @@ static const struct tsens_ops ops_8960 = {
 116  struct tsens_plat_data data_8960 = {
 117         .num_sensors    = 11,
 118         .ops            = &ops_8960,
 119 +       .feat           = &tsens_8960_feat,
 120 +       .fields         = tsens_8960_regfields,
 121  };
 122 --
 123 2.30.2
 124