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

Commit 4c537fb2 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[PATCH] hwmon: Support the Pentium M VID code 



Add support for the Intel Pentium M series to the hwmon-vid driver.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: Rudolf Marek <r.marek@sh.cvut.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c2db6ce1

drivers/hwmon/hwmon-vid.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -54,6 +54,10 @@ 
    (IMVP-II). You can find more information in the datasheet of Max1718

    (IMVP-II). You can find more information in the datasheet of Max1718

    http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2452

    http://www.maxim-ic.com/quick_view2.cfm/qv_pk/2452





    The 13 specification corresponds to the Intel Pentium M series. There

    doesn't seem to be any named specification for these. The conversion

    tables are detailed directly in the various Pentium M datasheets:

    http://www.intel.com/design/intarch/pentiumm/docs_pentiumm.htm

*/

*/





/* vrm is the VRM/VRD document version multiplied by 10.

/* vrm is the VRM/VRD document version multiplied by 10.
@@ -100,6 +104,8 @@ int vid_from_reg(int val, u8 vrm) 
	case 17:		/* Intel IMVP-II */

	case 17:		/* Intel IMVP-II */

		return(val & 0x10 ? 975 - (val & 0xF) * 25 :

		return(val & 0x10 ? 975 - (val & 0xF) * 25 :

				    1750 - val * 50);

				    1750 - val * 50);

	case 13:

		return(1708 - (val & 0x3f) * 16);

	default:		/* report 0 for unknown */

	default:		/* report 0 for unknown */

		printk(KERN_INFO "hwmon-vid: requested unknown VRM version\n");

		printk(KERN_INFO "hwmon-vid: requested unknown VRM version\n");

		return 0;

		return 0;
@@ -129,8 +135,9 @@ struct vrm_model { 
static struct vrm_model vrm_models[] = {

static struct vrm_model vrm_models[] = {

	{X86_VENDOR_AMD, 0x6, ANY, ANY, 90},		/* Athlon Duron etc */

	{X86_VENDOR_AMD, 0x6, ANY, ANY, 90},		/* Athlon Duron etc */

	{X86_VENDOR_AMD, 0xF, ANY, ANY, 24},		/* Athlon 64, Opteron and above VRM 24 */

	{X86_VENDOR_AMD, 0xF, ANY, ANY, 24},		/* Athlon 64, Opteron and above VRM 24 */

	{X86_VENDOR_INTEL, 0x6, 0x9, ANY, 85},		/* 0.13um too */

	{X86_VENDOR_INTEL, 0x6, 0x9, ANY, 13},		/* Pentium M (130 nm) */

	{X86_VENDOR_INTEL, 0x6, 0xB, ANY, 85},		/* Tualatin */

	{X86_VENDOR_INTEL, 0x6, 0xB, ANY, 85},		/* Tualatin */

	{X86_VENDOR_INTEL, 0x6, 0xD, ANY, 13},		/* Pentium M (90 nm) */

	{X86_VENDOR_INTEL, 0x6, ANY, ANY, 82},		/* any P6 */

	{X86_VENDOR_INTEL, 0x6, ANY, ANY, 82},		/* any P6 */

	{X86_VENDOR_INTEL, 0x7, ANY, ANY, 0},		/* Itanium */

	{X86_VENDOR_INTEL, 0x7, ANY, ANY, 0},		/* Itanium */

	{X86_VENDOR_INTEL, 0xF, 0x0, ANY, 90},		/* P4 */

	{X86_VENDOR_INTEL, 0xF, 0x0, ANY, 90},		/* P4 */