Commit 4244b5d8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v5.13-rc6' of... 

Merge tag 'hwmon-for-v5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fixes from Guenter Roeck:
 "Fixes for tps23861, scpi-hwmon, and corsair-psu drivers, plus a
  bindings fix for TI ADS7828"

* tag 'hwmon-for-v5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (tps23861) correct shunt LSB values
  hwmon: (tps23861) set current shunt value
  hwmon: (tps23861) define regmap max register
  hwmon: (scpi-hwmon) shows the negative temperature properly
  hwmon: (corsair-psu) fix suspend behavior
  dt-bindings: hwmon: Fix typo in TI ADS7828 bindings
parents f30dc8f9 e13d1127

Documentation/devicetree/bindings/hwmon/ti,ads7828.yaml

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ examples: 
        #size-cells = <0>;



        adc@48 {

            comatible = "ti,ads7828";

            compatible = "ti,ads7828";

            reg = <0x48>;

            vref-supply = <&vref>;

            ti,differential-input;

drivers/hwmon/corsair-psu.c

+14 −0
Original line number Diff line number Diff line
@@ -771,6 +771,16 @@ static int corsairpsu_raw_event(struct hid_device *hdev, struct hid_report *repo 
	return 0;

}



#ifdef CONFIG_PM

static int corsairpsu_resume(struct hid_device *hdev)

{

	struct corsairpsu_data *priv = hid_get_drvdata(hdev);



	/* some PSUs turn off the microcontroller during standby, so a reinit is required */

	return corsairpsu_init(priv);

}

#endif



static const struct hid_device_id corsairpsu_idtable[] = {

	{ HID_USB_DEVICE(0x1b1c, 0x1c03) }, /* Corsair HX550i */

	{ HID_USB_DEVICE(0x1b1c, 0x1c04) }, /* Corsair HX650i */
@@ -793,6 +803,10 @@ static struct hid_driver corsairpsu_driver = { 
	.probe		= corsairpsu_probe,

	.remove		= corsairpsu_remove,

	.raw_event	= corsairpsu_raw_event,

#ifdef CONFIG_PM

	.resume		= corsairpsu_resume,

	.reset_resume	= corsairpsu_resume,

#endif

};

module_hid_driver(corsairpsu_driver);

drivers/hwmon/scpi-hwmon.c

+9 −0
Original line number Diff line number Diff line
@@ -99,6 +99,15 @@ scpi_show_sensor(struct device *dev, struct device_attribute *attr, char *buf) 


	scpi_scale_reading(&value, sensor);



	/*

	 * Temperature sensor values are treated as signed values based on

	 * observation even though that is not explicitly specified, and

	 * because an unsigned u64 temperature does not really make practical

	 * sense especially when the temperature is below zero degrees Celsius.

	 */

	if (sensor->info.class == TEMPERATURE)

		return sprintf(buf, "%lld\n", (s64)value);



	return sprintf(buf, "%llu\n", value);

}

drivers/hwmon/tps23861.c

+15 −2
Original line number Diff line number Diff line
@@ -99,11 +99,14 @@ 
#define POWER_ENABLE			0x19

#define TPS23861_NUM_PORTS		4



#define TPS23861_GENERAL_MASK_1		0x17

#define TPS23861_CURRENT_SHUNT_MASK	BIT(0)



#define TEMPERATURE_LSB			652 /* 0.652 degrees Celsius */

#define VOLTAGE_LSB			3662 /* 3.662 mV */

#define SHUNT_RESISTOR_DEFAULT		255000 /* 255 mOhm */

#define CURRENT_LSB_255			62260 /* 62.260 uA */

#define CURRENT_LSB_250			61039 /* 61.039 uA */

#define CURRENT_LSB_250			62260 /* 62.260 uA */

#define CURRENT_LSB_255			61039 /* 61.039 uA */

#define RESISTANCE_LSB			110966 /* 11.0966 Ohm*/

#define RESISTANCE_LSB_LOW		157216 /* 15.7216 Ohm*/
@@ -117,6 +120,7 @@ struct tps23861_data { 
static struct regmap_config tps23861_regmap_config = {

	.reg_bits = 8,

	.val_bits = 8,

	.max_register = 0x6f,

};



static int tps23861_read_temp(struct tps23861_data *data, long *val)
@@ -560,6 +564,15 @@ static int tps23861_probe(struct i2c_client *client) 
	else

		data->shunt_resistor = SHUNT_RESISTOR_DEFAULT;



	if (data->shunt_resistor == SHUNT_RESISTOR_DEFAULT)

		regmap_clear_bits(data->regmap,

				  TPS23861_GENERAL_MASK_1,

				  TPS23861_CURRENT_SHUNT_MASK);

	else

		regmap_set_bits(data->regmap,

				TPS23861_GENERAL_MASK_1,

				TPS23861_CURRENT_SHUNT_MASK);



	hwmon_dev = devm_hwmon_device_register_with_info(dev, client->name,

							 data, &tps23861_chip_info,

							 NULL);