From a9ad39ff641a8d744268ec05bc03d253aa805151 Mon Sep 17 00:00:00 2001
From: Guenter Roeck <linux@roeck-us.net>
Date: Tue, 4 Dec 2012 08:03:37 -0800
Subject: [PATCH] --- yaml --- r: 363043 b: refs/heads/master c:
 8e9285b0bb2ab48924032147baa29699c0bbee7c h: refs/heads/master i:   363041:
 964130d8a495dfad77cf5582524f2ef754aeb4c4   363039:
 6599a4de3fd82253478378c3298370ee199d67ab v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/hwmon/nct6775.c | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d05131e06ea2..fb4ef1dee911 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bbd8decd4123648ddeba2be485bc7e1a3117bfe4
+refs/heads/master: 8e9285b0bb2ab48924032147baa29699c0bbee7c
diff --git a/trunk/drivers/hwmon/nct6775.c b/trunk/drivers/hwmon/nct6775.c
index f80ff823c28e..6d5859718113 100644
--- a/trunk/drivers/hwmon/nct6775.c
+++ b/trunk/drivers/hwmon/nct6775.c
@@ -3364,6 +3364,32 @@ nct6775_check_fan_inputs(const struct nct6775_sio_data *sio_data,
 	return 0;
 }
 
+static void add_temp_sensors(struct nct6775_data *data, const u16 *regp,
+			     int *available, int *mask)
+{
+	int i;
+	u8 src;
+
+	for (i = 0; i < data->pwm_num && *available; i++) {
+		int index;
+
+		if (!regp[i])
+			continue;
+		src = nct6775_read_value(data, regp[i]);
+		src &= 0x1f;
+		if (!src || (*mask & (1 << src)))
+			continue;
+		if (src >= data->temp_label_num ||
+		    !strlen(data->temp_label[src]))
+			continue;
+
+		index = __ffs(*available);
+		nct6775_write_value(data, data->REG_TEMP_SOURCE[index], src);
+		*available &= ~(1 << index);
+		*mask |= 1 << src;
+	}
+}
+
 static int nct6775_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -3614,6 +3640,13 @@ static int nct6775_probe(struct platform_device *pdev)
 		mask |= 1 << src;
 	}
 
+	/*
+	 * Now find unmonitored temperature registers and enable monitoring
+	 * if additional monitoring registers are available.
+	 */
+	add_temp_sensors(data, data->REG_TEMP_SEL, &available, &mask);
+	add_temp_sensors(data, data->REG_WEIGHT_TEMP_SEL, &available, &mask);
+
 	mask = 0;
 	s = NUM_TEMP_FIXED;	/* First dynamic temperature attribute */
 	for (i = 0; i < num_reg_temp; i++) {