Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3cf59142 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging 

Pull second round of hwmon updates from Guenter Roeck:
 "Add support for AMD F16 M30h processor to k10temp driver.

  This adds one more patch which had secondary dependencies.  The branch
  point is arbitrary, but I did run a full set of build and qemu tests
  on it.  While there are some new build failures (6 out of 122 in my
  builds), none are due to this commit"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (k10temp) Add support for AMD F16 M30h processor
parents 154d6f18 ec015950

Documentation/hwmon/k10temp

+3 −3
Original line number Original line Diff line number Diff line
@@ -11,8 +11,8 @@ Supported chips: 
  Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)

  Socket S1G2: Athlon (X2), Sempron (X2), Turion X2 (Ultra)

* AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)

* AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)

* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)

* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)

* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity"

* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity", "Kaveri"

* AMD Family 16h processors: "Kabini"

* AMD Family 16h processors: "Kabini", "Mullins"





  Prefix: 'k10temp'

  Prefix: 'k10temp'

  Addresses scanned: PCI space

  Addresses scanned: PCI space
@@ -46,7 +46,7 @@ Description 
-----------

-----------





This driver permits reading of the internal temperature sensor of AMD

This driver permits reading of the internal temperature sensor of AMD

Family 10h/11h/12h/14h/15h processors.

Family 10h/11h/12h/14h/15h/16h processors.





All these processors have a sensor, but on those for Socket F or AM2+,

All these processors have a sensor, but on those for Socket F or AM2+,

the sensor may return inconsistent values (erratum 319).  The driver

the sensor may return inconsistent values (erratum 319).  The driver

drivers/hwmon/Kconfig

+2 −2
Original line number Original line Diff line number Diff line
@@ -280,8 +280,8 @@ config SENSORS_K10TEMP 
	  If you say yes here you get support for the temperature

	  If you say yes here you get support for the temperature

	  sensor(s) inside your CPU. Supported are later revisions of

	  sensor(s) inside your CPU. Supported are later revisions of

	  the AMD Family 10h and all revisions of the AMD Family 11h,

	  the AMD Family 10h and all revisions of the AMD Family 11h,

	  12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and

	  12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity/Kaveri) and

	  16h (Kabini) microarchitectures.

	  16h (Kabini/Mullins) microarchitectures.





	  This driver can also be built as a module.  If so, the module

	  This driver can also be built as a module.  If so, the module

	  will be called k10temp.

	  will be called k10temp.

drivers/hwmon/k10temp.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -212,6 +212,7 @@ static const struct pci_device_id k10temp_id_table[] = { 
	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_M30H_NB_F3) },

	{}

	{}

};

};

MODULE_DEVICE_TABLE(pci, k10temp_id_table);

MODULE_DEVICE_TABLE(pci, k10temp_id_table);