Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+8
-5
+2
-2
Documentation/devicetree/bindings/hwmon/adc128d818.txt
+2
-2
Documentation/devicetree/bindings/hwmon/adc128d818.txt
···
26
26
27
27
Optional node properties:
28
28
29
-
- ti,mode: Operation mode (see above).
29
+
- ti,mode: Operation mode (u8) (see above).
30
30
31
31
32
32
Example (operation mode 2):
···
34
34
adc128d818@1d {
35
35
compatible = "ti,adc128d818";
36
36
reg = <0x1d>;
37
-
ti,mode = <2>;
37
+
ti,mode = /bits/ 8 <2>;
38
38
};
+1
drivers/hwmon/Kconfig
+1
drivers/hwmon/Kconfig
+1
-1
drivers/hwmon/ntc_thermistor.c
+1
-1
drivers/hwmon/ntc_thermistor.c
+4
-2
drivers/hwmon/occ/common.c
+4
-2
drivers/hwmon/occ/common.c
···
890
890
s++;
891
891
}
892
892
}
893
+
894
+
s = (sensors->power.num_sensors * 4) + 1;
893
895
} else {
894
896
for (i = 0; i < sensors->power.num_sensors; ++i) {
895
897
s = i + 1;
···
920
918
show_power, NULL, 3, i);
921
919
attr++;
922
920
}
921
+
922
+
s = sensors->power.num_sensors + 1;
923
923
}
924
924
925
925
if (sensors->caps.num_sensors >= 1) {
926
-
s = sensors->power.num_sensors + 1;
927
-
928
926
snprintf(attr->name, sizeof(attr->name), "power%d_label", s);
929
927
attr->sensor = OCC_INIT_ATTR(attr->name, 0444, show_caps, NULL,
930
928
0, 0);