mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Guenter Roeck <linux@roeck-us.net>
To: Jean Delvare <khali@linux-fr.org>
Cc: lm-sensors@lm-sensors.org, linux-kernel@vger.kernel.org,
	Guenter Roeck <linux@roeck-us.net>
Subject: [PATCH v5 11/12] hwmon: (nct6775) Detect and report additional temperature sources
Date: Tue, 26 Feb 2013 10:23:39 -0800	[thread overview]
Message-ID: <1361903020-18526-12-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1361903020-18526-1-git-send-email-linux@roeck-us.net>

Scan all temperature sources used for fan control and report if additional
monitoring registers are available.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 drivers/hwmon/nct6775.c |   33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/drivers/hwmon/nct6775.c b/drivers/hwmon/nct6775.c
index 50e38c6..a4b076a 100644
--- a/drivers/hwmon/nct6775.c
+++ b/drivers/hwmon/nct6775.c
@@ -3361,6 +3361,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;
@@ -3611,6 +3637,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++) {
-- 
1.7.9.7


  parent reply	other threads:[~2013-02-26 18:25 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-26 18:23 [PATCH v6 00/12] hwmon: Driver for Nuvoton NCT6775F, NCT6776F, and NCT6779D Guenter Roeck
2013-02-26 18:23 ` [PATCH v5 01/12] " Guenter Roeck
2013-02-26 18:23 ` [PATCH v5 02/12] hwmon: (nct6775) Add case open detection Guenter Roeck
2013-02-26 18:23 ` [PATCH v5 03/12] hwmon: (nct6775) Add support for temperature sensors Guenter Roeck
2013-02-26 18:35   ` Joe Perches
2013-02-26 19:41     ` Guenter Roeck
2013-02-27 17:44   ` [PATCH v6 " Guenter Roeck
2013-02-26 18:23 ` [PATCH v6 04/12] hwmon: (nct6775) Add support for fan speed attributes Guenter Roeck
2013-02-26 18:23 ` [PATCH v5 05/12] hwmon: (nct6775) Add support for fanX_pulses sysfs attribute Guenter Roeck
2013-02-26 18:23 ` [PATCH v5 06/12] hwmon: (nct6775) Add support for fan debounce module parameter Guenter Roeck
2013-02-26 18:23 ` [PATCH v5 07/12] hwmon: (nct6775) Add power management support Guenter Roeck
2013-02-26 18:23 ` [PATCH v5 08/12] hwmon: (nct6775) Add support for pwm, pwm_mode, and pwm_enable Guenter Roeck
2013-02-26 18:23 ` [PATCH v5 09/12] hwmon: (nct6775) Add support for automatic fan control Guenter Roeck
2013-02-26 18:23 ` [PATCH v5 10/12] hwmon: (nct6775) Add support for weighted " Guenter Roeck
2013-02-26 18:23 ` Guenter Roeck [this message]
2013-02-26 18:23 ` [PATCH 12/12] hwmon: (nct6775) Only report VID if supported and enabled Guenter Roeck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1361903020-18526-12-git-send-email-linux@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=khali@linux-fr.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lm-sensors@lm-sensors.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®