Accepting request 425181 from Base:System

1

OBS-URL: https://build.opensuse.org/request/show/425181
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sensors?expand=0&rev=96
This commit is contained in:
Dominique Leuenberger 2016-09-09 08:15:57 +00:00 committed by Git OBS Bridge
commit c1c1571f1a
3 changed files with 73 additions and 0 deletions

View File

@ -0,0 +1,64 @@
From 6693f6f6aaa098955f70049d0f63ff5eab354c31 Mon Sep 17 00:00:00 2001
From: Ruediger Meier <ruediger.meier@ga-group.nl>
Date: Fri, 2 Sep 2016 12:38:20 +0200
Subject: [PATCH] sensors-detect: add ftsteutates support
ftsteutates is a kernel module by Fujitsu for recent Skylake Fujitsu
boards, see
ftp://ftp.ts.fujitsu.com/pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/
ftsteutates-module_20160601.zip
Fujitsu_mainboards-1-Sensors_HowTo-en-US.pdf
This patch was taken from ftsteutates-module_20160601.zip, (original patch
name: add-fts-teutates-to-lm-sensors-detect.patch).
I've made a minor modification to the original patch
- return if $id == 0x11; # Teutates
+ return if $id eq 0x11; # Teutates
to fix a warning "Argument "^Q" isn't numeric in numeric eq".
Signed-off-by: Ruediger Meier <ruediger.meier@ga-group.nl>
---
prog/detect/sensors-detect | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 057cd96..7c744dd 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -1270,6 +1270,11 @@ use vars qw(@i2c_adapter_names);
i2c_addrs => [0x73],
i2c_detect => sub { fsc_detect(@_, 7); },
}, {
+ name => "FSC Teutates",
+ driver => "ftsteutates",
+ i2c_addrs => [0x73],
+ i2c_detect => sub { fts_detect(@_, 1); },
+ }, {
name => "ALi M5879",
driver => "to-be-written",
i2c_addrs => [0x2c..0x2d],
@@ -6107,6 +6112,20 @@ sub fsc_detect
return 8;
}
+# ChipID to detect: 1 = Teutates
+# Registers used:
+# 0x00: Identification (0x1X => X needs to be ID)
+sub fts_detect
+{
+ my ($file, $addr, $chip) = @_;
+ my $id;
+
+ $id = chr(i2c_smbus_read_byte_data($file, 0x00));
+
+ return if $id eq 0x11; # Teutates
+ return 2;
+}
+
# Chip to detect: 0 = LM93, 1 = LM94
# Registers used:
# 0x3E: Manufacturer ID
--
1.8.5.6

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 2 12:39:37 UTC 2016 - sweet_f_a@gmx.de
- add lm_sensors-3.4.0-sensors-detect-add-ftsteutates-support.patch
for ftsteutates support (Fujitsu Skylake boards)
-------------------------------------------------------------------
Sun Jan 31 12:30:06 UTC 2016 - jdelvare@suse.com

View File

@ -38,6 +38,8 @@ Patch3: lm_sensors-3.0.0-sysconfig_metadata.patch
Patch4: lm_sensors-3.0.3-hint-at-kernel-extra-package.patch
Patch5: lm_sensors-3.4.0-sensors-detect-fix-systemd-path.patch
Patch6: lm_sensors-3.4.0-sensord-service-extra-args.patch
#PATCH-FEATURE-UPSTREAM add ftsteutates support
Patch7: lm_sensors-3.4.0-sensors-detect-add-ftsteutates-support.patch
ExcludeArch: s390 s390x
%{?systemd_requires}
@ -101,6 +103,7 @@ sense to the user.
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
%build
RPM_OPT_FLAGS="$RPM_OPT_FLAGS"