Commit a0ed1411 authored by Christian Marangi's avatar Christian Marangi Committed by Daniel Lezcano
Browse files

thermal/drivers/tsens: Convert msm8960 to reg_field 



Convert msm9860 driver to reg_field to use the init_common
function.

Signed-off-by: default avatarAnsuel Smith <ansuelsmth@gmail.com>
Acked-by: default avatarThara Gopinath <thara.gopinath@linaro.org>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210420183343.2272-3-ansuelsmth@gmail.com
parent 9d51769b

drivers/thermal/qcom/tsens-8960.c

+71 −2
Original line number Diff line number Diff line
@@ -51,11 +51,22 @@ 
#define MIN_LIMIT_TH		0x0

#define MAX_LIMIT_TH		0xff



#define S0_STATUS_ADDR		0x3628

#define INT_STATUS_ADDR		0x363c

#define TRDY_MASK		BIT(7)

#define TIMEOUT_US		100



#define S0_STATUS_OFF		0x3628

#define S1_STATUS_OFF		0x362c

#define S2_STATUS_OFF		0x3630

#define S3_STATUS_OFF		0x3634

#define S4_STATUS_OFF		0x3638

#define S5_STATUS_OFF		0x3664  /* Sensors 5-10 found on apq8064/msm8960 */

#define S6_STATUS_OFF		0x3668

#define S7_STATUS_OFF		0x366c

#define S8_STATUS_OFF		0x3670

#define S9_STATUS_OFF		0x3674

#define S10_STATUS_OFF		0x3678



static int suspend_8960(struct tsens_priv *priv)

{

	int ret;
@@ -179,7 +190,7 @@ static int init_8960(struct tsens_priv *priv) 
	 */

	for (i = 0; i < priv->num_sensors; i++) {

		if (i >= 5)

			priv->sensor[i].status = S0_STATUS_ADDR + 40;

			priv->sensor[i].status = S0_STATUS_OFF + 40;

		priv->sensor[i].status += i * 4;

	}
@@ -269,6 +280,63 @@ static int get_temp_8960(const struct tsens_sensor *s, int *temp) 
	return -ETIMEDOUT;

}



static const struct reg_field tsens_8960_regfields[MAX_REGFIELDS] = {

	/* ----- SROT ------ */

	/* No VERSION information */



	/* CNTL */

	[TSENS_EN]     = REG_FIELD(CNTL_ADDR,  0, 0),

	[TSENS_SW_RST] = REG_FIELD(CNTL_ADDR,  1, 1),

	/* 8960 has 5 sensors, 8660 has 11, we only handle 5 */

	[SENSOR_EN]    = REG_FIELD(CNTL_ADDR,  3, 7),



	/* ----- TM ------ */

	/* INTERRUPT ENABLE */

	/* NO INTERRUPT ENABLE */



	/* Single UPPER/LOWER TEMPERATURE THRESHOLD for all sensors */

	[LOW_THRESH_0]   = REG_FIELD(THRESHOLD_ADDR,  0,  7),

	[UP_THRESH_0]    = REG_FIELD(THRESHOLD_ADDR,  8, 15),

	/* MIN_THRESH_0 and MAX_THRESH_0 are not present in the regfield

	 * Recycle CRIT_THRESH_0 and 1 to set the required regs to hardcoded temp

	 * MIN_THRESH_0 -> CRIT_THRESH_1

	 * MAX_THRESH_0 -> CRIT_THRESH_0

	 */

	[CRIT_THRESH_1]   = REG_FIELD(THRESHOLD_ADDR, 16, 23),

	[CRIT_THRESH_0]   = REG_FIELD(THRESHOLD_ADDR, 24, 31),



	/* UPPER/LOWER INTERRUPT [CLEAR/STATUS] */

	/* 1 == clear, 0 == normal operation */

	[LOW_INT_CLEAR_0]   = REG_FIELD(CNTL_ADDR,  9,  9),

	[UP_INT_CLEAR_0]    = REG_FIELD(CNTL_ADDR, 10, 10),



	/* NO CRITICAL INTERRUPT SUPPORT on 8960 */



	/* Sn_STATUS */

	[LAST_TEMP_0]  = REG_FIELD(S0_STATUS_OFF,  0,  7),

	[LAST_TEMP_1]  = REG_FIELD(S1_STATUS_OFF,  0,  7),

	[LAST_TEMP_2]  = REG_FIELD(S2_STATUS_OFF,  0,  7),

	[LAST_TEMP_3]  = REG_FIELD(S3_STATUS_OFF,  0,  7),

	[LAST_TEMP_4]  = REG_FIELD(S4_STATUS_OFF,  0,  7),

	[LAST_TEMP_5]  = REG_FIELD(S5_STATUS_OFF,  0,  7),

	[LAST_TEMP_6]  = REG_FIELD(S6_STATUS_OFF,  0,  7),

	[LAST_TEMP_7]  = REG_FIELD(S7_STATUS_OFF,  0,  7),

	[LAST_TEMP_8]  = REG_FIELD(S8_STATUS_OFF,  0,  7),

	[LAST_TEMP_9]  = REG_FIELD(S9_STATUS_OFF,  0,  7),

	[LAST_TEMP_10] = REG_FIELD(S10_STATUS_OFF, 0,  7),



	/* No VALID field on 8960 */

	/* TSENS_INT_STATUS bits: 1 == threshold violated */

	[MIN_STATUS_0] = REG_FIELD(INT_STATUS_ADDR, 0, 0),

	[LOWER_STATUS_0] = REG_FIELD(INT_STATUS_ADDR, 1, 1),

	[UPPER_STATUS_0] = REG_FIELD(INT_STATUS_ADDR, 2, 2),

	/* No CRITICAL field on 8960 */

	[MAX_STATUS_0] = REG_FIELD(INT_STATUS_ADDR, 3, 3),



	/* TRDY: 1=ready, 0=in progress */

	[TRDY] = REG_FIELD(INT_STATUS_ADDR, 7, 7),

};



static const struct tsens_ops ops_8960 = {

	.init		= init_8960,

	.calibrate	= calibrate_8960,
@@ -282,4 +350,5 @@ static const struct tsens_ops ops_8960 = { 
struct tsens_plat_data data_8960 = {

	.num_sensors	= 11,

	.ops		= &ops_8960,

	.fields		= tsens_8960_regfields,

};