Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1445018

[PATCH v2 7/9] hwmon: (core) Add fan attribute support to new API

Show all headers | View raw

Acked-by: Punit Agrawal <punit.agrawal@arm.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v2: No change

 drivers/hwmon/hwmon.c | 16 ++++++++++++++++
 include/linux/hwmon.h | 27 +++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c
index f5de80a8bd1e..38c217e64d41 100644
--- a/drivers/hwmon/hwmon.c
+++ b/drivers/hwmon/hwmon.c
@@ -365,6 +365,20 @@ static const char * const hwmon_humidity_attr_templates[] = {
 	[hwmon_humidity_fault] = "humidity%d_fault",
 };
 
+static const char * const hwmon_fan_attr_templates[] = {
+	[hwmon_fan_input] = "fan%d_input",
+	[hwmon_fan_label] = "fan%d_label",
+	[hwmon_fan_min] = "fan%d_min",
+	[hwmon_fan_max] = "fan%d_max",
+	[hwmon_fan_div] = "fan%d_div",
+	[hwmon_fan_pulses] = "fan%d_pulses",
+	[hwmon_fan_target] = "fan%d_target",
+	[hwmon_fan_alarm] = "fan%d_alarm",
+	[hwmon_fan_min_alarm] = "fan%d_min_alarm",
+	[hwmon_fan_max_alarm] = "fan%d_max_alarm",
+	[hwmon_fan_fault] = "fan%d_fault",
+};
+
 static const char * const *__templates[] = {
 	[hwmon_chip] = hwmon_chip_attr_templates,
 	[hwmon_temp] = hwmon_temp_attr_templates,
@@ -373,6 +387,7 @@ static const char * const *__templates[] = {
 	[hwmon_power] = hwmon_power_attr_templates,
 	[hwmon_energy] = hwmon_energy_attr_templates,
 	[hwmon_humidity] = hwmon_humidity_attr_templates,
+	[hwmon_fan] = hwmon_fan_attr_templates,
 };
 
 static const int __templates_size[] = {
@@ -383,6 +398,7 @@ static const int __templates_size[] = {
 	[hwmon_power] = ARRAY_SIZE(hwmon_power_attr_templates),
 	[hwmon_energy] = ARRAY_SIZE(hwmon_energy_attr_templates),
 	[hwmon_humidity] = ARRAY_SIZE(hwmon_humidity_attr_templates),
+	[hwmon_fan] = ARRAY_SIZE(hwmon_fan_attr_templates),
 };
 
 static int hwmon_num_channel_attrs(const struct hwmon_channel_info *info)
diff --git a/include/linux/hwmon.h b/include/linux/hwmon.h
index 57d92f1d779b..74e89d45ff67 100644
--- a/include/linux/hwmon.h
+++ b/include/linux/hwmon.h
@@ -27,6 +27,7 @@ enum hwmon_sensor_types {
 	hwmon_power,
 	hwmon_energy,
 	hwmon_humidity,
+	hwmon_fan,
 };
 
 enum hwmon_chip_attributes {
@@ -245,6 +246,32 @@ enum hwmon_humidity_attributes {
 #define HWMON_H_ALARM			BIT(hwmon_humidity_alarm)
 #define HWMON_H_FAULT			BIT(hwmon_humidity_fault)
 
+enum hwmon_fan_attributes {
+	hwmon_fan_input,
+	hwmon_fan_label,
+	hwmon_fan_min,
+	hwmon_fan_max,
+	hwmon_fan_div,
+	hwmon_fan_pulses,
+	hwmon_fan_target,
+	hwmon_fan_alarm,
+	hwmon_fan_min_alarm,
+	hwmon_fan_max_alarm,
+	hwmon_fan_fault,
+};
+
+#define HWMON_F_INPUT			BIT(hwmon_fan_input)
+#define HWMON_F_LABEL			BIT(hwmon_fan_label)
+#define HWMON_F_MIN			BIT(hwmon_fan_min)
+#define HWMON_F_MAX			BIT(hwmon_fan_max)
+#define HWMON_F_DIV			BIT(hwmon_fan_div)
+#define HWMON_F_PULSES			BIT(hwmon_fan_pulses)
+#define HWMON_F_TARGET			BIT(hwmon_fan_target)
+#define HWMON_F_ALARM			BIT(hwmon_fan_alarm)
+#define HWMON_F_MIN_ALARM		BIT(hwmon_fan_min_alarm)
+#define HWMON_F_MAX_ALARM		BIT(hwmon_fan_max_alarm)
+#define HWMON_F_FAULT			BIT(hwmon_fan_fault)
+
 /**
  * struct hwmon_ops - hwmon device operations
  * @is_visible: Callback to return attribute visibility. Mandatory.
-- 
2.5.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/9] hwmon: New hwmon registration API Guenter Roeck <linux@roeck-us.net> - 2016-07-17 07:40 +0200
  [PATCH v2 7/9] hwmon: (core) Add fan attribute support to new API Guenter Roeck <linux@roeck-us.net> - 2016-07-17 07:40 +0200
  [PATCH v2 8/9] hwmon: (core) Document new kernel API Guenter Roeck <linux@roeck-us.net> - 2016-07-17 07:40 +0200
    Re: [PATCH v2 8/9] hwmon: (core) Document new kernel API Jonathan Cameron <jic23@kernel.org> - 2016-07-24 21:20 +0200
  [PATCH v2 1/9] hwmon: (core) Order include files alphabetically Guenter Roeck <linux@roeck-us.net> - 2016-07-17 07:40 +0200
  [PATCH v2 5/9] hwmon: (core) Add power attribute support to new API Guenter Roeck <linux@roeck-us.net> - 2016-07-17 07:40 +0200
  [PATCH v2 9/9] hwmon: (core) Add basic pwm attribute support to new API Guenter Roeck <linux@roeck-us.net> - 2016-07-17 07:40 +0200
  [PATCH v2 3/9] hwmon: (core) Add voltage attribute support to new API Guenter Roeck <linux@roeck-us.net> - 2016-07-17 07:40 +0200
  [PATCH v2 6/9] hwmon: (core) Add energy and humidity attribute support to new API Guenter Roeck <linux@roeck-us.net> - 2016-07-17 07:40 +0200
  [PATCH v2 4/9] hwmon: (core) Add current attribute support to new API Guenter Roeck <linux@roeck-us.net> - 2016-07-17 07:40 +0200
  [PATCH v2 2/9] hwmon: (core) New hwmon registration API Guenter Roeck <linux@roeck-us.net> - 2016-07-17 07:40 +0200
    Re: [PATCH v2 2/9] hwmon: (core) New hwmon registration API Jonathan Cameron <jic23@kernel.org> - 2016-07-24 21:10 +0200
      Re: [PATCH v2 2/9] hwmon: (core) New hwmon registration API Guenter Roeck <linux@roeck-us.net> - 2016-07-25 05:00 +0200

csiph-web