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

Commit 4a3164e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-v5.1-rc4' of... 

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

Pull hwmon fixes from Guenter Roeck:
 "Couple of minor hwmon fixes"

* tag 'hwmon-for-v5.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  dt-bindings: hwmon: (adc128d818) Specify ti,mode property size
  hwmon: (ntc_thermistor) Fix temperature type reporting
  hwmon: (occ) Fix power sensor indexing
  hwmon: (w83773g) Select REGMAP_I2C to fix build error
parents 9f3bd8fe d3b018f7

Documentation/devicetree/bindings/hwmon/adc128d818.txt

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ Required node properties: 


Optional node properties:



 - ti,mode:     Operation mode (see above).

 - ti,mode:     Operation mode (u8) (see above).





Example (operation mode 2):
@@ -34,5 +34,5 @@ Example (operation mode 2): 
	adc128d818@1d {

		compatible = "ti,adc128d818";

		reg = <0x1d>;

		ti,mode = <2>;

		ti,mode = /bits/ 8 <2>;

	};

drivers/hwmon/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -1759,6 +1759,7 @@ config SENSORS_VT8231 
config SENSORS_W83773G

	tristate "Nuvoton W83773G"

	depends on I2C

	select REGMAP_I2C

	help

	  If you say yes here you get support for the Nuvoton W83773G hardware

	  monitoring chip.

drivers/hwmon/ntc_thermistor.c

+1 −1
Original line number Diff line number Diff line
@@ -640,7 +640,7 @@ static const struct hwmon_channel_info ntc_chip = { 
};



static const u32 ntc_temp_config[] = {

	HWMON_T_INPUT, HWMON_T_TYPE,

	HWMON_T_INPUT | HWMON_T_TYPE,

	0

};

drivers/hwmon/occ/common.c

+4 −2
Original line number Diff line number Diff line
@@ -890,6 +890,8 @@ static int occ_setup_sensor_attrs(struct occ *occ) 
				s++;

			}

		}



		s = (sensors->power.num_sensors * 4) + 1;

	} else {

		for (i = 0; i < sensors->power.num_sensors; ++i) {

			s = i + 1;
@@ -918,11 +920,11 @@ static int occ_setup_sensor_attrs(struct occ *occ) 
						     show_power, NULL, 3, i);

			attr++;

		}

	}



	if (sensors->caps.num_sensors >= 1) {

		s = sensors->power.num_sensors + 1;

	}



	if (sensors->caps.num_sensors >= 1) {

		snprintf(attr->name, sizeof(attr->name), "power%d_label", s);

		attr->sensor = OCC_INIT_ATTR(attr->name, 0444, show_caps, NULL,

					     0, 0);