Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69b628ac authored by Amit Kucheria's avatar Amit Kucheria Committed by Eduardo Valentin
Browse files

drivers: thermal: tsens: Rename variable tmdev 



tmdev seems to imply that this is a device pointer when in fact it is
just private platform data for each tsens device. Rename it to priv
improve code readability.

Signed-off-by: default avatarAmit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 24ae4472

drivers/thermal/qcom/tsens-8916.c

+8 −8
Original line number Diff line number Diff line
@@ -39,23 +39,23 @@ 
#define CAL_SEL_MASK	0xe0000000

#define CAL_SEL_SHIFT	29



static int calibrate_8916(struct tsens_priv *tmdev)

static int calibrate_8916(struct tsens_priv *priv)

{

	int base0 = 0, base1 = 0, i;

	u32 p1[5], p2[5];

	int mode = 0;

	u32 *qfprom_cdata, *qfprom_csel;



	qfprom_cdata = (u32 *)qfprom_read(tmdev->dev, "calib");

	qfprom_cdata = (u32 *)qfprom_read(priv->dev, "calib");

	if (IS_ERR(qfprom_cdata))

		return PTR_ERR(qfprom_cdata);



	qfprom_csel = (u32 *)qfprom_read(tmdev->dev, "calib_sel");

	qfprom_csel = (u32 *)qfprom_read(priv->dev, "calib_sel");

	if (IS_ERR(qfprom_csel))

		return PTR_ERR(qfprom_csel);



	mode = (qfprom_csel[0] & CAL_SEL_MASK) >> CAL_SEL_SHIFT;

	dev_dbg(tmdev->dev, "calibration mode is %d\n", mode);

	dev_dbg(priv->dev, "calibration mode is %d\n", mode);



	switch (mode) {

	case TWO_PT_CALIB:
@@ -65,7 +65,7 @@ static int calibrate_8916(struct tsens_priv *tmdev) 
		p2[2] = (qfprom_cdata[1] & S2_P2_MASK) >> S2_P2_SHIFT;

		p2[3] = (qfprom_cdata[1] & S3_P2_MASK) >> S3_P2_SHIFT;

		p2[4] = (qfprom_cdata[1] & S4_P2_MASK) >> S4_P2_SHIFT;

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

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

			p2[i] = ((base1 + p2[i]) << 3);

		/* Fall through */

	case ONE_PT_CALIB2:
@@ -75,18 +75,18 @@ static int calibrate_8916(struct tsens_priv *tmdev) 
		p1[2] = (qfprom_cdata[0] & S2_P1_MASK) >> S2_P1_SHIFT;

		p1[3] = (qfprom_cdata[1] & S3_P1_MASK) >> S3_P1_SHIFT;

		p1[4] = (qfprom_cdata[1] & S4_P1_MASK) >> S4_P1_SHIFT;

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

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

			p1[i] = (((base0) + p1[i]) << 3);

		break;

	default:

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

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

			p1[i] = 500;

			p2[i] = 780;

		}

		break;

	}



	compute_intercept_slope(tmdev, p1, p2, mode);

	compute_intercept_slope(priv, p1, p2, mode);



	return 0;

}

drivers/thermal/qcom/tsens-8960.c

+41 −41
Original line number Diff line number Diff line
@@ -56,21 +56,21 @@ 
#define TRDY_MASK		BIT(7)

#define TIMEOUT_US		100



static int suspend_8960(struct tsens_priv *tmdev)

static int suspend_8960(struct tsens_priv *priv)

{

	int ret;

	unsigned int mask;

	struct regmap *map = tmdev->tm_map;

	struct regmap *map = priv->tm_map;



	ret = regmap_read(map, THRESHOLD_ADDR, &tmdev->ctx.threshold);

	ret = regmap_read(map, THRESHOLD_ADDR, &priv->ctx.threshold);

	if (ret)

		return ret;



	ret = regmap_read(map, CNTL_ADDR, &tmdev->ctx.control);

	ret = regmap_read(map, CNTL_ADDR, &priv->ctx.control);

	if (ret)

		return ret;



	if (tmdev->num_sensors > 1)

	if (priv->num_sensors > 1)

		mask = SLP_CLK_ENA | EN;

	else

		mask = SLP_CLK_ENA_8660 | EN;
@@ -82,10 +82,10 @@ static int suspend_8960(struct tsens_priv *tmdev) 
	return 0;

}



