Merge "thermal: qcom-spmi-temp-alarm: add support for GEN2 rev 1 PMIC peripherals" (5f06fab8) · Commits · e / devices / android_kernel_oneplus_sm7250

drivers/thermal/qcom-spmi-temp-alarm.c

+54 −21

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@
		#include <linux/regmap.h>
		#include <linux/thermal.h>

		#define QPNP_TM_REG_DIG_MAJOR 0x01
		#define QPNP_TM_REG_TYPE 0x04
		#define QPNP_TM_REG_SUBTYPE 0x05
		#define QPNP_TM_REG_STATUS 0x08
		@@ -42,18 +43,25 @@

		#define ALARM_CTRL_FORCE_ENABLE BIT(7)

		/*
		* Trip point values based on threshold control
		* 0 = {105 C, 125 C, 145 C}
		* 1 = {110 C, 130 C, 150 C}
		* 2 = {115 C, 135 C, 155 C}
		* 3 = {120 C, 140 C, 160 C}
		*/
		#define TEMP_STAGE_STEP 20000 /* Stage step: 20.000 C */
		#define TEMP_STAGE_HYSTERESIS 2000
		#define THRESH_COUNT 4
		#define STAGE_COUNT 3

		/* Over-temperature trip point values in mC */
		static const long temp_map_gen1[THRESH_COUNT][STAGE_COUNT] = {
		{105000, 125000, 145000},
		{110000, 130000, 150000},
		{115000, 135000, 155000},
		{120000, 140000, 160000},
		};

		static const long temp_map_gen2_v1[THRESH_COUNT][STAGE_COUNT] = {
		{ 90000, 110000, 140000},
		{ 95000, 115000, 145000},
		{100000, 120000, 150000},
		{105000, 125000, 155000},
		};

		#define TEMP_THRESH_MIN 105000 /* Threshold Min: 105 C */
		#define TEMP_THRESH_STEP 5000 /* Threshold step: 5 C */
		#define TEMP_STAGE_HYSTERESIS 2000

		#define THRESH_MIN 0

		@@ -70,6 +78,7 @@ struct qpnp_tm_chip {
		unsigned int prev_stage;
		unsigned int base;
		struct iio_channel *adc;
		const long (*temp_map)[THRESH_COUNT][STAGE_COUNT];
		};

		/* This array maps from GEN2 alarm state to GEN1 alarm stage */
		@@ -93,6 +102,23 @@ static int qpnp_tm_write(struct qpnp_tm_chip *chip, u16 addr, u8 data)
		return regmap_write(chip->map, chip->base + addr, data);
		}

		/**
		* qpnp_tm_decode_temp() - return temperature in mC corresponding to the
		* specified over-temperature stage
		* @chip: Pointer to the qpnp_tm chip
		* @stage: Over-temperature stage
		*
		* Return: temperature in mC
		*/
		static long qpnp_tm_decode_temp(struct qpnp_tm_chip *chip, unsigned int stage)
		{
		if (!chip->temp_map \|\| chip->thresh >= THRESH_COUNT \|\| stage == 0
		\|\| stage > STAGE_COUNT)
		return 0;

		return (*chip->temp_map)[chip->thresh][stage - 1];
		}

		/**
		* qpnp_tm_get_temp_stage() - return over-temperature stage
		* @chip: Pointer to the qpnp_tm chip
		@@ -140,14 +166,12 @@ static int qpnp_tm_update_temp_no_adc(struct qpnp_tm_chip *chip)

		if (stage_new > stage_old) {
		/* increasing stage, use lower bound */
		chip->temp = (stage_new - 1) * TEMP_STAGE_STEP +
		chip->thresh * TEMP_THRESH_STEP +
		TEMP_STAGE_HYSTERESIS + TEMP_THRESH_MIN;
		chip->temp = qpnp_tm_decode_temp(chip, stage_new)
		+ TEMP_STAGE_HYSTERESIS;
		} else if (stage_new < stage_old) {
		/* decreasing stage, use upper bound */
		chip->temp = stage_new * TEMP_STAGE_STEP +
		chip->thresh * TEMP_THRESH_STEP -
		TEMP_STAGE_HYSTERESIS + TEMP_THRESH_MIN;
		chip->temp = qpnp_tm_decode_temp(chip, stage_new + 1)
		- TEMP_STAGE_HYSTERESIS;
		}

		chip->stage = stage;
		@@ -220,9 +244,7 @@ static int qpnp_tm_init(struct qpnp_tm_chip *chip)
		? chip->stage : alarm_state_map[chip->stage];

		if (stage)
		chip->temp = chip->thresh * TEMP_THRESH_STEP +
		(stage - 1) * TEMP_STAGE_STEP +
		TEMP_THRESH_MIN;
		chip->temp = qpnp_tm_decode_temp(chip, stage);

		/*
		* Set threshold and disable software override of stage 2 and 3
		@@ -246,7 +268,7 @@ static int qpnp_tm_probe(struct platform_device *pdev)
		{
		struct qpnp_tm_chip *chip;
		struct device_node *node;
		u8 type, subtype;
		u8 type, subtype, dig_major;
		u32 res;
		int ret, irq;

		@@ -293,6 +315,12 @@ static int qpnp_tm_probe(struct platform_device *pdev)
		return ret;
		}

		ret = qpnp_tm_read(chip, QPNP_TM_REG_DIG_MAJOR, &dig_major);
		if (ret < 0) {
		dev_err(&pdev->dev, "could not read dig_major\n");
		return ret;
		}

		if (type != QPNP_TM_TYPE \|\| (subtype != QPNP_TM_SUBTYPE_GEN1
		&& subtype != QPNP_TM_SUBTYPE_GEN2)) {
		dev_err(&pdev->dev, "invalid type 0x%02x or subtype 0x%02x\n",
		@@ -302,6 +330,11 @@ static int qpnp_tm_probe(struct platform_device *pdev)

		chip->subtype = subtype;

		if (subtype == QPNP_TM_SUBTYPE_GEN2 && dig_major >= 1)
		chip->temp_map = &temp_map_gen2_v1;
		else
		chip->temp_map = &temp_map_gen1;

		ret = qpnp_tm_init(chip);
		if (ret < 0) {
		dev_err(&pdev->dev, "init failed\n");