diff options
| author | Hoan Tran <hoan.tran@amperecomputing.com> | 2020-08-12 17:02:00 -0700 |
|---|---|---|
| committer | Ondřej Lysoněk <olysonek@redhat.com> | 2020-08-20 18:28:17 +0200 |
| commit | 00a5fadd2edccc0bdd4c06e5d3acf2da6c3feaa8 (patch) | |
| tree | 379e6dc7c3a802f6bd89e4b63ad03c29a06f6c43 | |
| parent | 347bdf9491a3f8c9d8bcc85ea663f7d2570dfb8d (diff) | |
| download | lm-sensors-git-00a5fadd2edccc0bdd4c06e5d3acf2da6c3feaa8.tar.gz | |
Add ISA ACPI sensor driver name support
ACPI hwmon sensor driver name has a different format such as
APMC0D29:00
APMC0D29:01
compared with DTB. This patch supports this format and gives
the correct device address as below
apm_xgene-isa-0000 => APMC0D29:00
Adapter: ISA adapter
SoC Temperature: +35.0°C
CPU power: 11.00 W
IO power: 20.00 W
apm_xgene-isa-0001 => APMC0D29:01
Adapter: ISA adapter
SoC Temperature: +33.0°C
CPU power: 13.00 W
IO power: 23.83 W
Signed-off-by: Hoan Tran <hoan@os.amperecomputing.com>
| -rw-r--r-- | lib/sysfs.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sysfs.c b/lib/sysfs.c index e63688b7..9516cec4 100644 --- a/lib/sysfs.c +++ b/lib/sysfs.c @@ -663,7 +663,7 @@ static int classify_device(const char *dev_name, if ((!subsys || !strcmp(subsys, "platform") || !strcmp(subsys, "of_platform"))) { /* must be new ISA (platform driver) */ - if (sscanf(dev_name, "%*[a-z0-9_].%d", &entry->chip.addr) != 1) + if (sscanf(dev_name, "%*[a-zA-Z0-9_]%*1[.:]%d", &entry->chip.addr) != 1) entry->chip.addr = 0; entry->chip.bus.type = SENSORS_BUS_TYPE_ISA; entry->chip.bus.nr = 0; @@ -938,7 +938,7 @@ int sensors_read_sysfs_attr(const sensors_chip_name *name, if (res == EOF) { if (errno == EIO) return -SENSORS_ERR_IO; - else + else return -SENSORS_ERR_ACCESS_R; } *value /= get_type_scaling(subfeature->type); @@ -972,7 +972,7 @@ int sensors_write_sysfs_attr(const sensors_chip_name *name, if (res == EOF) { if (errno == EIO) return -SENSORS_ERR_IO; - else + else return -SENSORS_ERR_ACCESS_W; } } else |