static int resume_8960(struct tsens_priv *tmdev)

static int resume_8960(struct tsens_priv *priv)

{

	int ret;

	struct regmap *map = tmdev->tm_map;

	struct regmap *map = priv->tm_map;



	ret = regmap_update_bits(map, CNTL_ADDR, SW_RST, SW_RST);

	if (ret)
@@ -95,80 +95,80 @@ static int resume_8960(struct tsens_priv *tmdev) 
	 * Separate CONFIG restore is not needed only for 8660 as

	 * config is part of CTRL Addr and its restored as such

	 */

	if (tmdev->num_sensors > 1) {

	if (priv->num_sensors > 1) {

		ret = regmap_update_bits(map, CONFIG_ADDR, CONFIG_MASK, CONFIG);

		if (ret)

			return ret;

	}



	ret = regmap_write(map, THRESHOLD_ADDR, tmdev->ctx.threshold);

	ret = regmap_write(map, THRESHOLD_ADDR, priv->ctx.threshold);

	if (ret)

		return ret;



	ret = regmap_write(map, CNTL_ADDR, tmdev->ctx.control);

	ret = regmap_write(map, CNTL_ADDR, priv->ctx.control);

	if (ret)

		return ret;



	return 0;

}



static int enable_8960(struct tsens_priv *tmdev, int id)

static int enable_8960(struct tsens_priv *priv, int id)

{

	int ret;

	u32 reg, mask;



	ret = regmap_read(tmdev->tm_map, CNTL_ADDR, &reg);

	ret = regmap_read(priv->tm_map, CNTL_ADDR, &reg);

	if (ret)

		return ret;



	mask = BIT(id + SENSOR0_SHIFT);

	ret = regmap_write(tmdev->tm_map, CNTL_ADDR, reg | SW_RST);

	ret = regmap_write(priv->tm_map, CNTL_ADDR, reg | SW_RST);

	if (ret)

		return ret;



	if (tmdev->num_sensors > 1)

	if (priv->num_sensors > 1)

		reg |= mask | SLP_CLK_ENA | EN;

	else

		reg |= mask | SLP_CLK_ENA_8660 | EN;



	ret = regmap_write(tmdev->tm_map, CNTL_ADDR, reg);

	ret = regmap_write(priv->tm_map, CNTL_ADDR, reg);

	if (ret)

		return ret;



	return 0;

}



static void disable_8960(struct tsens_priv *tmdev)

static void disable_8960(struct tsens_priv *priv)

{

	int ret;

	u32 reg_cntl;

	u32 mask;



	mask = GENMASK(tmdev->num_sensors - 1, 0);

	mask = GENMASK(priv->num_sensors - 1, 0);

	mask <<= SENSOR0_SHIFT;

	mask |= EN;



	ret = regmap_read(tmdev->tm_map, CNTL_ADDR, &reg_cntl);

	ret = regmap_read(priv->tm_map, CNTL_ADDR, &reg_cntl);

	if (ret)

		return;



	reg_cntl &= ~mask;



	if (tmdev->num_sensors > 1)

	if (priv->num_sensors > 1)

		reg_cntl &= ~SLP_CLK_ENA;

	else

		reg_cntl &= ~SLP_CLK_ENA_8660;



	regmap_write(tmdev->tm_map, CNTL_ADDR, reg_cntl);

	regmap_write(priv->tm_map, CNTL_ADDR, reg_cntl);

}



static int init_8960(struct tsens_priv *tmdev)

static int init_8960(struct tsens_priv *priv)

{

	int ret, i;

	u32 reg_cntl;



	tmdev->tm_map = dev_get_regmap(tmdev->dev, NULL);

	if (!tmdev->tm_map)

	priv->tm_map = dev_get_regmap(priv->dev, NULL);

	if (!priv->tm_map)

		return -ENODEV;



	/*
@@ -177,21 +177,21 @@ static int init_8960(struct tsens_priv *tmdev) 
	 * but the control registers stay in the same place, i.e

	 * directly after the first 5 status registers.

	 */

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

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

		if (i >= 5)

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

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

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

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

	}



	reg_cntl = SW_RST;

	ret = regmap_update_bits(tmdev->tm_map, CNTL_ADDR, SW_RST, reg_cntl);

	ret = regmap_update_bits(priv->tm_map, CNTL_ADDR, SW_RST, reg_cntl);

	if (ret)

		return ret;



	if (tmdev->num_sensors > 1) {

	if (priv->num_sensors > 1) {

		reg_cntl |= SLP_CLK_ENA | (MEASURE_PERIOD << 18);

		reg_cntl &= ~SW_RST;

		ret = regmap_update_bits(tmdev->tm_map, CONFIG_ADDR,

		ret = regmap_update_bits(priv->tm_map, CONFIG_ADDR,

					 CONFIG_MASK, CONFIG);

	} else {

		reg_cntl |= SLP_CLK_ENA_8660 | (MEASURE_PERIOD << 16);
@@ -199,30 +199,30 @@ static int init_8960(struct tsens_priv *tmdev) 
		reg_cntl |= CONFIG_8660 << CONFIG_SHIFT_8660;

	}



	reg_cntl |= GENMASK(tmdev->num_sensors - 1, 0) << SENSOR0_SHIFT;

	ret = regmap_write(tmdev->tm_map, CNTL_ADDR, reg_cntl);

	reg_cntl |= GENMASK(priv->num_sensors - 1, 0) << SENSOR0_SHIFT;

	ret = regmap_write(priv->tm_map, CNTL_ADDR, reg_cntl);

	if (ret)

		return ret;



	reg_cntl |= EN;

	ret = regmap_write(tmdev->tm_map, CNTL_ADDR, reg_cntl);

	ret = regmap_write(priv->tm_map, CNTL_ADDR, reg_cntl);

	if (ret)

		return ret;



	return 0;

}



static int calibrate_8960(struct tsens_priv *tmdev)

static int calibrate_8960(struct tsens_priv *priv)

{

	int i;

	char *data;



	ssize_t num_read = tmdev->num_sensors;

	struct tsens_sensor *s = tmdev->sensor;

	ssize_t num_read = priv->num_sensors;

	struct tsens_sensor *s = priv->sensor;



	data = qfprom_read(tmdev->dev, "calib");

	data = qfprom_read(priv->dev, "calib");

	if (IS_ERR(data))

		data = qfprom_read(tmdev->dev, "calib_backup");

		data = qfprom_read(priv->dev, "calib_backup");

	if (IS_ERR(data))

		return PTR_ERR(data);
@@ -243,21 +243,21 @@ static inline int code_to_mdegC(u32 adc_code, const struct tsens_sensor *s) 
	return adc_code * slope + offset;

}



static int get_temp_8960(struct tsens_priv *tmdev, int id, int *temp)

static int get_temp_8960(struct tsens_priv *priv, int id, int *temp)

{

	int ret;

	u32 code, trdy;

	const struct tsens_sensor *s = &tmdev->sensor[id];

	const struct tsens_sensor *s = &priv->sensor[id];

	unsigned long timeout;



	timeout = jiffies + usecs_to_jiffies(TIMEOUT_US);

	do {

		ret = regmap_read(tmdev->tm_map, INT_STATUS_ADDR, &trdy);

		ret = regmap_read(priv->tm_map, INT_STATUS_ADDR, &trdy);

		if (ret)

			return ret;

		if (!(trdy & TRDY_MASK))

			continue;

		ret = regmap_read(tmdev->tm_map, s->status, &code);

		ret = regmap_read(priv->tm_map, s->status, &code);

		if (ret)

			return ret;

		*temp = code_to_mdegC(code, s);

drivers/thermal/qcom/tsens-8974.c

+8 −8
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ 


#define BIT_APPEND		0x3



static int calibrate_8974(struct tsens_priv *tmdev)

static int calibrate_8974(struct tsens_priv *priv)

{

	int base1 = 0, base2 = 0, i;

	u32 p1[11], p2[11];
@@ -99,11 +99,11 @@ static int calibrate_8974(struct tsens_priv *tmdev) 
	u32 *calib, *bkp;

	u32 calib_redun_sel;



	calib = (u32 *)qfprom_read(tmdev->dev, "calib");

	calib = (u32 *)qfprom_read(priv->dev, "calib");

	if (IS_ERR(calib))

		return PTR_ERR(calib);



	bkp = (u32 *)qfprom_read(tmdev->dev, "calib_backup");

	bkp = (u32 *)qfprom_read(priv->dev, "calib_backup");

	if (IS_ERR(bkp))

		return PTR_ERR(bkp);
@@ -184,25 +184,25 @@ static int calibrate_8974(struct tsens_priv *tmdev) 


	switch (mode) {

	case ONE_PT_CALIB:

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

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

			p1[i] += (base1 << 2) | BIT_APPEND;

		break;

	case TWO_PT_CALIB:

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

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

			p2[i] += base2;

			p2[i] <<= 2;

			p2[i] |= BIT_APPEND;

		}

		/* Fall through */

	case ONE_PT_CALIB2:

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

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

			p1[i] += base1;

			p1[i] <<= 2;

			p1[i] |= BIT_APPEND;

		}

		break;

	default:

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

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

			p2[i] = 780;

		p1[0] = 502;

		p1[1] = 509;
@@ -218,7 +218,7 @@ static int calibrate_8974(struct tsens_priv *tmdev) 
		break;

	}



	compute_intercept_slope(tmdev, p1, p2, mode);

	compute_intercept_slope(priv, p1, p2, mode);



	return 0;

}

drivers/thermal/qcom/tsens-common.c

+26 −27
Original line number Diff line number Diff line
@@ -46,18 +46,18 @@ char *qfprom_read(struct device *dev, const char *cname) 
 * and offset values are derived from tz->tzp->slope and tz->tzp->offset

 * resp.

 */

void compute_intercept_slope(struct tsens_priv *tmdev, u32 *p1,

void compute_intercept_slope(struct tsens_priv *priv, u32 *p1,

			     u32 *p2, u32 mode)

{

	int i;

	int num, den;



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

		dev_dbg(tmdev->dev,

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

		dev_dbg(priv->dev,

			"sensor%d - data_point1:%#x data_point2:%#x\n",

			i, p1[i], p2[i]);



		tmdev->sensor[i].slope = SLOPE_DEFAULT;

		priv->sensor[i].slope = SLOPE_DEFAULT;

		if (mode == TWO_PT_CALIB) {

			/*

			 * slope (m) = adc_code2 - adc_code1 (y2 - y1)/
@@ -66,13 +66,13 @@ void compute_intercept_slope(struct tsens_priv *tmdev, u32 *p1, 
			num = p2[i] - p1[i];

			num *= SLOPE_FACTOR;

			den = CAL_DEGC_PT2 - CAL_DEGC_PT1;

			tmdev->sensor[i].slope = num / den;

			priv->sensor[i].slope = num / den;

		}



		tmdev->sensor[i].offset = (p1[i] * SLOPE_FACTOR) -

		priv->sensor[i].offset = (p1[i] * SLOPE_FACTOR) -

				(CAL_DEGC_PT1 *

				tmdev->sensor[i].slope);

		dev_dbg(tmdev->dev, "offset:%d\n", tmdev->sensor[i].offset);

				priv->sensor[i].slope);

		dev_dbg(priv->dev, "offset:%d\n", priv->sensor[i].offset);

	}

}
@@ -95,15 +95,15 @@ static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s) 
	return degc;

}



int get_temp_common(struct tsens_priv *tmdev, int id, int *temp)

int get_temp_common(struct tsens_priv *priv, int id, int *temp)

{

	struct tsens_sensor *s = &tmdev->sensor[id];

	struct tsens_sensor *s = &priv->sensor[id];

	u32 code;

	unsigned int status_reg;

	int last_temp = 0, ret;



	status_reg = tmdev->tm_offset + STATUS_OFFSET + s->hw_id * SN_ADDR_OFFSET;

	ret = regmap_read(tmdev->tm_map, status_reg, &code);

	status_reg = priv->tm_offset + STATUS_OFFSET + s->hw_id * SN_ADDR_OFFSET;

	ret = regmap_read(priv->tm_map, status_reg, &code);

	if (ret)

		return ret;

	last_temp = code & SN_ST_TEMP_MASK;
@@ -127,21 +127,21 @@ static const struct regmap_config tsens_srot_config = { 
	.reg_stride	= 4,

};



int __init init_common(struct tsens_priv *tmdev)

int __init init_common(struct tsens_priv *priv)

{

	void __iomem *tm_base, *srot_base;

	struct resource *res;

	u32 code;

	int ret;

	struct platform_device *op = of_find_device_by_node(tmdev->dev->of_node);

	u16 ctrl_offset = tmdev->reg_offsets[SROT_CTRL_OFFSET];

	struct platform_device *op = of_find_device_by_node(priv->dev->of_node);

	u16 ctrl_offset = priv->reg_offsets[SROT_CTRL_OFFSET];



	if (!op)

		return -EINVAL;



	if (op->num_resources > 1) {

		/* DT with separate SROT and TM address space */

		tmdev->tm_offset = 0;

		priv->tm_offset = 0;

		res = platform_get_resource(op, IORESOURCE_MEM, 1);

		srot_base = devm_ioremap_resource(&op->dev, res);

		if (IS_ERR(srot_base)) {
@@ -149,16 +149,15 @@ int __init init_common(struct tsens_priv *tmdev) 
			goto err_put_device;

		}



		tmdev->srot_map = devm_regmap_init_mmio(tmdev->dev, srot_base,

		priv->srot_map = devm_regmap_init_mmio(priv->dev, srot_base,

							&tsens_srot_config);

		if (IS_ERR(tmdev->srot_map)) {

			ret = PTR_ERR(tmdev->srot_map);

		if (IS_ERR(priv->srot_map)) {

			ret = PTR_ERR(priv->srot_map);

			goto err_put_device;

		}



	} else {

		/* old DTs where SROT and TM were in a contiguous 2K block */

		tmdev->tm_offset = 0x1000;

		priv->tm_offset = 0x1000;

	}



	res = platform_get_resource(op, IORESOURCE_MEM, 0);
@@ -168,18 +167,18 @@ int __init init_common(struct tsens_priv *tmdev) 
		goto err_put_device;

	}



	tmdev->tm_map = devm_regmap_init_mmio(tmdev->dev, tm_base, &tsens_config);

	if (IS_ERR(tmdev->tm_map)) {

		ret = PTR_ERR(tmdev->tm_map);

	priv->tm_map = devm_regmap_init_mmio(priv->dev, tm_base, &tsens_config);

	if (IS_ERR(priv->tm_map)) {

		ret = PTR_ERR(priv->tm_map);

		goto err_put_device;

	}



	if (tmdev->srot_map) {

		ret = regmap_read(tmdev->srot_map, ctrl_offset, &code);

	if (priv->srot_map) {

		ret = regmap_read(priv->srot_map, ctrl_offset, &code);

		if (ret)

			goto err_put_device;

		if (!(code & TSENS_EN)) {

			dev_err(tmdev->dev, "tsens device is not enabled\n");

			dev_err(priv->dev, "tsens device is not enabled\n");

			ret = -ENODEV;

			goto err_put_device;

		}

drivers/thermal/qcom/tsens-v2.c

+6 −6
Original line number Diff line number Diff line
@@ -12,16 +12,16 @@ 
#define LAST_TEMP_MASK		0xfff

#define STATUS_VALID_BIT	BIT(21)



static int get_temp_tsens_v2(struct tsens_priv *tmdev, int id, int *temp)

static int get_temp_tsens_v2(struct tsens_priv *priv, int id, int *temp)

{

	struct tsens_sensor *s = &tmdev->sensor[id];

	struct tsens_sensor *s = &priv->sensor[id];

	u32 code;

	unsigned int status_reg;

	u32 last_temp = 0, last_temp2 = 0, last_temp3 = 0;

	int ret;



	status_reg = tmdev->tm_offset + STATUS_OFFSET + s->hw_id * 4;

	ret = regmap_read(tmdev->tm_map, status_reg, &code);

	status_reg = priv->tm_offset + STATUS_OFFSET + s->hw_id * 4;

	ret = regmap_read(priv->tm_map, status_reg, &code);

	if (ret)

		return ret;

	last_temp = code & LAST_TEMP_MASK;
@@ -29,7 +29,7 @@ static int get_temp_tsens_v2(struct tsens_priv *tmdev, int id, int *temp) 
		goto done;



	/* Try a second time */

	ret = regmap_read(tmdev->tm_map, status_reg, &code);

	ret = regmap_read(priv->tm_map, status_reg, &code);

	if (ret)

		return ret;

	if (code & STATUS_VALID_BIT) {
@@ -40,7 +40,7 @@ static int get_temp_tsens_v2(struct tsens_priv *tmdev, int id, int *temp) 
	}



	/* Try a third/last time */

	ret = regmap_read(tmdev->tm_map, status_reg, &code);

	ret = regmap_read(priv->tm_map, status_reg, &code);

	if (ret)

		return ret;

	if (code & STATUS_VALID_BIT) {