Unverified Commit d0771f49 authored by James Calligeros's avatar James Calligeros Committed by Mark Brown
Browse files

ASoC: tas2770: Deal with bogus initial temperature value 



TAS2770 initialises the temperature readout registers to 0.
This value persists until the chip is fully powered up and
the ADC starts sampling. The ADC then persists the last sampled
temperature during software shutdown.

The ADC should therefore never return 0 in normal operating
conditions, so return -ENODATA and mark it as a fault condition
using HWMON_T_FAULT.

Fixes: ff73e278 ("ASoC: tas2770: expose die temp to hwmon")
Signed-off-by: default avatarJames Calligeros <jcalligeros99@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 915f9860

sound/soc/codecs/tas2770.c

+22 −1
Original line number Diff line number Diff line
@@ -633,10 +633,27 @@ static int tas2770_read_die_temp(struct tas2770_priv *tas2770, long *result) 
	 * value read back from its registers will be the last value sampled

	 * before entering software shutdown.

	 */

	if (reading == 0)

		return -ENODATA;



	*result = (reading - (93 * 16)) * 1000 / 16;

	return 0;

}



static int tas2770_hwmon_is_fault(struct tas2770_priv *tas2770, long *result)

{

	int ret;

	long temp;



	ret = tas2770_read_die_temp(tas2770, &temp);

	if (ret == -ENODATA) {

		*result = true;

		return 0;

	}



	return ret;

}



static umode_t tas2770_hwmon_is_visible(const void *data,

					enum hwmon_sensor_types type, u32 attr,

					int channel)
@@ -646,6 +663,7 @@ static umode_t tas2770_hwmon_is_visible(const void *data, 


	switch (attr) {

	case hwmon_temp_input:

	case hwmon_temp_fault:

		return 0444;

	default:

		break;
@@ -665,6 +683,9 @@ static int tas2770_hwmon_read(struct device *dev, 
	case hwmon_temp_input:

		ret = tas2770_read_die_temp(tas2770, val);

		break;

	case hwmon_temp_fault:

		ret = tas2770_hwmon_is_fault(tas2770, val);

		break;

	default:

		ret = -EOPNOTSUPP;

		break;
@@ -674,7 +695,7 @@ static int tas2770_hwmon_read(struct device *dev, 
}



static const struct hwmon_channel_info *const tas2770_hwmon_info[] = {

	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT),

	HWMON_CHANNEL_INFO(temp, HWMON_T_INPUT | HWMON_T_FAULT),

	NULL

};