Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'hwmon-for-linus-v4.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fixes from Guenter Roeck:
"Some late hwmon patches, all headed for -stable
- fix sysfs attribute initialization in nct6775 and nct6683 drivers
- do not attempt to auto-detect tmp435 on I2C address 0x37
- ensure iio channel is of type IIO_VOLTAGE in ntc_thermistor driver"
* tag 'hwmon-for-linus-v4.1-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (nct6683) Add missing sysfs attribute initialization
hwmon: (nct6775) Add missing sysfs attribute initialization
hwmon: (tmp401) Do not auto-detect chip on I2C address 0x37
hwmon: (ntc_thermistor) Ensure iio channel is of type IIO_VOLTAGE
+15
-2
+1
-1
Documentation/hwmon/tmp401
+1
-1
Documentation/hwmon/tmp401
···
20
20
Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp432.html
21
21
* Texas Instruments TMP435
22
22
Prefix: 'tmp435'
23
-
Addresses scanned: I2C 0x37, 0x48 - 0x4f
23
+
Addresses scanned: I2C 0x48 - 0x4f
24
24
Datasheet: http://focus.ti.com/docs/prod/folders/print/tmp435.html
25
25
26
26
Authors:
+2
drivers/hwmon/nct6683.c
+2
drivers/hwmon/nct6683.c
···
439
439
(*t)->dev_attr.attr.name, tg->base + i);
440
440
if ((*t)->s2) {
441
441
a2 = &su->u.a2;
442
+
sysfs_attr_init(&a2->dev_attr.attr);
442
443
a2->dev_attr.attr.name = su->name;
443
444
a2->nr = (*t)->u.s.nr + i;
444
445
a2->index = (*t)->u.s.index;
···
450
449
*attrs = &a2->dev_attr.attr;
451
450
} else {
452
451
a = &su->u.a1;
452
+
sysfs_attr_init(&a->dev_attr.attr);
453
453
a->dev_attr.attr.name = su->name;
454
454
a->index = (*t)->u.index + i;
455
455
a->dev_attr.attr.mode =
+2
drivers/hwmon/nct6775.c
+2
drivers/hwmon/nct6775.c
···
995
995
(*t)->dev_attr.attr.name, tg->base + i);
996
996
if ((*t)->s2) {
997
997
a2 = &su->u.a2;
998
+
sysfs_attr_init(&a2->dev_attr.attr);
998
999
a2->dev_attr.attr.name = su->name;
999
1000
a2->nr = (*t)->u.s.nr + i;
1000
1001
a2->index = (*t)->u.s.index;
···
1006
1005
*attrs = &a2->dev_attr.attr;
1007
1006
} else {
1008
1007
a = &su->u.a1;
1008
+
sysfs_attr_init(&a->dev_attr.attr);
1009
1009
a->dev_attr.attr.name = su->name;
1010
1010
a->index = (*t)->u.index + i;
1011
1011
a->dev_attr.attr.mode =
+9
drivers/hwmon/ntc_thermistor.c
+9
drivers/hwmon/ntc_thermistor.c
···
239
239
ntc_thermistor_parse_dt(struct platform_device *pdev)
240
240
{
241
241
struct iio_channel *chan;
242
+
enum iio_chan_type type;
242
243
struct device_node *np = pdev->dev.of_node;
243
244
struct ntc_thermistor_platform_data *pdata;
245
+
int ret;
244
246
245
247
if (!np)
246
248
return NULL;
···
254
252
chan = iio_channel_get(&pdev->dev, NULL);
255
253
if (IS_ERR(chan))
256
254
return ERR_CAST(chan);
255
+
256
+
ret = iio_get_channel_type(chan, &type);
257
+
if (ret < 0)
258
+
return ERR_PTR(ret);
259
+
260
+
if (type != IIO_VOLTAGE)
261
+
return ERR_PTR(-EINVAL);
257
262
258
263
if (of_property_read_u32(np, "pullup-uv", &pdata->pullup_uv))
259
264
return ERR_PTR(-ENODEV);
+1
-1
drivers/hwmon/tmp401.c
+1
-1
drivers/hwmon/tmp401.c
···
44
44
#include <linux/sysfs.h>
45
45
46
46
/* Addresses to scan */
47
-
static const unsigned short normal_i2c[] = { 0x37, 0x48, 0x49, 0x4a, 0x4c, 0x4d,
47
+
static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4c, 0x4d,
48
48
0x4e, 0x4f, I2C_CLIENT_END };
49
49
50
50
enum chips { tmp401, tmp411, tmp431, tmp432, tmp435 };