drivers: thermal: tsens: Move get_temp_tsens_v2 to allow sharing (c8b61690) · Commits · 戴 / test

drivers/thermal/qcom/tsens-common.c

+35 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,41 @@ static inline int code_to_degc(u32 adc_code, const struct tsens_sensor *s)
		return degc;
		}

		int get_temp_tsens_valid(struct tsens_priv priv, int i, int temp)
		{
		struct tsens_sensor *s = &priv->sensor[i];
		u32 temp_idx = LAST_TEMP_0 + s->hw_id;
		u32 valid_idx = VALID_0 + s->hw_id;
		u32 last_temp = 0, valid, mask;
		int ret;

		ret = regmap_field_read(priv->rf[valid_idx], &valid);
		if (ret)
		return ret;
		while (!valid) {
		/* Valid bit is 0 for 6 AHB clock cycles.
		* At 19.2MHz, 1 AHB clock is ~60ns.
		* We should enter this loop very, very rarely.
		*/
		ndelay(400);
		ret = regmap_field_read(priv->rf[valid_idx], &valid);
		if (ret)
		return ret;
		}

		/* Valid bit is set, OK to read the temperature */
		ret = regmap_field_read(priv->rf[temp_idx], &last_temp);
		if (ret)
		return ret;

		mask = GENMASK(priv->fields[LAST_TEMP_0].msb,
		priv->fields[LAST_TEMP_0].lsb);
		/* Convert temperature from deciCelsius to milliCelsius */
		temp = sign_extend32(last_temp, fls(mask) - 1) 100;

		return 0;
		}

		int get_temp_common(struct tsens_priv priv, int i, int temp)
		{
		struct tsens_sensor *s = &priv->sensor[i];

+1 −36

Original line number	Diff line number	Diff line
		@@ -25,41 +25,6 @@
		#define TM_Sn_STATUS_OFF 0x00a0
		#define TM_TRDY_OFF 0x00e4

		static int get_temp_tsens_v2(struct tsens_priv priv, int i, int temp)
		{
		struct tsens_sensor *s = &priv->sensor[i];
		u32 temp_idx = LAST_TEMP_0 + s->hw_id;
		u32 valid_idx = VALID_0 + s->hw_id;
		u32 last_temp = 0, valid, mask;
		int ret;

		ret = regmap_field_read(priv->rf[valid_idx], &valid);
		if (ret)
		return ret;
		while (!valid) {
		/* Valid bit is 0 for 6 AHB clock cycles.
		* At 19.2MHz, 1 AHB clock is ~60ns.
		* We should enter this loop very, very rarely.
		*/
		ndelay(400);
		ret = regmap_field_read(priv->rf[valid_idx], &valid);
		if (ret)
		return ret;
		}

		/* Valid bit is set, OK to read the temperature */
		ret = regmap_field_read(priv->rf[temp_idx], &last_temp);
		if (ret)
		return ret;

		mask = GENMASK(priv->fields[LAST_TEMP_0].msb,
		priv->fields[LAST_TEMP_0].lsb);
		/* Convert temperature from deciCelsius to milliCelsius */
		temp = sign_extend32(last_temp, fls(mask) - 1) 100;

		return 0;
		}

		/* v2.x: 8996, 8998, sdm845 */

		static const struct tsens_features tsens_v2_feat = {
		@@ -101,7 +66,7 @@ static const struct reg_field tsens_v2_regfields[MAX_REGFIELDS] = {

		static const struct tsens_ops ops_generic_v2 = {
		.init = init_common,
		.get_temp = get_temp_tsens_v2,
		.get_temp = get_temp_tsens_valid,
		};

		const struct tsens_plat_data data_tsens_v2 = {

+1 −0

Original line number	Diff line number	Diff line
		@@ -308,6 +308,7 @@ struct tsens_priv {
		char qfprom_read(struct device dev, const char *cname);
		void compute_intercept_slope(struct tsens_priv priv, u32 pt1, u32 *pt2, u32 mode);
		int init_common(struct tsens_priv *priv);
		int get_temp_tsens_valid(struct tsens_priv priv, int i, int temp);
		int get_temp_common(struct tsens_priv priv, int i, int temp);
		bool is_sensor_enabled(struct tsens_priv *priv, u32 hw_id);