From 9befa30f7a482d1775e8b75e3d3d568f94f5f61d Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Fri, 12 Mar 2021 22:50:58 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/lm_sensors.git#911a06a5c87419a7d08c3312ba3f60416be09f69
---
 ...etect-Add-support-for-AMD-CPU-Family-19h.patch | 15 +++++++++++++++
 lm_sensors.spec                                   |  8 +++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 lm_sensors-3.6.0-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch

diff --git a/lm_sensors-3.6.0-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch b/lm_sensors-3.6.0-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch
new file mode 100644
index 0000000..b3c251a
--- /dev/null
+++ b/lm_sensors-3.6.0-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch
@@ -0,0 +1,15 @@
+diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
+index 32fd29f..49feecb 100755
+--- a/prog/detect/sensors-detect
++++ b/prog/detect/sensors-detect
+@@ -2792,6 +2792,10 @@ use vars qw(@cpu_ids);
+ 		name => "AMD Family 17h thermal sensors",
+ 		driver => "k10temp",
+ 		detect => sub { amd_pci_detect('1463', '15d0', '1493', '1443') },
++	}, {
++		name => "AMD Family 19h thermal sensors",
++		driver => "k10temp",
++		detect => sub { amd_pci_detect('1653') },
+ 	}, {
+ 		name => "AMD Family 15h power sensors",
+ 		driver => "fam15h_power",
diff --git a/lm_sensors.spec b/lm_sensors.spec
index e67cb94..ea36bfc 100644
--- a/lm_sensors.spec
+++ b/lm_sensors.spec
@@ -1,6 +1,6 @@
 Name: lm_sensors
 Version: 3.6.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 Summary: Hardware monitoring tools
 
 %define upstream_version %(echo %{version} | sed -e 's/\\./-/g')
@@ -31,6 +31,8 @@ Patch0: 0001-Revert-unnecessary-soname-bump.patch
 # Upstream patch:
 Patch1: 0001-Change-PIDFile-path-from-var-run-to-run.patch
 Patch2: lm_sensors-3.6.0-allow_no_sensors.patch
+# Upstream commit 5deee7d0c301df779:
+Patch3: lm_sensors-3.6.0-sensors-detect-Add-support-for-AMD-CPU-Family-19h.patch
 
 Requires: /usr/sbin/modprobe
 %ifarch %{ix86} x86_64
@@ -87,6 +89,7 @@ database, and warns of sensor alarms.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 # Remove currently unused files to make sure we've got the license right
 rm -f prog/init/sysconfig-lm_sensors-convert prog/hotplug/unhide_ICH_SMBus
@@ -209,6 +212,9 @@ fi
 
 
 %changelog
+* Tue Mar 09 2021 Artem Egorenkov <aegorenk@redhat.com> - 3.6.0-8
+- Add support for AMD CPU Family 19h
+
 * Wed Mar 03 2021 Artem Egorenkov <aegorenk@redhat.com> - 3.6.0-7
 - New flag for no sensors added. This flag is used in VM environment
   to make sensors binaries not fail if no sensors was detected.