[kernel] r16243 - in dists/sid/linux-2.6/debian: . patches/features/all patches/series

Ben Hutchings benh at alioth.debian.org
Mon Sep 6 00:05:44 UTC 2010 

Author: benh
Date: Mon Sep  6 00:05:36 2010
New Revision: 16243

Log:
hwmon/w83627ehf: Add support for W83667HG-B

Added:
   dists/sid/linux-2.6/debian/patches/features/all/hwmon-w83627ehf-Add-support-for-W83667HG-B.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/22

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Sep  5 23:51:14 2010	(r16242)
+++ dists/sid/linux-2.6/debian/changelog	Mon Sep  6 00:05:36 2010	(r16243)
@@ -36,6 +36,7 @@
     (Closes: #579017)
   * snd-hda-intel: Add support for VIA V1708S, VT1718S, VT1828S, VT2020,
     VT1716S, VT2002P, VT1812, VT1818S
+  * hwmon/w83627ehf: Add support for W83667HG-B
 
   [ Bastian Blank ]
   * Use Breaks instead of Conflicts.

Added: dists/sid/linux-2.6/debian/patches/features/all/hwmon-w83627ehf-Add-support-for-W83667HG-B.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-2.6/debian/patches/features/all/hwmon-w83627ehf-Add-support-for-W83667HG-B.patch	Mon Sep  6 00:05:36 2010	(r16243)
@@ -0,0 +1,153 @@
+From e6d045d049fa4b786f37c74982ceddf6d25e5026 Mon Sep 17 00:00:00 2001
+From: Guenter Roeck <guenter.roeck at ericsson.com>
+Date: Sat, 14 Aug 2010 21:08:55 +0200
+Subject: [PATCH] hwmon: (w83627ehf) Add support for W83667HG-B
+
+commit c39aedafb242601729bef48db052ebc055ce3ab4 upstream.
+
+Add support for W83667HG-B (very similar to the W83667HG).
+
+Signed-off-by: Guenter Roeck <guenter.roeck at ericsson.com>
+Signed-off-by: Jean Delvare <khali at linux-fr.org>
+[bwh: Backport to 2.6.32]
+---
+ Documentation/hwmon/w83627ehf |   15 ++++++++++-----
+ drivers/hwmon/w83627ehf.c     |   19 ++++++++++++++-----
+ 2 files changed, 24 insertions(+), 10 deletions(-)
+
+diff --git a/Documentation/hwmon/w83627ehf b/Documentation/hwmon/w83627ehf
+index 02b7489..e830500 100644
+--- a/Documentation/hwmon/w83627ehf
++++ b/Documentation/hwmon/w83627ehf
+@@ -20,6 +20,10 @@ Supported chips:
+     Prefix: 'w83667hg'
+     Addresses scanned: ISA address retrieved from Super I/O registers
+     Datasheet: not available
++  * Winbond W83667HG-B
++    Prefix: 'w83667hg'
++    Addresses scanned: ISA address retrieved from Super I/O registers
++    Datasheet: Available from Nuvoton upon request
+ 
+ Authors:
+         Jean Delvare <khali at linux-fr.org>
+@@ -32,8 +36,8 @@ Description
+ -----------
+ 
+ This driver implements support for the Winbond W83627EHF, W83627EHG,
+-W83627DHG, W83627DHG-P and W83667HG super I/O chips. We will refer to them
+-collectively as Winbond chips.
++W83627DHG, W83627DHG-P, W83667HG and W83667HG-B super I/O chips.
++We will refer to them collectively as Winbond chips.
+ 
+ The chips implement three temperature sensors, five fan rotation
+ speed sensors, ten analog voltage sensors (only nine for the 627DHG), one
+@@ -68,14 +72,15 @@ follows:
+ temp1 -> pwm1
+ temp2 -> pwm2
+ temp3 -> pwm3
+-prog  -> pwm4 (not on 667HG; the programmable setting is not supported by
+-	       the driver)
++prog  -> pwm4 (not on 667HG and 667HG-B; the programmable setting is not
++	       supported by the driver)
+ 
+ /sys files
+ ----------
+ 
+ name - this is a standard hwmon device entry. For the W83627EHF and W83627EHG,
+-       it is set to "w83627ehf" and for the W83627DHG it is set to "w83627dhg"
++       it is set to "w83627ehf", for the W83627DHG it is set to "w83627dhg",
++       and for the W83667HG it is set to "w83667hg".
+ 
+ pwm[1-4] - this file stores PWM duty cycle or DC value (fan speed) in range:
+ 	   0 (stop) to 255 (full)
+diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c
+index bb5e787..60417ff 100644
+--- a/drivers/hwmon/w83627ehf.c
++++ b/drivers/hwmon/w83627ehf.c
+@@ -38,6 +38,7 @@
+     w83627dhg    9      5       4       3      0xa020 0xc1    0x5ca3
+     w83627dhg-p  9      5       4       3      0xb070 0xc1    0x5ca3
+     w83667hg     9      5       3       3      0xa510 0xc1    0x5ca3
++    w83667hg-b   9      5       3       3      0xb350 0xc1    0x5ca3
+ */
+ 
+ #include <linux/module.h>
+@@ -54,7 +55,7 @@
+ #include <linux/io.h>
+ #include "lm75.h"
+ 
+-enum kinds { w83627ehf, w83627dhg, w83627dhg_p, w83667hg };
++enum kinds { w83627ehf, w83627dhg, w83627dhg_p, w83667hg, w83667hg_b };
+ 
+ /* used to set data->name = w83627ehf_device_names[data->sio_kind] */
+ static const char * w83627ehf_device_names[] = {
+@@ -62,6 +63,7 @@ static const char * w83627ehf_device_names[] = {
+ 	"w83627dhg",
+ 	"w83627dhg",
+ 	"w83667hg",
++	"w83667hg",
+ };
+ 
+ static unsigned short force_id;
+@@ -90,6 +92,7 @@ MODULE_PARM_DESC(force_id, "Override the detected device ID");
+ #define SIO_W83627DHG_ID	0xa020
+ #define SIO_W83627DHG_P_ID	0xb070
+ #define SIO_W83667HG_ID 	0xa510
++#define SIO_W83667HG_B_ID	0xb350
+ #define SIO_ID_MASK		0xFFF0
+ 
+ static inline void
+@@ -1309,10 +1312,11 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
+ 	/* 627EHG and 627EHF have 10 voltage inputs; 627DHG and 667HG have 9 */
+ 	data->in_num = (sio_data->kind == w83627ehf) ? 10 : 9;
+ 	/* 667HG has 3 pwms */
+-	data->pwm_num = (sio_data->kind == w83667hg) ? 3 : 4;
++	data->pwm_num = (sio_data->kind == w83667hg
++			 || sio_data->kind == w83667hg_b) ? 3 : 4;
+ 
+ 	/* Check temp3 configuration bit for 667HG */
+-	if (sio_data->kind == w83667hg) {
++	if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) {
+ 		data->temp3_disable = w83627ehf_read_value(data,
+ 					W83627EHF_REG_TEMP_CONFIG[1]) & 0x01;
+ 		data->in6_skip = !data->temp3_disable;
+@@ -1324,7 +1328,7 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
+ 	data->vrm = vid_which_vrm();
+ 	superio_enter(sio_data->sioreg);
+ 	/* Read VID value */
+-	if (sio_data->kind == w83667hg) {
++	if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) {
+ 		/* W83667HG has different pins for VID input and output, so
+ 		we can get the VID input values directly at logical device D
+ 		0xe3. */
+@@ -1375,7 +1379,7 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
+ 	}
+ 
+ 	/* fan4 and fan5 share some pins with the GPIO and serial flash */
+-	if (sio_data->kind == w83667hg) {
++	if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) {
+ 		fan5pin = superio_inb(sio_data->sioreg, 0x27) & 0x20;
+ 		fan4pin = superio_inb(sio_data->sioreg, 0x27) & 0x40;
+ 	} else {
+@@ -1522,6 +1526,7 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
+ 	static const char __initdata sio_name_W83627DHG[] = "W83627DHG";
+ 	static const char __initdata sio_name_W83627DHG_P[] = "W83627DHG-P";
+ 	static const char __initdata sio_name_W83667HG[] = "W83667HG";
++	static const char __initdata sio_name_W83667HG_B[] = "W83667HG-B";
+ 
+ 	u16 val;
+ 	const char *sio_name;
+@@ -1554,6 +1559,10 @@ static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
+ 		sio_data->kind = w83667hg;
+ 		sio_name = sio_name_W83667HG;
+ 		break;
++	case SIO_W83667HG_B_ID:
++		sio_data->kind = w83667hg_b;
++		sio_name = sio_name_W83667HG_B;
++		break;
+ 	default:
+ 		if (val != 0xffff)
+ 			pr_debug(DRVNAME ": unsupported chip ID: 0x%04x\n",
+-- 
+1.7.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/22
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/22	Sun Sep  5 23:51:14 2010	(r16242)
+++ dists/sid/linux-2.6/debian/patches/series/22	Mon Sep  6 00:05:36 2010	(r16243)
@@ -95,3 +95,4 @@
 + features/all/hda-via/0017-ALSA-HDA-VIA-Add-VT2002P-support.patch
 + features/all/hda-via/0018-ALSA-HDA-VIA-Add-VT1812-support.patch
 + features/all/hda-via/0019-ALSA-VIA-HDA-Add-support-for-VT1818S.patch
++ features/all/hwmon-w83627ehf-Add-support-for-W83667HG-B.patch

More information about the Kernel-svn-changes mailing list