2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* pc87360.c - Part of lm_sensors, Linux kernel modules
|
|
|
|
* for hardware monitoring
|
2007-06-09 08:11:16 -06:00
|
|
|
* Copyright (C) 2004, 2007 Jean Delvare <khali@linux-fr.org>
|
2005-04-16 16:20:36 -06:00
|
|
|
*
|
|
|
|
* Copied from smsc47m1.c:
|
|
|
|
* Copyright (C) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
*
|
|
|
|
* Supports the following chips:
|
|
|
|
*
|
|
|
|
* Chip #vin #fan #pwm #temp devid
|
|
|
|
* PC87360 - 2 2 - 0xE1
|
|
|
|
* PC87363 - 2 2 - 0xE8
|
|
|
|
* PC87364 - 3 3 - 0xE4
|
|
|
|
* PC87365 11 3 3 2 0xE5
|
|
|
|
* PC87366 11 3 3 3-4 0xE9
|
|
|
|
*
|
|
|
|
* This driver assumes that no more than one chip is present, and one of
|
|
|
|
* the standard Super-I/O addresses is used (0x2E/0x2F or 0x4E/0x4F).
|
|
|
|
*/
|
|
|
|
|
2011-01-12 13:55:11 -07:00
|
|
|
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/slab.h>
|
|
|
|
#include <linux/jiffies.h>
|
2007-06-09 08:11:16 -06:00
|
|
|
#include <linux/platform_device.h>
|
2005-07-15 19:39:18 -06:00
|
|
|
#include <linux/hwmon.h>
|
2005-09-02 14:52:43 -06:00
|
|
|
#include <linux/hwmon-sysfs.h>
|
2005-07-31 13:52:01 -06:00
|
|
|
#include <linux/hwmon-vid.h>
|
2005-07-15 19:39:18 -06:00
|
|
|
#include <linux/err.h>
|
2006-01-18 15:19:26 -07:00
|
|
|
#include <linux/mutex.h>
|
2009-01-07 08:37:35 -07:00
|
|
|
#include <linux/acpi.h>
|
2009-09-15 09:18:13 -06:00
|
|
|
#include <linux/io.h>
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
static u8 devid;
|
2007-06-09 08:11:16 -06:00
|
|
|
static struct platform_device *pdev;
|
[PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (5/9)
Call the ISA chip drivers detection function directly instead of relying
on i2c_detect. The net effect is that address lists won't be handled
anymore, but they were mostly useless in the ISA case anyway (pc87360,
smsc47m1, smsc47b397 had already dropped them).
We don't need to handle multiple devices, all we may need is a way to
force a given address instead of the original one (some drivers already
do: sis5595, via686a, w83627hf), and, for drivers supporting multiple
chips, a way to force one given kind. All this may be added later on
demand, but I actually don't think there will be much demand.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-07-19 15:56:35 -06:00
|
|
|
static unsigned short extra_isa[3];
|
2005-04-16 16:20:36 -06:00
|
|
|
static u8 confreg[4];
|
|
|
|
|
|
|
|
static int init = 1;
|
|
|
|
module_param(init, int, 0);
|
|
|
|
MODULE_PARM_DESC(init,
|
2012-01-14 22:49:53 -07:00
|
|
|
"Chip initialization level:\n"
|
|
|
|
" 0: None\n"
|
|
|
|
"*1: Forcibly enable internal voltage and temperature channels, except in9\n"
|
|
|
|
" 2: Forcibly enable all voltage and temperature channels, except in9\n"
|
|
|
|
" 3: Forcibly enable all voltage and temperature channels, including in9");
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2007-12-06 15:13:42 -07:00
|
|
|
static unsigned short force_id;
|
|
|
|
module_param(force_id, ushort, 0);
|
|
|
|
MODULE_PARM_DESC(force_id, "Override the detected device ID");
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* Super-I/O registers and operations
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define DEV 0x07 /* Register: Logical device select */
|
|
|
|
#define DEVID 0x20 /* Register: Device ID */
|
|
|
|
#define ACT 0x30 /* Register: Device activation */
|
|
|
|
#define BASE 0x60 /* Register: Base address */
|
|
|
|
|
|
|
|
#define FSCM 0x09 /* Logical device: fans */
|
|
|
|
#define VLM 0x0d /* Logical device: voltages */
|
|
|
|
#define TMS 0x0e /* Logical device: temperatures */
|
2008-10-18 21:27:33 -06:00
|
|
|
#define LDNI_MAX 3
|
|
|
|
static const u8 logdev[LDNI_MAX] = { FSCM, VLM, TMS };
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
#define LD_FAN 0
|
|
|
|
#define LD_IN 1
|
|
|
|
#define LD_TEMP 2
|
|
|
|
|
|
|
|
static inline void superio_outb(int sioaddr, int reg, int val)
|
|
|
|
{
|
|
|
|
outb(reg, sioaddr);
|
2012-01-14 22:49:53 -07:00
|
|
|
outb(val, sioaddr + 1);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int superio_inb(int sioaddr, int reg)
|
|
|
|
{
|
|
|
|
outb(reg, sioaddr);
|
2012-01-14 22:49:53 -07:00
|
|
|
return inb(sioaddr + 1);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void superio_exit(int sioaddr)
|
|
|
|
{
|
|
|
|
outb(0x02, sioaddr);
|
2012-01-14 22:49:53 -07:00
|
|
|
outb(0x02, sioaddr + 1);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Logical devices
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define PC87360_EXTENT 0x10
|
|
|
|
#define PC87365_REG_BANK 0x09
|
|
|
|
#define NO_BANK 0xff
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Fan registers and conversions
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* nr has to be 0 or 1 (PC87360/87363) or 2 (PC87364/87365/87366) */
|
|
|
|
#define PC87360_REG_PRESCALE(nr) (0x00 + 2 * (nr))
|
|
|
|
#define PC87360_REG_PWM(nr) (0x01 + 2 * (nr))
|
|
|
|
#define PC87360_REG_FAN_MIN(nr) (0x06 + 3 * (nr))
|
|
|
|
#define PC87360_REG_FAN(nr) (0x07 + 3 * (nr))
|
|
|
|
#define PC87360_REG_FAN_STATUS(nr) (0x08 + 3 * (nr))
|
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
#define FAN_FROM_REG(val, div) ((val) == 0 ? 0 : \
|
|
|
|
480000 / ((val) * (div)))
|
|
|
|
#define FAN_TO_REG(val, div) ((val) <= 100 ? 0 : \
|
|
|
|
480000 / ((val) * (div)))
|
|
|
|
#define FAN_DIV_FROM_REG(val) (1 << (((val) >> 5) & 0x03))
|
2005-04-16 16:20:36 -06:00
|
|
|
#define FAN_STATUS_FROM_REG(val) ((val) & 0x07)
|
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
#define FAN_CONFIG_MONITOR(val, nr) (((val) >> (2 + (nr) * 3)) & 1)
|
|
|
|
#define FAN_CONFIG_CONTROL(val, nr) (((val) >> (3 + (nr) * 3)) & 1)
|
|
|
|
#define FAN_CONFIG_INVERT(val, nr) (((val) >> (4 + (nr) * 3)) & 1)
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
#define PWM_FROM_REG(val, inv) ((inv) ? 255 - (val) : (val))
|
2005-04-16 16:20:36 -06:00
|
|
|
static inline u8 PWM_TO_REG(int val, int inv)
|
|
|
|
{
|
|
|
|
if (inv)
|
|
|
|
val = 255 - val;
|
|
|
|
if (val < 0)
|
|
|
|
return 0;
|
|
|
|
if (val > 255)
|
|
|
|
return 255;
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Voltage registers and conversions
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define PC87365_REG_IN_CONVRATE 0x07
|
|
|
|
#define PC87365_REG_IN_CONFIG 0x08
|
|
|
|
#define PC87365_REG_IN 0x0B
|
|
|
|
#define PC87365_REG_IN_MIN 0x0D
|
|
|
|
#define PC87365_REG_IN_MAX 0x0C
|
|
|
|
#define PC87365_REG_IN_STATUS 0x0A
|
|
|
|
#define PC87365_REG_IN_ALARMS1 0x00
|
|
|
|
#define PC87365_REG_IN_ALARMS2 0x01
|
|
|
|
#define PC87365_REG_VID 0x06
|
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
#define IN_FROM_REG(val, ref) (((val) * (ref) + 128) / 256)
|
|
|
|
#define IN_TO_REG(val, ref) ((val) < 0 ? 0 : \
|
|
|
|
(val) * 256 >= (ref) * 255 ? 255 : \
|
|
|
|
((val) * 256 + (ref) / 2) / (ref))
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Temperature registers and conversions
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define PC87365_REG_TEMP_CONFIG 0x08
|
|
|
|
#define PC87365_REG_TEMP 0x0B
|
|
|
|
#define PC87365_REG_TEMP_MIN 0x0D
|
|
|
|
#define PC87365_REG_TEMP_MAX 0x0C
|
|
|
|
#define PC87365_REG_TEMP_CRIT 0x0E
|
|
|
|
#define PC87365_REG_TEMP_STATUS 0x0A
|
|
|
|
#define PC87365_REG_TEMP_ALARMS 0x00
|
|
|
|
|
|
|
|
#define TEMP_FROM_REG(val) ((val) * 1000)
|
|
|
|
#define TEMP_TO_REG(val) ((val) < -55000 ? -55 : \
|
|
|
|
(val) > 127000 ? 127 : \
|
|
|
|
(val) < 0 ? ((val) - 500) / 1000 : \
|
|
|
|
((val) + 500) / 1000)
|
|
|
|
|
|
|
|
/*
|
2007-06-09 08:11:16 -06:00
|
|
|
* Device data
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
|
|
|
|
|
|
|
struct pc87360_data {
|
2007-06-09 08:11:16 -06:00
|
|
|
const char *name;
|
2007-08-20 14:46:20 -06:00
|
|
|
struct device *hwmon_dev;
|
2006-01-18 15:19:26 -07:00
|
|
|
struct mutex lock;
|
|
|
|
struct mutex update_lock;
|
2005-04-16 16:20:36 -06:00
|
|
|
char valid; /* !=0 if following fields are valid */
|
|
|
|
unsigned long last_updated; /* In jiffies */
|
|
|
|
|
|
|
|
int address[3];
|
|
|
|
|
|
|
|
u8 fannr, innr, tempnr;
|
|
|
|
|
|
|
|
u8 fan[3]; /* Register value */
|
|
|
|
u8 fan_min[3]; /* Register value */
|
|
|
|
u8 fan_status[3]; /* Register value */
|
|
|
|
u8 pwm[3]; /* Register value */
|
|
|
|
u16 fan_conf; /* Configuration register values, combined */
|
|
|
|
|
|
|
|
u16 in_vref; /* 1 mV/bit */
|
|
|
|
u8 in[14]; /* Register value */
|
|
|
|
u8 in_min[14]; /* Register value */
|
|
|
|
u8 in_max[14]; /* Register value */
|
|
|
|
u8 in_crit[3]; /* Register value */
|
|
|
|
u8 in_status[14]; /* Register value */
|
|
|
|
u16 in_alarms; /* Register values, combined, masked */
|
|
|
|
u8 vid_conf; /* Configuration register value */
|
|
|
|
u8 vrm;
|
|
|
|
u8 vid; /* Register value */
|
|
|
|
|
|
|
|
s8 temp[3]; /* Register value */
|
|
|
|
s8 temp_min[3]; /* Register value */
|
|
|
|
s8 temp_max[3]; /* Register value */
|
|
|
|
s8 temp_crit[3]; /* Register value */
|
|
|
|
u8 temp_status[3]; /* Register value */
|
|
|
|
u8 temp_alarms; /* Register value, masked */
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Functions declaration
|
|
|
|
*/
|
|
|
|
|
2007-06-09 08:11:16 -06:00
|
|
|
static int pc87360_probe(struct platform_device *pdev);
|
2012-11-19 11:25:51 -07:00
|
|
|
static int pc87360_remove(struct platform_device *pdev);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
static int pc87360_read_value(struct pc87360_data *data, u8 ldi, u8 bank,
|
|
|
|
u8 reg);
|
|
|
|
static void pc87360_write_value(struct pc87360_data *data, u8 ldi, u8 bank,
|
|
|
|
u8 reg, u8 value);
|
2007-06-09 08:11:16 -06:00
|
|
|
static void pc87360_init_device(struct platform_device *pdev,
|
|
|
|
int use_thermistors);
|
2005-04-16 16:20:36 -06:00
|
|
|
static struct pc87360_data *pc87360_update_device(struct device *dev);
|
|
|
|
|
|
|
|
/*
|
2007-06-09 08:11:16 -06:00
|
|
|
* Driver data
|
2005-04-16 16:20:36 -06:00
|
|
|
*/
|
|
|
|
|
2007-06-09 08:11:16 -06:00
|
|
|
static struct platform_driver pc87360_driver = {
|
2005-11-26 12:37:41 -07:00
|
|
|
.driver = {
|
2006-09-03 14:36:14 -06:00
|
|
|
.owner = THIS_MODULE,
|
2005-11-26 12:37:41 -07:00
|
|
|
.name = "pc87360",
|
|
|
|
},
|
2007-06-09 08:11:16 -06:00
|
|
|
.probe = pc87360_probe,
|
2012-11-19 11:21:20 -07:00
|
|
|
.remove = pc87360_remove,
|
2005-04-16 16:20:36 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Sysfs stuff
|
|
|
|
*/
|
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_fan_input(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan[attr->index],
|
|
|
|
FAN_DIV_FROM_REG(data->fan_status[attr->index])));
|
2005-09-02 14:52:43 -06:00
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_fan_min(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
return sprintf(buf, "%u\n", FAN_FROM_REG(data->fan_min[attr->index],
|
|
|
|
FAN_DIV_FROM_REG(data->fan_status[attr->index])));
|
2005-09-02 14:52:43 -06:00
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_fan_div(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
return sprintf(buf, "%u\n",
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
FAN_DIV_FROM_REG(data->fan_status[attr->index]));
|
2005-09-02 14:52:43 -06:00
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_fan_status(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
return sprintf(buf, "%u\n",
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
FAN_STATUS_FROM_REG(data->fan_status[attr->index]));
|
2005-09-02 14:52:43 -06:00
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t set_fan_min(struct device *dev,
|
|
|
|
struct device_attribute *devattr, const char *buf,
|
2005-09-02 14:52:43 -06:00
|
|
|
size_t count)
|
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2012-01-14 22:49:53 -07:00
|
|
|
long fan_min;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = kstrtol(buf, 10, &fan_min);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2005-09-02 15:05:07 -06:00
|
|
|
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_lock(&data->update_lock);
|
2012-01-14 22:49:53 -07:00
|
|
|
fan_min = FAN_TO_REG(fan_min,
|
|
|
|
FAN_DIV_FROM_REG(data->fan_status[attr->index]));
|
2005-09-02 15:05:07 -06:00
|
|
|
|
|
|
|
/* If it wouldn't fit, change clock divisor */
|
|
|
|
while (fan_min > 255
|
|
|
|
&& (data->fan_status[attr->index] & 0x60) != 0x60) {
|
|
|
|
fan_min >>= 1;
|
|
|
|
data->fan[attr->index] >>= 1;
|
|
|
|
data->fan_status[attr->index] += 0x20;
|
|
|
|
}
|
|
|
|
data->fan_min[attr->index] = fan_min > 255 ? 255 : fan_min;
|
2012-01-14 22:49:53 -07:00
|
|
|
pc87360_write_value(data, LD_FAN, NO_BANK,
|
|
|
|
PC87360_REG_FAN_MIN(attr->index),
|
2005-09-02 15:05:07 -06:00
|
|
|
data->fan_min[attr->index]);
|
|
|
|
|
|
|
|
/* Write new divider, preserve alarm bits */
|
2012-01-14 22:49:53 -07:00
|
|
|
pc87360_write_value(data, LD_FAN, NO_BANK,
|
|
|
|
PC87360_REG_FAN_STATUS(attr->index),
|
2005-09-02 15:05:07 -06:00
|
|
|
data->fan_status[attr->index] & 0xF9);
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_unlock(&data->update_lock);
|
2005-09-02 15:05:07 -06:00
|
|
|
|
|
|
|
return count;
|
2005-09-02 14:52:43 -06:00
|
|
|
}
|
|
|
|
|
2006-01-09 15:24:41 -07:00
|
|
|
static struct sensor_device_attribute fan_input[] = {
|
|
|
|
SENSOR_ATTR(fan1_input, S_IRUGO, show_fan_input, NULL, 0),
|
|
|
|
SENSOR_ATTR(fan2_input, S_IRUGO, show_fan_input, NULL, 1),
|
|
|
|
SENSOR_ATTR(fan3_input, S_IRUGO, show_fan_input, NULL, 2),
|
|
|
|
};
|
|
|
|
static struct sensor_device_attribute fan_status[] = {
|
|
|
|
SENSOR_ATTR(fan1_status, S_IRUGO, show_fan_status, NULL, 0),
|
|
|
|
SENSOR_ATTR(fan2_status, S_IRUGO, show_fan_status, NULL, 1),
|
|
|
|
SENSOR_ATTR(fan3_status, S_IRUGO, show_fan_status, NULL, 2),
|
|
|
|
};
|
|
|
|
static struct sensor_device_attribute fan_div[] = {
|
|
|
|
SENSOR_ATTR(fan1_div, S_IRUGO, show_fan_div, NULL, 0),
|
|
|
|
SENSOR_ATTR(fan2_div, S_IRUGO, show_fan_div, NULL, 1),
|
|
|
|
SENSOR_ATTR(fan3_div, S_IRUGO, show_fan_div, NULL, 2),
|
|
|
|
};
|
|
|
|
static struct sensor_device_attribute fan_min[] = {
|
|
|
|
SENSOR_ATTR(fan1_min, S_IWUSR | S_IRUGO, show_fan_min, set_fan_min, 0),
|
|
|
|
SENSOR_ATTR(fan2_min, S_IWUSR | S_IRUGO, show_fan_min, set_fan_min, 1),
|
|
|
|
SENSOR_ATTR(fan3_min, S_IWUSR | S_IRUGO, show_fan_min, set_fan_min, 2),
|
|
|
|
};
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2012-01-19 21:50:57 -07:00
|
|
|
#define FAN_UNIT_ATTRS(X) \
|
|
|
|
{ &fan_input[X].dev_attr.attr, \
|
2006-09-24 13:02:44 -06:00
|
|
|
&fan_status[X].dev_attr.attr, \
|
|
|
|
&fan_div[X].dev_attr.attr, \
|
2012-01-19 21:50:57 -07:00
|
|
|
&fan_min[X].dev_attr.attr, \
|
|
|
|
NULL \
|
|
|
|
}
|
2006-09-24 13:02:44 -06:00
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_pwm(struct device *dev, struct device_attribute *devattr,
|
|
|
|
char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
return sprintf(buf, "%u\n",
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
PWM_FROM_REG(data->pwm[attr->index],
|
2005-09-02 14:52:43 -06:00
|
|
|
FAN_CONFIG_INVERT(data->fan_conf,
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
attr->index)));
|
2005-09-02 14:52:43 -06:00
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t set_pwm(struct device *dev, struct device_attribute *devattr,
|
|
|
|
const char *buf, size_t count)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2012-01-14 22:49:53 -07:00
|
|
|
long val;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = kstrtol(buf, 10, &val);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2005-09-02 14:52:43 -06:00
|
|
|
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_lock(&data->update_lock);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
data->pwm[attr->index] = PWM_TO_REG(val,
|
|
|
|
FAN_CONFIG_INVERT(data->fan_conf, attr->index));
|
|
|
|
pc87360_write_value(data, LD_FAN, NO_BANK, PC87360_REG_PWM(attr->index),
|
|
|
|
data->pwm[attr->index]);
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_unlock(&data->update_lock);
|
2005-09-02 14:52:43 -06:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2006-01-09 15:24:41 -07:00
|
|
|
static struct sensor_device_attribute pwm[] = {
|
|
|
|
SENSOR_ATTR(pwm1, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 0),
|
|
|
|
SENSOR_ATTR(pwm2, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 1),
|
|
|
|
SENSOR_ATTR(pwm3, S_IWUSR | S_IRUGO, show_pwm, set_pwm, 2),
|
|
|
|
};
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2012-01-19 21:50:57 -07:00
|
|
|
static struct attribute *pc8736x_fan_attr[][5] = {
|
2006-09-24 13:02:44 -06:00
|
|
|
FAN_UNIT_ATTRS(0),
|
|
|
|
FAN_UNIT_ATTRS(1),
|
2012-01-19 21:50:57 -07:00
|
|
|
FAN_UNIT_ATTRS(2)
|
2006-09-24 13:02:44 -06:00
|
|
|
};
|
2012-01-19 21:50:57 -07:00
|
|
|
|
|
|
|
static const struct attribute_group pc8736x_fan_attr_group[] = {
|
|
|
|
{ .attrs = pc8736x_fan_attr[0], },
|
|
|
|
{ .attrs = pc8736x_fan_attr[1], },
|
|
|
|
{ .attrs = pc8736x_fan_attr[2], },
|
2006-09-24 13:02:44 -06:00
|
|
|
};
|
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_in_input(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
return sprintf(buf, "%u\n", IN_FROM_REG(data->in[attr->index],
|
|
|
|
data->in_vref));
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_in_min(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[attr->index],
|
|
|
|
data->in_vref));
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_in_max(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[attr->index],
|
|
|
|
data->in_vref));
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_in_status(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
return sprintf(buf, "%u\n", data->in_status[attr->index]);
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t set_in_min(struct device *dev, struct device_attribute *devattr,
|
|
|
|
const char *buf, size_t count)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2012-01-14 22:49:53 -07:00
|
|
|
long val;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = kstrtol(buf, 10, &val);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2005-09-02 14:52:43 -06:00
|
|
|
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_lock(&data->update_lock);
|
2005-09-02 14:52:43 -06:00
|
|
|
data->in_min[attr->index] = IN_TO_REG(val, data->in_vref);
|
|
|
|
pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_IN_MIN,
|
|
|
|
data->in_min[attr->index]);
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_unlock(&data->update_lock);
|
2005-09-02 14:52:43 -06:00
|
|
|
return count;
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t set_in_max(struct device *dev, struct device_attribute *devattr,
|
|
|
|
const char *buf, size_t count)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2012-01-14 22:49:53 -07:00
|
|
|
long val;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = kstrtol(buf, 10, &val);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2005-09-02 14:52:43 -06:00
|
|
|
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_lock(&data->update_lock);
|
2005-09-02 14:52:43 -06:00
|
|
|
data->in_max[attr->index] = IN_TO_REG(val,
|
|
|
|
data->in_vref);
|
|
|
|
pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_IN_MAX,
|
|
|
|
data->in_max[attr->index]);
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_unlock(&data->update_lock);
|
2005-09-02 14:52:43 -06:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2006-01-09 15:24:41 -07:00
|
|
|
static struct sensor_device_attribute in_input[] = {
|
|
|
|
SENSOR_ATTR(in0_input, S_IRUGO, show_in_input, NULL, 0),
|
|
|
|
SENSOR_ATTR(in1_input, S_IRUGO, show_in_input, NULL, 1),
|
|
|
|
SENSOR_ATTR(in2_input, S_IRUGO, show_in_input, NULL, 2),
|
|
|
|
SENSOR_ATTR(in3_input, S_IRUGO, show_in_input, NULL, 3),
|
|
|
|
SENSOR_ATTR(in4_input, S_IRUGO, show_in_input, NULL, 4),
|
|
|
|
SENSOR_ATTR(in5_input, S_IRUGO, show_in_input, NULL, 5),
|
|
|
|
SENSOR_ATTR(in6_input, S_IRUGO, show_in_input, NULL, 6),
|
|
|
|
SENSOR_ATTR(in7_input, S_IRUGO, show_in_input, NULL, 7),
|
|
|
|
SENSOR_ATTR(in8_input, S_IRUGO, show_in_input, NULL, 8),
|
|
|
|
SENSOR_ATTR(in9_input, S_IRUGO, show_in_input, NULL, 9),
|
|
|
|
SENSOR_ATTR(in10_input, S_IRUGO, show_in_input, NULL, 10),
|
|
|
|
};
|
|
|
|
static struct sensor_device_attribute in_status[] = {
|
|
|
|
SENSOR_ATTR(in0_status, S_IRUGO, show_in_status, NULL, 0),
|
|
|
|
SENSOR_ATTR(in1_status, S_IRUGO, show_in_status, NULL, 1),
|
|
|
|
SENSOR_ATTR(in2_status, S_IRUGO, show_in_status, NULL, 2),
|
|
|
|
SENSOR_ATTR(in3_status, S_IRUGO, show_in_status, NULL, 3),
|
|
|
|
SENSOR_ATTR(in4_status, S_IRUGO, show_in_status, NULL, 4),
|
|
|
|
SENSOR_ATTR(in5_status, S_IRUGO, show_in_status, NULL, 5),
|
|
|
|
SENSOR_ATTR(in6_status, S_IRUGO, show_in_status, NULL, 6),
|
|
|
|
SENSOR_ATTR(in7_status, S_IRUGO, show_in_status, NULL, 7),
|
|
|
|
SENSOR_ATTR(in8_status, S_IRUGO, show_in_status, NULL, 8),
|
|
|
|
SENSOR_ATTR(in9_status, S_IRUGO, show_in_status, NULL, 9),
|
|
|
|
SENSOR_ATTR(in10_status, S_IRUGO, show_in_status, NULL, 10),
|
|
|
|
};
|
|
|
|
static struct sensor_device_attribute in_min[] = {
|
|
|
|
SENSOR_ATTR(in0_min, S_IWUSR | S_IRUGO, show_in_min, set_in_min, 0),
|
|
|
|
SENSOR_ATTR(in1_min, S_IWUSR | S_IRUGO, show_in_min, set_in_min, 1),
|
|
|
|
SENSOR_ATTR(in2_min, S_IWUSR | S_IRUGO, show_in_min, set_in_min, 2),
|
|
|
|
SENSOR_ATTR(in3_min, S_IWUSR | S_IRUGO, show_in_min, set_in_min, 3),
|
|
|
|
SENSOR_ATTR(in4_min, S_IWUSR | S_IRUGO, show_in_min, set_in_min, 4),
|
|
|
|
SENSOR_ATTR(in5_min, S_IWUSR | S_IRUGO, show_in_min, set_in_min, 5),
|
|
|
|
SENSOR_ATTR(in6_min, S_IWUSR | S_IRUGO, show_in_min, set_in_min, 6),
|
|
|
|
SENSOR_ATTR(in7_min, S_IWUSR | S_IRUGO, show_in_min, set_in_min, 7),
|
|
|
|
SENSOR_ATTR(in8_min, S_IWUSR | S_IRUGO, show_in_min, set_in_min, 8),
|
|
|
|
SENSOR_ATTR(in9_min, S_IWUSR | S_IRUGO, show_in_min, set_in_min, 9),
|
|
|
|
SENSOR_ATTR(in10_min, S_IWUSR | S_IRUGO, show_in_min, set_in_min, 10),
|
|
|
|
};
|
|
|
|
static struct sensor_device_attribute in_max[] = {
|
|
|
|
SENSOR_ATTR(in0_max, S_IWUSR | S_IRUGO, show_in_max, set_in_max, 0),
|
|
|
|
SENSOR_ATTR(in1_max, S_IWUSR | S_IRUGO, show_in_max, set_in_max, 1),
|
|
|
|
SENSOR_ATTR(in2_max, S_IWUSR | S_IRUGO, show_in_max, set_in_max, 2),
|
|
|
|
SENSOR_ATTR(in3_max, S_IWUSR | S_IRUGO, show_in_max, set_in_max, 3),
|
|
|
|
SENSOR_ATTR(in4_max, S_IWUSR | S_IRUGO, show_in_max, set_in_max, 4),
|
|
|
|
SENSOR_ATTR(in5_max, S_IWUSR | S_IRUGO, show_in_max, set_in_max, 5),
|
|
|
|
SENSOR_ATTR(in6_max, S_IWUSR | S_IRUGO, show_in_max, set_in_max, 6),
|
|
|
|
SENSOR_ATTR(in7_max, S_IWUSR | S_IRUGO, show_in_max, set_in_max, 7),
|
|
|
|
SENSOR_ATTR(in8_max, S_IWUSR | S_IRUGO, show_in_max, set_in_max, 8),
|
|
|
|
SENSOR_ATTR(in9_max, S_IWUSR | S_IRUGO, show_in_max, set_in_max, 9),
|
|
|
|
SENSOR_ATTR(in10_max, S_IWUSR | S_IRUGO, show_in_max, set_in_max, 10),
|
|
|
|
};
|
2005-04-16 16:20:36 -06:00
|
|
|
|
hwmon/pc87360 separate alarm files: define some constants
Bring hwmon/pc87360 into agreement with
Documentation/hwmon/sysfs-interface.
Patchset adds separate limit alarms for voltages and temps, it also adds
temp[123]_fault files. On my Soekris, temps 1,2 are unused/unconnected,
so temp[123]_fault = 1,1,0 respectively. This agrees with
/usr/bin/sensors, which has always shown them as OPEN. Temps 4,5,6 are
thermistor based, and dont have a fault bit in their status register.
This patch:
2 different kinds of constants added:
- CHAN_ALM_* constants for (later) vin, temp alarm callbacks.
- CHAN_* conversion constants, used in _init_device, partly for RW1C bits
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-18 21:27:30 -06:00
|
|
|
/* (temp & vin) channel status register alarm bits (pdf sec.11.5.12) */
|
|
|
|
#define CHAN_ALM_MIN 0x02 /* min limit crossed */
|
|
|
|
#define CHAN_ALM_MAX 0x04 /* max limit exceeded */
|
|
|
|
#define TEMP_ALM_CRIT 0x08 /* temp crit exceeded (temp only) */
|
|
|
|
|
2012-01-19 12:02:22 -07:00
|
|
|
/*
|
|
|
|
* show_in_min/max_alarm() reads data from the per-channel status
|
|
|
|
* register (sec 11.5.12), not the vin event status registers (sec
|
|
|
|
* 11.5.2) that (legacy) show_in_alarm() resds (via data->in_alarms)
|
|
|
|
*/
|
2008-10-18 21:27:32 -06:00
|
|
|
|
|
|
|
static ssize_t show_in_min_alarm(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
|
|
|
{
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
unsigned nr = to_sensor_dev_attr(devattr)->index;
|
|
|
|
|
|
|
|
return sprintf(buf, "%u\n", !!(data->in_status[nr] & CHAN_ALM_MIN));
|
|
|
|
}
|
|
|
|
static ssize_t show_in_max_alarm(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
|
|
|
{
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
unsigned nr = to_sensor_dev_attr(devattr)->index;
|
|
|
|
|
|
|
|
return sprintf(buf, "%u\n", !!(data->in_status[nr] & CHAN_ALM_MAX));
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct sensor_device_attribute in_min_alarm[] = {
|
|
|
|
SENSOR_ATTR(in0_min_alarm, S_IRUGO, show_in_min_alarm, NULL, 0),
|
|
|
|
SENSOR_ATTR(in1_min_alarm, S_IRUGO, show_in_min_alarm, NULL, 1),
|
|
|
|
SENSOR_ATTR(in2_min_alarm, S_IRUGO, show_in_min_alarm, NULL, 2),
|
|
|
|
SENSOR_ATTR(in3_min_alarm, S_IRUGO, show_in_min_alarm, NULL, 3),
|
|
|
|
SENSOR_ATTR(in4_min_alarm, S_IRUGO, show_in_min_alarm, NULL, 4),
|
|
|
|
SENSOR_ATTR(in5_min_alarm, S_IRUGO, show_in_min_alarm, NULL, 5),
|
|
|
|
SENSOR_ATTR(in6_min_alarm, S_IRUGO, show_in_min_alarm, NULL, 6),
|
|
|
|
SENSOR_ATTR(in7_min_alarm, S_IRUGO, show_in_min_alarm, NULL, 7),
|
|
|
|
SENSOR_ATTR(in8_min_alarm, S_IRUGO, show_in_min_alarm, NULL, 8),
|
|
|
|
SENSOR_ATTR(in9_min_alarm, S_IRUGO, show_in_min_alarm, NULL, 9),
|
|
|
|
SENSOR_ATTR(in10_min_alarm, S_IRUGO, show_in_min_alarm, NULL, 10),
|
|
|
|
};
|
|
|
|
static struct sensor_device_attribute in_max_alarm[] = {
|
|
|
|
SENSOR_ATTR(in0_max_alarm, S_IRUGO, show_in_max_alarm, NULL, 0),
|
|
|
|
SENSOR_ATTR(in1_max_alarm, S_IRUGO, show_in_max_alarm, NULL, 1),
|
|
|
|
SENSOR_ATTR(in2_max_alarm, S_IRUGO, show_in_max_alarm, NULL, 2),
|
|
|
|
SENSOR_ATTR(in3_max_alarm, S_IRUGO, show_in_max_alarm, NULL, 3),
|
|
|
|
SENSOR_ATTR(in4_max_alarm, S_IRUGO, show_in_max_alarm, NULL, 4),
|
|
|
|
SENSOR_ATTR(in5_max_alarm, S_IRUGO, show_in_max_alarm, NULL, 5),
|
|
|
|
SENSOR_ATTR(in6_max_alarm, S_IRUGO, show_in_max_alarm, NULL, 6),
|
|
|
|
SENSOR_ATTR(in7_max_alarm, S_IRUGO, show_in_max_alarm, NULL, 7),
|
|
|
|
SENSOR_ATTR(in8_max_alarm, S_IRUGO, show_in_max_alarm, NULL, 8),
|
|
|
|
SENSOR_ATTR(in9_max_alarm, S_IRUGO, show_in_max_alarm, NULL, 9),
|
|
|
|
SENSOR_ATTR(in10_max_alarm, S_IRUGO, show_in_max_alarm, NULL, 10),
|
|
|
|
};
|
|
|
|
|
2006-09-24 13:02:44 -06:00
|
|
|
#define VIN_UNIT_ATTRS(X) \
|
|
|
|
&in_input[X].dev_attr.attr, \
|
|
|
|
&in_status[X].dev_attr.attr, \
|
|
|
|
&in_min[X].dev_attr.attr, \
|
2008-10-18 21:27:32 -06:00
|
|
|
&in_max[X].dev_attr.attr, \
|
|
|
|
&in_min_alarm[X].dev_attr.attr, \
|
|
|
|
&in_max_alarm[X].dev_attr.attr
|
2006-09-24 13:02:44 -06:00
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_vid(struct device *dev, struct device_attribute *attr,
|
|
|
|
char *buf)
|
2006-09-24 13:01:56 -06:00
|
|
|
{
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
return sprintf(buf, "%u\n", vid_from_reg(data->vid, data->vrm));
|
|
|
|
}
|
|
|
|
static DEVICE_ATTR(cpu0_vid, S_IRUGO, show_vid, NULL);
|
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_vrm(struct device *dev, struct device_attribute *attr,
|
|
|
|
char *buf)
|
2006-09-24 13:01:56 -06:00
|
|
|
{
|
2007-10-08 10:24:35 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2006-09-24 13:01:56 -06:00
|
|
|
return sprintf(buf, "%u\n", data->vrm);
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t set_vrm(struct device *dev, struct device_attribute *attr,
|
|
|
|
const char *buf, size_t count)
|
2006-09-24 13:01:56 -06:00
|
|
|
{
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2012-01-14 22:49:53 -07:00
|
|
|
unsigned long val;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = kstrtoul(buf, 10, &val);
|
|
|
|
if (err)
|
|
|
|
return err;
|
|
|
|
|
|
|
|
data->vrm = val;
|
2006-09-24 13:01:56 -06:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
static DEVICE_ATTR(vrm, S_IRUGO | S_IWUSR, show_vrm, set_vrm);
|
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_in_alarms(struct device *dev,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2006-09-24 13:01:56 -06:00
|
|
|
{
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
return sprintf(buf, "%u\n", data->in_alarms);
|
|
|
|
}
|
|
|
|
static DEVICE_ATTR(alarms_in, S_IRUGO, show_in_alarms, NULL);
|
|
|
|
|
2006-09-24 13:02:44 -06:00
|
|
|
static struct attribute *pc8736x_vin_attr_array[] = {
|
|
|
|
VIN_UNIT_ATTRS(0),
|
|
|
|
VIN_UNIT_ATTRS(1),
|
|
|
|
VIN_UNIT_ATTRS(2),
|
|
|
|
VIN_UNIT_ATTRS(3),
|
|
|
|
VIN_UNIT_ATTRS(4),
|
|
|
|
VIN_UNIT_ATTRS(5),
|
|
|
|
VIN_UNIT_ATTRS(6),
|
|
|
|
VIN_UNIT_ATTRS(7),
|
|
|
|
VIN_UNIT_ATTRS(8),
|
|
|
|
VIN_UNIT_ATTRS(9),
|
|
|
|
VIN_UNIT_ATTRS(10),
|
|
|
|
&dev_attr_cpu0_vid.attr,
|
|
|
|
&dev_attr_vrm.attr,
|
|
|
|
&dev_attr_alarms_in.attr,
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
static const struct attribute_group pc8736x_vin_group = {
|
|
|
|
.attrs = pc8736x_vin_attr_array,
|
|
|
|
};
|
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_therm_input(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
return sprintf(buf, "%u\n", IN_FROM_REG(data->in[attr->index],
|
2005-09-02 14:52:43 -06:00
|
|
|
data->in_vref));
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_therm_min(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
return sprintf(buf, "%u\n", IN_FROM_REG(data->in_min[attr->index],
|
2005-09-02 14:52:43 -06:00
|
|
|
data->in_vref));
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_therm_max(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
return sprintf(buf, "%u\n", IN_FROM_REG(data->in_max[attr->index],
|
2005-09-02 14:52:43 -06:00
|
|
|
data->in_vref));
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_therm_crit(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
return sprintf(buf, "%u\n", IN_FROM_REG(data->in_crit[attr->index-11],
|
2005-09-02 14:52:43 -06:00
|
|
|
data->in_vref));
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_therm_status(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
return sprintf(buf, "%u\n", data->in_status[attr->index]);
|
2005-09-02 14:52:43 -06:00
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
|
|
|
|
static ssize_t set_therm_min(struct device *dev,
|
|
|
|
struct device_attribute *devattr,
|
|
|
|
const char *buf, size_t count)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2012-01-14 22:49:53 -07:00
|
|
|
long val;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = kstrtol(buf, 10, &val);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2005-09-02 14:52:43 -06:00
|
|
|
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_lock(&data->update_lock);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
data->in_min[attr->index] = IN_TO_REG(val, data->in_vref);
|
|
|
|
pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_MIN,
|
|
|
|
data->in_min[attr->index]);
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_unlock(&data->update_lock);
|
2005-09-02 14:52:43 -06:00
|
|
|
return count;
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
|
|
|
|
static ssize_t set_therm_max(struct device *dev,
|
|
|
|
struct device_attribute *devattr,
|
|
|
|
const char *buf, size_t count)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2012-01-14 22:49:53 -07:00
|
|
|
long val;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = kstrtol(buf, 10, &val);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2005-09-02 14:52:43 -06:00
|
|
|
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_lock(&data->update_lock);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
data->in_max[attr->index] = IN_TO_REG(val, data->in_vref);
|
|
|
|
pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_MAX,
|
|
|
|
data->in_max[attr->index]);
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_unlock(&data->update_lock);
|
2005-09-02 14:52:43 -06:00
|
|
|
return count;
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t set_therm_crit(struct device *dev,
|
|
|
|
struct device_attribute *devattr,
|
|
|
|
const char *buf, size_t count)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2012-01-14 22:49:53 -07:00
|
|
|
long val;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = kstrtol(buf, 10, &val);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2005-09-02 14:52:43 -06:00
|
|
|
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_lock(&data->update_lock);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
data->in_crit[attr->index-11] = IN_TO_REG(val, data->in_vref);
|
|
|
|
pc87360_write_value(data, LD_IN, attr->index, PC87365_REG_TEMP_CRIT,
|
|
|
|
data->in_crit[attr->index-11]);
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_unlock(&data->update_lock);
|
2005-09-02 14:52:43 -06:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2012-01-19 12:02:22 -07:00
|
|
|
/*
|
|
|
|
* the +11 term below reflects the fact that VLM units 11,12,13 are
|
|
|
|
* used in the chip to measure voltage across the thermistors
|
|
|
|
*/
|
2006-01-09 15:24:41 -07:00
|
|
|
static struct sensor_device_attribute therm_input[] = {
|
2012-01-14 22:49:53 -07:00
|
|
|
SENSOR_ATTR(temp4_input, S_IRUGO, show_therm_input, NULL, 0 + 11),
|
|
|
|
SENSOR_ATTR(temp5_input, S_IRUGO, show_therm_input, NULL, 1 + 11),
|
|
|
|
SENSOR_ATTR(temp6_input, S_IRUGO, show_therm_input, NULL, 2 + 11),
|
2006-01-09 15:24:41 -07:00
|
|
|
};
|
|
|
|
static struct sensor_device_attribute therm_status[] = {
|
2012-01-14 22:49:53 -07:00
|
|
|
SENSOR_ATTR(temp4_status, S_IRUGO, show_therm_status, NULL, 0 + 11),
|
|
|
|
SENSOR_ATTR(temp5_status, S_IRUGO, show_therm_status, NULL, 1 + 11),
|
|
|
|
SENSOR_ATTR(temp6_status, S_IRUGO, show_therm_status, NULL, 2 + 11),
|
2006-01-09 15:24:41 -07:00
|
|
|
};
|
|
|
|
static struct sensor_device_attribute therm_min[] = {
|
|
|
|
SENSOR_ATTR(temp4_min, S_IRUGO | S_IWUSR,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_min, set_therm_min, 0 + 11),
|
2006-01-09 15:24:41 -07:00
|
|
|
SENSOR_ATTR(temp5_min, S_IRUGO | S_IWUSR,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_min, set_therm_min, 1 + 11),
|
2006-01-09 15:24:41 -07:00
|
|
|
SENSOR_ATTR(temp6_min, S_IRUGO | S_IWUSR,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_min, set_therm_min, 2 + 11),
|
2006-01-09 15:24:41 -07:00
|
|
|
};
|
|
|
|
static struct sensor_device_attribute therm_max[] = {
|
|
|
|
SENSOR_ATTR(temp4_max, S_IRUGO | S_IWUSR,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_max, set_therm_max, 0 + 11),
|
2006-01-09 15:24:41 -07:00
|
|
|
SENSOR_ATTR(temp5_max, S_IRUGO | S_IWUSR,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_max, set_therm_max, 1 + 11),
|
2006-01-09 15:24:41 -07:00
|
|
|
SENSOR_ATTR(temp6_max, S_IRUGO | S_IWUSR,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_max, set_therm_max, 2 + 11),
|
2006-01-09 15:24:41 -07:00
|
|
|
};
|
|
|
|
static struct sensor_device_attribute therm_crit[] = {
|
|
|
|
SENSOR_ATTR(temp4_crit, S_IRUGO | S_IWUSR,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_crit, set_therm_crit, 0 + 11),
|
2006-01-09 15:24:41 -07:00
|
|
|
SENSOR_ATTR(temp5_crit, S_IRUGO | S_IWUSR,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_crit, set_therm_crit, 1 + 11),
|
2006-01-09 15:24:41 -07:00
|
|
|
SENSOR_ATTR(temp6_crit, S_IRUGO | S_IWUSR,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_crit, set_therm_crit, 2 + 11),
|
2006-01-09 15:24:41 -07:00
|
|
|
};
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2012-01-19 12:02:22 -07:00
|
|
|
/*
|
|
|
|
* show_therm_min/max_alarm() reads data from the per-channel voltage
|
|
|
|
* status register (sec 11.5.12)
|
|
|
|
*/
|
2008-10-18 21:27:35 -06:00
|
|
|
|
|
|
|
static ssize_t show_therm_min_alarm(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
|
|
|
{
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
unsigned nr = to_sensor_dev_attr(devattr)->index;
|
|
|
|
|
|
|
|
return sprintf(buf, "%u\n", !!(data->in_status[nr] & CHAN_ALM_MIN));
|
|
|
|
}
|
|
|
|
static ssize_t show_therm_max_alarm(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
|
|
|
{
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
unsigned nr = to_sensor_dev_attr(devattr)->index;
|
|
|
|
|
|
|
|
return sprintf(buf, "%u\n", !!(data->in_status[nr] & CHAN_ALM_MAX));
|
|
|
|
}
|
|
|
|
static ssize_t show_therm_crit_alarm(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
|
|
|
{
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
unsigned nr = to_sensor_dev_attr(devattr)->index;
|
|
|
|
|
|
|
|
return sprintf(buf, "%u\n", !!(data->in_status[nr] & TEMP_ALM_CRIT));
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct sensor_device_attribute therm_min_alarm[] = {
|
|
|
|
SENSOR_ATTR(temp4_min_alarm, S_IRUGO,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_min_alarm, NULL, 0 + 11),
|
2008-10-18 21:27:35 -06:00
|
|
|
SENSOR_ATTR(temp5_min_alarm, S_IRUGO,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_min_alarm, NULL, 1 + 11),
|
2008-10-18 21:27:35 -06:00
|
|
|
SENSOR_ATTR(temp6_min_alarm, S_IRUGO,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_min_alarm, NULL, 2 + 11),
|
2008-10-18 21:27:35 -06:00
|
|
|
};
|
|
|
|
static struct sensor_device_attribute therm_max_alarm[] = {
|
|
|
|
SENSOR_ATTR(temp4_max_alarm, S_IRUGO,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_max_alarm, NULL, 0 + 11),
|
2008-10-18 21:27:35 -06:00
|
|
|
SENSOR_ATTR(temp5_max_alarm, S_IRUGO,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_max_alarm, NULL, 1 + 11),
|
2008-10-18 21:27:35 -06:00
|
|
|
SENSOR_ATTR(temp6_max_alarm, S_IRUGO,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_max_alarm, NULL, 2 + 11),
|
2008-10-18 21:27:35 -06:00
|
|
|
};
|
|
|
|
static struct sensor_device_attribute therm_crit_alarm[] = {
|
|
|
|
SENSOR_ATTR(temp4_crit_alarm, S_IRUGO,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_crit_alarm, NULL, 0 + 11),
|
2008-10-18 21:27:35 -06:00
|
|
|
SENSOR_ATTR(temp5_crit_alarm, S_IRUGO,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_crit_alarm, NULL, 1 + 11),
|
2008-10-18 21:27:35 -06:00
|
|
|
SENSOR_ATTR(temp6_crit_alarm, S_IRUGO,
|
2012-01-14 22:49:53 -07:00
|
|
|
show_therm_crit_alarm, NULL, 2 + 11),
|
2008-10-18 21:27:35 -06:00
|
|
|
};
|
|
|
|
|
2006-09-24 13:02:44 -06:00
|
|
|
#define THERM_UNIT_ATTRS(X) \
|
|
|
|
&therm_input[X].dev_attr.attr, \
|
|
|
|
&therm_status[X].dev_attr.attr, \
|
|
|
|
&therm_min[X].dev_attr.attr, \
|
|
|
|
&therm_max[X].dev_attr.attr, \
|
2008-10-18 21:27:35 -06:00
|
|
|
&therm_crit[X].dev_attr.attr, \
|
|
|
|
&therm_min_alarm[X].dev_attr.attr, \
|
|
|
|
&therm_max_alarm[X].dev_attr.attr, \
|
|
|
|
&therm_crit_alarm[X].dev_attr.attr
|
2006-09-24 13:02:44 -06:00
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
static struct attribute *pc8736x_therm_attr_array[] = {
|
2006-09-24 13:02:44 -06:00
|
|
|
THERM_UNIT_ATTRS(0),
|
|
|
|
THERM_UNIT_ATTRS(1),
|
|
|
|
THERM_UNIT_ATTRS(2),
|
|
|
|
NULL
|
|
|
|
};
|
|
|
|
static const struct attribute_group pc8736x_therm_group = {
|
|
|
|
.attrs = pc8736x_therm_attr_array,
|
|
|
|
};
|
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_temp_input(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp[attr->index]));
|
2005-09-02 14:52:43 -06:00
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
|
|
|
|
static ssize_t show_temp_min(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_min[attr->index]));
|
2005-09-02 14:52:43 -06:00
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
|
|
|
|
static ssize_t show_temp_max(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
return sprintf(buf, "%d\n", TEMP_FROM_REG(data->temp_max[attr->index]));
|
2005-09-02 14:52:43 -06:00
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
|
|
|
|
static ssize_t show_temp_crit(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
2012-01-14 22:49:53 -07:00
|
|
|
return sprintf(buf, "%d\n",
|
|
|
|
TEMP_FROM_REG(data->temp_crit[attr->index]));
|
2005-09-02 14:52:43 -06:00
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
|
|
|
|
static ssize_t show_temp_status(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
return sprintf(buf, "%d\n", data->temp_status[attr->index]);
|
2005-09-02 14:52:43 -06:00
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
|
|
|
|
static ssize_t set_temp_min(struct device *dev,
|
|
|
|
struct device_attribute *devattr,
|
|
|
|
const char *buf, size_t count)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2012-01-14 22:49:53 -07:00
|
|
|
long val;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = kstrtol(buf, 10, &val);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2005-09-02 14:52:43 -06:00
|
|
|
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_lock(&data->update_lock);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
data->temp_min[attr->index] = TEMP_TO_REG(val);
|
|
|
|
pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_MIN,
|
|
|
|
data->temp_min[attr->index]);
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_unlock(&data->update_lock);
|
2005-09-02 14:52:43 -06:00
|
|
|
return count;
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
|
|
|
|
static ssize_t set_temp_max(struct device *dev,
|
|
|
|
struct device_attribute *devattr,
|
|
|
|
const char *buf, size_t count)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2012-01-14 22:49:53 -07:00
|
|
|
long val;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = kstrtol(buf, 10, &val);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2005-09-02 14:52:43 -06:00
|
|
|
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_lock(&data->update_lock);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
data->temp_max[attr->index] = TEMP_TO_REG(val);
|
|
|
|
pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_MAX,
|
|
|
|
data->temp_max[attr->index]);
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_unlock(&data->update_lock);
|
2005-09-02 14:52:43 -06:00
|
|
|
return count;
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
|
|
|
|
static ssize_t set_temp_crit(struct device *dev,
|
|
|
|
struct device_attribute *devattr, const char *buf,
|
|
|
|
size_t count)
|
2005-09-02 14:52:43 -06:00
|
|
|
{
|
|
|
|
struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr);
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2012-01-14 22:49:53 -07:00
|
|
|
long val;
|
|
|
|
int err;
|
|
|
|
|
|
|
|
err = kstrtol(buf, 10, &val);
|
|
|
|
if (err)
|
|
|
|
return err;
|
2005-09-02 14:52:43 -06:00
|
|
|
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_lock(&data->update_lock);
|
[PATCH] hwmon: (2/3) pc87360 driver update
pc87360: number-skew to init
The temp, therm, fan, pwm callbacks all have an offset skew in the code
which accommodates attribute numbering conventions under
/sys/bus/i2c/devices/9191-6620/ (ie they start at 1)
This patch moves that skew into the declaration, and out of the
functions (except for therm, where we simplify from 2 skews to 1). The
declarative skew is clearer, less error-prone, and more efficient.
The use of 11+offset-4 below reflects the fact that the sysfs numbering
of these units is 4, 5, 6, but they use internal VLM units 11, 12, 13 to
measure the thermistor voltages.
There's one remaining skew factor, in *_crit callbacks below, because
there are no critical thresholds for voltages 0-10, only for those
supporting the thermistors.
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-09-02 14:57:52 -06:00
|
|
|
data->temp_crit[attr->index] = TEMP_TO_REG(val);
|
|
|
|
pc87360_write_value(data, LD_TEMP, attr->index, PC87365_REG_TEMP_CRIT,
|
|
|
|
data->temp_crit[attr->index]);
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_unlock(&data->update_lock);
|
2005-09-02 14:52:43 -06:00
|
|
|
return count;
|
|
|
|
}
|
|
|
|
|
2006-01-09 15:24:41 -07:00
|
|
|
static struct sensor_device_attribute temp_input[] = {
|
|
|
|
SENSOR_ATTR(temp1_input, S_IRUGO, show_temp_input, NULL, 0),
|
|
|
|
SENSOR_ATTR(temp2_input, S_IRUGO, show_temp_input, NULL, 1),
|
|
|
|
SENSOR_ATTR(temp3_input, S_IRUGO, show_temp_input, NULL, 2),
|
|
|
|
};
|
|
|
|
static struct sensor_device_attribute temp_status[] = {
|
|
|
|
SENSOR_ATTR(temp1_status, S_IRUGO, show_temp_status, NULL, 0),
|
|
|
|
SENSOR_ATTR(temp2_status, S_IRUGO, show_temp_status, NULL, 1),
|
|
|
|
SENSOR_ATTR(temp3_status, S_IRUGO, show_temp_status, NULL, 2),
|
|
|
|
};
|
|
|
|
static struct sensor_device_attribute temp_min[] = {
|
|
|
|
SENSOR_ATTR(temp1_min, S_IRUGO | S_IWUSR,
|
|
|
|
show_temp_min, set_temp_min, 0),
|
|
|
|
SENSOR_ATTR(temp2_min, S_IRUGO | S_IWUSR,
|
|
|
|
show_temp_min, set_temp_min, 1),
|
|
|
|
SENSOR_ATTR(temp3_min, S_IRUGO | S_IWUSR,
|
|
|
|
show_temp_min, set_temp_min, 2),
|
|
|
|
};
|
|
|
|
static struct sensor_device_attribute temp_max[] = {
|
|
|
|
SENSOR_ATTR(temp1_max, S_IRUGO | S_IWUSR,
|
|
|
|
show_temp_max, set_temp_max, 0),
|
|
|
|
SENSOR_ATTR(temp2_max, S_IRUGO | S_IWUSR,
|
|
|
|
show_temp_max, set_temp_max, 1),
|
|
|
|
SENSOR_ATTR(temp3_max, S_IRUGO | S_IWUSR,
|
|
|
|
show_temp_max, set_temp_max, 2),
|
|
|
|
};
|
|
|
|
static struct sensor_device_attribute temp_crit[] = {
|
|
|
|
SENSOR_ATTR(temp1_crit, S_IRUGO | S_IWUSR,
|
|
|
|
show_temp_crit, set_temp_crit, 0),
|
|
|
|
SENSOR_ATTR(temp2_crit, S_IRUGO | S_IWUSR,
|
|
|
|
show_temp_crit, set_temp_crit, 1),
|
|
|
|
SENSOR_ATTR(temp3_crit, S_IRUGO | S_IWUSR,
|
|
|
|
show_temp_crit, set_temp_crit, 2),
|
|
|
|
};
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
static ssize_t show_temp_alarms(struct device *dev,
|
|
|
|
struct device_attribute *attr, char *buf)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
return sprintf(buf, "%u\n", data->temp_alarms);
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
static DEVICE_ATTR(alarms_temp, S_IRUGO, show_temp_alarms, NULL);
|
|
|
|
|
2012-01-19 12:02:22 -07:00
|
|
|
/*
|
|
|
|
* show_temp_min/max_alarm() reads data from the per-channel status
|
|
|
|
* register (sec 12.3.7), not the temp event status registers (sec
|
|
|
|
* 12.3.2) that show_temp_alarm() reads (via data->temp_alarms)
|
|
|
|
*/
|
2008-10-18 21:27:32 -06:00
|
|
|
|
|
|
|
static ssize_t show_temp_min_alarm(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
|
|
|
{
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
unsigned nr = to_sensor_dev_attr(devattr)->index;
|
|
|
|
|
|
|
|
return sprintf(buf, "%u\n", !!(data->temp_status[nr] & CHAN_ALM_MIN));
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
|
2008-10-18 21:27:32 -06:00
|
|
|
static ssize_t show_temp_max_alarm(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
|
|
|
{
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
unsigned nr = to_sensor_dev_attr(devattr)->index;
|
|
|
|
|
|
|
|
return sprintf(buf, "%u\n", !!(data->temp_status[nr] & CHAN_ALM_MAX));
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
|
2008-10-18 21:27:32 -06:00
|
|
|
static ssize_t show_temp_crit_alarm(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
|
|
|
{
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
unsigned nr = to_sensor_dev_attr(devattr)->index;
|
|
|
|
|
|
|
|
return sprintf(buf, "%u\n", !!(data->temp_status[nr] & TEMP_ALM_CRIT));
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct sensor_device_attribute temp_min_alarm[] = {
|
|
|
|
SENSOR_ATTR(temp1_min_alarm, S_IRUGO, show_temp_min_alarm, NULL, 0),
|
|
|
|
SENSOR_ATTR(temp2_min_alarm, S_IRUGO, show_temp_min_alarm, NULL, 1),
|
|
|
|
SENSOR_ATTR(temp3_min_alarm, S_IRUGO, show_temp_min_alarm, NULL, 2),
|
|
|
|
};
|
2012-01-14 22:49:53 -07:00
|
|
|
|
2008-10-18 21:27:32 -06:00
|
|
|
static struct sensor_device_attribute temp_max_alarm[] = {
|
|
|
|
SENSOR_ATTR(temp1_max_alarm, S_IRUGO, show_temp_max_alarm, NULL, 0),
|
|
|
|
SENSOR_ATTR(temp2_max_alarm, S_IRUGO, show_temp_max_alarm, NULL, 1),
|
|
|
|
SENSOR_ATTR(temp3_max_alarm, S_IRUGO, show_temp_max_alarm, NULL, 2),
|
|
|
|
};
|
2012-01-14 22:49:53 -07:00
|
|
|
|
2008-10-18 21:27:32 -06:00
|
|
|
static struct sensor_device_attribute temp_crit_alarm[] = {
|
|
|
|
SENSOR_ATTR(temp1_crit_alarm, S_IRUGO, show_temp_crit_alarm, NULL, 0),
|
|
|
|
SENSOR_ATTR(temp2_crit_alarm, S_IRUGO, show_temp_crit_alarm, NULL, 1),
|
|
|
|
SENSOR_ATTR(temp3_crit_alarm, S_IRUGO, show_temp_crit_alarm, NULL, 2),
|
|
|
|
};
|
|
|
|
|
|
|
|
#define TEMP_FAULT 0x40 /* open diode */
|
|
|
|
static ssize_t show_temp_fault(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
|
|
|
{
|
|
|
|
struct pc87360_data *data = pc87360_update_device(dev);
|
|
|
|
unsigned nr = to_sensor_dev_attr(devattr)->index;
|
|
|
|
|
|
|
|
return sprintf(buf, "%u\n", !!(data->temp_status[nr] & TEMP_FAULT));
|
|
|
|
}
|
|
|
|
static struct sensor_device_attribute temp_fault[] = {
|
|
|
|
SENSOR_ATTR(temp1_fault, S_IRUGO, show_temp_fault, NULL, 0),
|
|
|
|
SENSOR_ATTR(temp2_fault, S_IRUGO, show_temp_fault, NULL, 1),
|
|
|
|
SENSOR_ATTR(temp3_fault, S_IRUGO, show_temp_fault, NULL, 2),
|
|
|
|
};
|
|
|
|
|
2012-01-19 21:50:57 -07:00
|
|
|
#define TEMP_UNIT_ATTRS(X) \
|
|
|
|
{ &temp_input[X].dev_attr.attr, \
|
|
|
|
&temp_status[X].dev_attr.attr, \
|
|
|
|
&temp_min[X].dev_attr.attr, \
|
|
|
|
&temp_max[X].dev_attr.attr, \
|
|
|
|
&temp_crit[X].dev_attr.attr, \
|
|
|
|
&temp_min_alarm[X].dev_attr.attr, \
|
|
|
|
&temp_max_alarm[X].dev_attr.attr, \
|
|
|
|
&temp_crit_alarm[X].dev_attr.attr, \
|
|
|
|
&temp_fault[X].dev_attr.attr, \
|
|
|
|
NULL \
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct attribute *pc8736x_temp_attr[][10] = {
|
2006-09-24 13:02:44 -06:00
|
|
|
TEMP_UNIT_ATTRS(0),
|
|
|
|
TEMP_UNIT_ATTRS(1),
|
2012-01-19 21:50:57 -07:00
|
|
|
TEMP_UNIT_ATTRS(2)
|
2006-09-24 13:02:44 -06:00
|
|
|
};
|
2012-01-14 22:49:53 -07:00
|
|
|
|
2012-01-19 21:50:57 -07:00
|
|
|
static const struct attribute_group pc8736x_temp_attr_group[] = {
|
|
|
|
{ .attrs = pc8736x_temp_attr[0] },
|
|
|
|
{ .attrs = pc8736x_temp_attr[1] },
|
|
|
|
{ .attrs = pc8736x_temp_attr[2] }
|
2006-09-24 13:02:44 -06:00
|
|
|
};
|
|
|
|
|
2008-10-18 21:27:32 -06:00
|
|
|
static ssize_t show_name(struct device *dev,
|
|
|
|
struct device_attribute *devattr, char *buf)
|
2007-06-09 08:11:16 -06:00
|
|
|
{
|
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
|
|
|
return sprintf(buf, "%s\n", data->name);
|
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
|
2007-06-09 08:11:16 -06:00
|
|
|
static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
/*
|
|
|
|
* Device detection, registration and update
|
|
|
|
*/
|
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
static int __init pc87360_find(int sioaddr, u8 *devid,
|
|
|
|
unsigned short *addresses)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
u16 val;
|
|
|
|
int i;
|
|
|
|
int nrdev; /* logical device count */
|
|
|
|
|
|
|
|
/* No superio_enter */
|
|
|
|
|
|
|
|
/* Identify device */
|
2007-12-06 15:13:42 -07:00
|
|
|
val = force_id ? force_id : superio_inb(sioaddr, DEVID);
|
2005-04-16 16:20:36 -06:00
|
|
|
switch (val) {
|
|
|
|
case 0xE1: /* PC87360 */
|
|
|
|
case 0xE8: /* PC87363 */
|
|
|
|
case 0xE4: /* PC87364 */
|
|
|
|
nrdev = 1;
|
|
|
|
break;
|
|
|
|
case 0xE5: /* PC87365 */
|
|
|
|
case 0xE9: /* PC87366 */
|
|
|
|
nrdev = 3;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
superio_exit(sioaddr);
|
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
/* Remember the device id */
|
|
|
|
*devid = val;
|
|
|
|
|
|
|
|
for (i = 0; i < nrdev; i++) {
|
|
|
|
/* select logical device */
|
|
|
|
superio_outb(sioaddr, DEV, logdev[i]);
|
|
|
|
|
|
|
|
val = superio_inb(sioaddr, ACT);
|
|
|
|
if (!(val & 0x01)) {
|
2011-01-12 13:55:11 -07:00
|
|
|
pr_info("Device 0x%02x not activated\n", logdev[i]);
|
2005-04-16 16:20:36 -06:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
val = (superio_inb(sioaddr, BASE) << 8)
|
|
|
|
| superio_inb(sioaddr, BASE + 1);
|
|
|
|
if (!val) {
|
2011-01-12 13:55:11 -07:00
|
|
|
pr_info("Base address not set for device 0x%02x\n",
|
|
|
|
logdev[i]);
|
2005-04-16 16:20:36 -06:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
[PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (5/9)
Call the ISA chip drivers detection function directly instead of relying
on i2c_detect. The net effect is that address lists won't be handled
anymore, but they were mostly useless in the ISA case anyway (pc87360,
smsc47m1, smsc47b397 had already dropped them).
We don't need to handle multiple devices, all we may need is a way to
force a given address instead of the original one (some drivers already
do: sis5595, via686a, w83627hf), and, for drivers supporting multiple
chips, a way to force one given kind. All this may be added later on
demand, but I actually don't think there will be much demand.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-07-19 15:56:35 -06:00
|
|
|
addresses[i] = val;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
if (i == 0) { /* Fans */
|
2005-04-16 16:20:36 -06:00
|
|
|
confreg[0] = superio_inb(sioaddr, 0xF0);
|
|
|
|
confreg[1] = superio_inb(sioaddr, 0xF1);
|
|
|
|
|
2011-01-12 13:55:11 -07:00
|
|
|
pr_debug("Fan %d: mon=%d ctrl=%d inv=%d\n", 1,
|
|
|
|
(confreg[0] >> 2) & 1, (confreg[0] >> 3) & 1,
|
|
|
|
(confreg[0] >> 4) & 1);
|
|
|
|
pr_debug("Fan %d: mon=%d ctrl=%d inv=%d\n", 2,
|
|
|
|
(confreg[0] >> 5) & 1, (confreg[0] >> 6) & 1,
|
|
|
|
(confreg[0] >> 7) & 1);
|
|
|
|
pr_debug("Fan %d: mon=%d ctrl=%d inv=%d\n", 3,
|
|
|
|
confreg[1] & 1, (confreg[1] >> 1) & 1,
|
|
|
|
(confreg[1] >> 2) & 1);
|
2012-01-14 22:49:53 -07:00
|
|
|
} else if (i == 1) { /* Voltages */
|
2005-04-16 16:20:36 -06:00
|
|
|
/* Are we using thermistors? */
|
|
|
|
if (*devid == 0xE9) { /* PC87366 */
|
2012-01-19 12:02:22 -07:00
|
|
|
/*
|
|
|
|
* These registers are not logical-device
|
|
|
|
* specific, just that we won't need them if
|
|
|
|
* we don't use the VLM device
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
confreg[2] = superio_inb(sioaddr, 0x2B);
|
|
|
|
confreg[3] = superio_inb(sioaddr, 0x25);
|
|
|
|
|
|
|
|
if (confreg[2] & 0x40) {
|
2011-01-12 13:55:11 -07:00
|
|
|
pr_info("Using thermistors for "
|
|
|
|
"temperature monitoring\n");
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
if (confreg[3] & 0xE0) {
|
2011-01-12 13:55:11 -07:00
|
|
|
pr_info("VID inputs routed (mode %u)\n",
|
|
|
|
confreg[3] >> 5);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
superio_exit(sioaddr);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-01-19 21:50:57 -07:00
|
|
|
static void pc87360_remove_files(struct device *dev)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
device_remove_file(dev, &dev_attr_name);
|
|
|
|
device_remove_file(dev, &dev_attr_alarms_temp);
|
|
|
|
for (i = 0; i < ARRAY_SIZE(pc8736x_temp_attr_group); i++)
|
|
|
|
sysfs_remove_group(&dev->kobj, &pc8736x_temp_attr_group[i]);
|
|
|
|
for (i = 0; i < ARRAY_SIZE(pc8736x_fan_attr_group); i++) {
|
|
|
|
sysfs_remove_group(&pdev->dev.kobj, &pc8736x_fan_attr_group[i]);
|
|
|
|
device_remove_file(dev, &pwm[i].dev_attr);
|
|
|
|
}
|
|
|
|
sysfs_remove_group(&dev->kobj, &pc8736x_therm_group);
|
|
|
|
sysfs_remove_group(&dev->kobj, &pc8736x_vin_group);
|
|
|
|
}
|
|
|
|
|
2012-11-19 11:22:35 -07:00
|
|
|
static int pc87360_probe(struct platform_device *pdev)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
struct pc87360_data *data;
|
|
|
|
int err = 0;
|
|
|
|
const char *name = "pc87360";
|
|
|
|
int use_thermistors = 0;
|
2007-06-09 08:11:16 -06:00
|
|
|
struct device *dev = &pdev->dev;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2012-06-02 12:20:19 -06:00
|
|
|
data = devm_kzalloc(dev, sizeof(struct pc87360_data), GFP_KERNEL);
|
2012-01-14 22:49:53 -07:00
|
|
|
if (!data)
|
2005-04-16 16:20:36 -06:00
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
data->fannr = 2;
|
|
|
|
data->innr = 0;
|
|
|
|
data->tempnr = 0;
|
|
|
|
|
|
|
|
switch (devid) {
|
|
|
|
case 0xe8:
|
|
|
|
name = "pc87363";
|
|
|
|
break;
|
|
|
|
case 0xe4:
|
|
|
|
name = "pc87364";
|
|
|
|
data->fannr = 3;
|
|
|
|
break;
|
|
|
|
case 0xe5:
|
|
|
|
name = "pc87365";
|
|
|
|
data->fannr = extra_isa[0] ? 3 : 0;
|
|
|
|
data->innr = extra_isa[1] ? 11 : 0;
|
|
|
|
data->tempnr = extra_isa[2] ? 2 : 0;
|
|
|
|
break;
|
|
|
|
case 0xe9:
|
|
|
|
name = "pc87366";
|
|
|
|
data->fannr = extra_isa[0] ? 3 : 0;
|
|
|
|
data->innr = extra_isa[1] ? 14 : 0;
|
|
|
|
data->tempnr = extra_isa[2] ? 3 : 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2007-06-09 08:11:16 -06:00
|
|
|
data->name = name;
|
2005-04-16 16:20:36 -06:00
|
|
|
data->valid = 0;
|
2007-06-09 08:11:16 -06:00
|
|
|
mutex_init(&data->lock);
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_init(&data->update_lock);
|
2007-06-09 08:11:16 -06:00
|
|
|
platform_set_drvdata(pdev, data);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2008-10-18 21:27:33 -06:00
|
|
|
for (i = 0; i < LDNI_MAX; i++) {
|
2012-01-14 22:49:53 -07:00
|
|
|
data->address[i] = extra_isa[i];
|
|
|
|
if (data->address[i]
|
2012-06-02 12:20:19 -06:00
|
|
|
&& !devm_request_region(dev, extra_isa[i], PC87360_EXTENT,
|
|
|
|
pc87360_driver.driver.name)) {
|
2007-06-09 08:11:16 -06:00
|
|
|
dev_err(dev, "Region 0x%x-0x%x already "
|
2005-04-16 16:20:36 -06:00
|
|
|
"in use!\n", extra_isa[i],
|
|
|
|
extra_isa[i]+PC87360_EXTENT-1);
|
2012-06-02 12:20:19 -06:00
|
|
|
return -EBUSY;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Retrieve the fans configuration from Super-I/O space */
|
|
|
|
if (data->fannr)
|
|
|
|
data->fan_conf = confreg[0] | (confreg[1] << 8);
|
|
|
|
|
2012-01-19 12:02:22 -07:00
|
|
|
/*
|
|
|
|
* Use the correct reference voltage
|
|
|
|
* Unless both the VLM and the TMS logical devices agree to
|
|
|
|
* use an external Vref, the internal one is used.
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
if (data->innr) {
|
|
|
|
i = pc87360_read_value(data, LD_IN, NO_BANK,
|
|
|
|
PC87365_REG_IN_CONFIG);
|
|
|
|
if (data->tempnr) {
|
|
|
|
i &= pc87360_read_value(data, LD_TEMP, NO_BANK,
|
|
|
|
PC87365_REG_TEMP_CONFIG);
|
|
|
|
}
|
|
|
|
data->in_vref = (i&0x02) ? 3025 : 2966;
|
2007-06-09 08:11:16 -06:00
|
|
|
dev_dbg(dev, "Using %s reference voltage\n",
|
2005-04-16 16:20:36 -06:00
|
|
|
(i&0x02) ? "external" : "internal");
|
|
|
|
|
|
|
|
data->vid_conf = confreg[3];
|
2006-12-12 10:18:28 -07:00
|
|
|
data->vrm = vid_which_vrm();
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Fan clock dividers may be needed before any data is read */
|
|
|
|
for (i = 0; i < data->fannr; i++) {
|
|
|
|
if (FAN_CONFIG_MONITOR(data->fan_conf, i))
|
|
|
|
data->fan_status[i] = pc87360_read_value(data,
|
|
|
|
LD_FAN, NO_BANK,
|
|
|
|
PC87360_REG_FAN_STATUS(i));
|
|
|
|
}
|
|
|
|
|
|
|
|
if (init > 0) {
|
|
|
|
if (devid == 0xe9 && data->address[1]) /* PC87366 */
|
|
|
|
use_thermistors = confreg[2] & 0x40;
|
|
|
|
|
2007-06-09 08:11:16 -06:00
|
|
|
pc87360_init_device(pdev, use_thermistors);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2006-09-24 13:03:25 -06:00
|
|
|
/* Register all-or-nothing sysfs groups */
|
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
if (data->innr) {
|
|
|
|
err = sysfs_create_group(&dev->kobj, &pc8736x_vin_group);
|
|
|
|
if (err)
|
2012-06-02 12:20:19 -06:00
|
|
|
goto error;
|
2012-01-14 22:49:53 -07:00
|
|
|
}
|
2005-07-15 19:39:18 -06:00
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
if (data->innr == 14) {
|
|
|
|
err = sysfs_create_group(&dev->kobj, &pc8736x_therm_group);
|
|
|
|
if (err)
|
2012-06-02 12:20:19 -06:00
|
|
|
goto error;
|
2012-01-14 22:49:53 -07:00
|
|
|
}
|
2006-09-24 13:03:25 -06:00
|
|
|
|
|
|
|
/* create device attr-files for varying sysfs groups */
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
if (data->tempnr) {
|
2006-01-09 15:24:41 -07:00
|
|
|
for (i = 0; i < data->tempnr; i++) {
|
2012-01-19 21:50:57 -07:00
|
|
|
err = sysfs_create_group(&dev->kobj,
|
|
|
|
&pc8736x_temp_attr_group[i]);
|
|
|
|
if (err)
|
2012-06-02 12:20:19 -06:00
|
|
|
goto error;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
err = device_create_file(dev, &dev_attr_alarms_temp);
|
|
|
|
if (err)
|
2012-06-02 12:20:19 -06:00
|
|
|
goto error;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2006-01-09 15:24:41 -07:00
|
|
|
for (i = 0; i < data->fannr; i++) {
|
2012-01-19 21:50:57 -07:00
|
|
|
if (FAN_CONFIG_MONITOR(data->fan_conf, i)) {
|
|
|
|
err = sysfs_create_group(&dev->kobj,
|
|
|
|
&pc8736x_fan_attr_group[i]);
|
|
|
|
if (err)
|
2012-06-02 12:20:19 -06:00
|
|
|
goto error;
|
2012-01-19 21:50:57 -07:00
|
|
|
}
|
2012-01-14 22:49:53 -07:00
|
|
|
if (FAN_CONFIG_CONTROL(data->fan_conf, i)) {
|
|
|
|
err = device_create_file(dev, &pwm[i].dev_attr);
|
|
|
|
if (err)
|
2012-06-02 12:20:19 -06:00
|
|
|
goto error;
|
2012-01-14 22:49:53 -07:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
2012-01-14 22:49:53 -07:00
|
|
|
err = device_create_file(dev, &dev_attr_name);
|
|
|
|
if (err)
|
2012-06-02 12:20:19 -06:00
|
|
|
goto error;
|
2007-06-09 08:11:16 -06:00
|
|
|
|
2007-08-20 14:46:20 -06:00
|
|
|
data->hwmon_dev = hwmon_device_register(dev);
|
|
|
|
if (IS_ERR(data->hwmon_dev)) {
|
|
|
|
err = PTR_ERR(data->hwmon_dev);
|
2012-06-02 12:20:19 -06:00
|
|
|
goto error;
|
2006-09-24 13:03:25 -06:00
|
|
|
}
|
2005-04-16 16:20:36 -06:00
|
|
|
return 0;
|
|
|
|
|
2012-06-02 12:20:19 -06:00
|
|
|
error:
|
2012-01-19 21:50:57 -07:00
|
|
|
pc87360_remove_files(dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2012-11-19 11:25:51 -07:00
|
|
|
static int pc87360_remove(struct platform_device *pdev)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = platform_get_drvdata(pdev);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
2007-08-20 14:46:20 -06:00
|
|
|
hwmon_device_unregister(data->hwmon_dev);
|
2012-01-19 21:50:57 -07:00
|
|
|
pc87360_remove_files(&pdev->dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2012-01-19 12:02:22 -07:00
|
|
|
/*
|
|
|
|
* ldi is the logical device index
|
|
|
|
* bank is for voltages and temperatures only
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
static int pc87360_read_value(struct pc87360_data *data, u8 ldi, u8 bank,
|
|
|
|
u8 reg)
|
|
|
|
{
|
|
|
|
int res;
|
|
|
|
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_lock(&(data->lock));
|
2005-04-16 16:20:36 -06:00
|
|
|
if (bank != NO_BANK)
|
|
|
|
outb_p(bank, data->address[ldi] + PC87365_REG_BANK);
|
|
|
|
res = inb_p(data->address[ldi] + reg);
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_unlock(&(data->lock));
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
return res;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void pc87360_write_value(struct pc87360_data *data, u8 ldi, u8 bank,
|
|
|
|
u8 reg, u8 value)
|
|
|
|
{
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_lock(&(data->lock));
|
2005-04-16 16:20:36 -06:00
|
|
|
if (bank != NO_BANK)
|
|
|
|
outb_p(bank, data->address[ldi] + PC87365_REG_BANK);
|
|
|
|
outb_p(value, data->address[ldi] + reg);
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_unlock(&(data->lock));
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
hwmon/pc87360 separate alarm files: define some constants
Bring hwmon/pc87360 into agreement with
Documentation/hwmon/sysfs-interface.
Patchset adds separate limit alarms for voltages and temps, it also adds
temp[123]_fault files. On my Soekris, temps 1,2 are unused/unconnected,
so temp[123]_fault = 1,1,0 respectively. This agrees with
/usr/bin/sensors, which has always shown them as OPEN. Temps 4,5,6 are
thermistor based, and dont have a fault bit in their status register.
This patch:
2 different kinds of constants added:
- CHAN_ALM_* constants for (later) vin, temp alarm callbacks.
- CHAN_* conversion constants, used in _init_device, partly for RW1C bits
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-18 21:27:30 -06:00
|
|
|
/* (temp & vin) channel conversion status register flags (pdf sec.11.5.12) */
|
|
|
|
#define CHAN_CNVRTD 0x80 /* new data ready */
|
|
|
|
#define CHAN_ENA 0x01 /* enabled channel (temp or vin) */
|
|
|
|
#define CHAN_ALM_ENA 0x10 /* propagate to alarms-reg ?? (chk val!) */
|
|
|
|
#define CHAN_READY (CHAN_ENA|CHAN_CNVRTD) /* sample ready mask */
|
|
|
|
|
2008-10-18 21:27:32 -06:00
|
|
|
#define TEMP_OTS_OE 0x20 /* OTS Output Enable */
|
|
|
|
#define VIN_RW1C_MASK (CHAN_READY|CHAN_ALM_MAX|CHAN_ALM_MIN) /* 0x87 */
|
|
|
|
#define TEMP_RW1C_MASK (VIN_RW1C_MASK|TEMP_ALM_CRIT|TEMP_FAULT) /* 0xCF */
|
|
|
|
|
2007-06-09 08:11:16 -06:00
|
|
|
static void pc87360_init_device(struct platform_device *pdev,
|
|
|
|
int use_thermistors)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = platform_get_drvdata(pdev);
|
2005-04-16 16:20:36 -06:00
|
|
|
int i, nr;
|
|
|
|
const u8 init_in[14] = { 2, 2, 2, 2, 2, 2, 2, 1, 1, 3, 1, 2, 2, 2 };
|
|
|
|
const u8 init_temp[3] = { 2, 2, 1 };
|
|
|
|
u8 reg;
|
|
|
|
|
|
|
|
if (init >= 2 && data->innr) {
|
|
|
|
reg = pc87360_read_value(data, LD_IN, NO_BANK,
|
|
|
|
PC87365_REG_IN_CONVRATE);
|
2007-06-09 08:11:16 -06:00
|
|
|
dev_info(&pdev->dev, "VLM conversion set to "
|
2005-04-16 16:20:36 -06:00
|
|
|
"1s period, 160us delay\n");
|
|
|
|
pc87360_write_value(data, LD_IN, NO_BANK,
|
|
|
|
PC87365_REG_IN_CONVRATE,
|
|
|
|
(reg & 0xC0) | 0x11);
|
|
|
|
}
|
|
|
|
|
|
|
|
nr = data->innr < 11 ? data->innr : 11;
|
2006-01-09 15:24:41 -07:00
|
|
|
for (i = 0; i < nr; i++) {
|
2008-10-18 21:27:34 -06:00
|
|
|
reg = pc87360_read_value(data, LD_IN, i,
|
|
|
|
PC87365_REG_IN_STATUS);
|
|
|
|
dev_dbg(&pdev->dev, "bios in%d status:0x%02x\n", i, reg);
|
2005-04-16 16:20:36 -06:00
|
|
|
if (init >= init_in[i]) {
|
|
|
|
/* Forcibly enable voltage channel */
|
hwmon/pc87360 separate alarm files: define some constants
Bring hwmon/pc87360 into agreement with
Documentation/hwmon/sysfs-interface.
Patchset adds separate limit alarms for voltages and temps, it also adds
temp[123]_fault files. On my Soekris, temps 1,2 are unused/unconnected,
so temp[123]_fault = 1,1,0 respectively. This agrees with
/usr/bin/sensors, which has always shown them as OPEN. Temps 4,5,6 are
thermistor based, and dont have a fault bit in their status register.
This patch:
2 different kinds of constants added:
- CHAN_ALM_* constants for (later) vin, temp alarm callbacks.
- CHAN_* conversion constants, used in _init_device, partly for RW1C bits
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-18 21:27:30 -06:00
|
|
|
if (!(reg & CHAN_ENA)) {
|
2007-06-09 08:11:16 -06:00
|
|
|
dev_dbg(&pdev->dev, "Forcibly "
|
2005-04-16 16:20:36 -06:00
|
|
|
"enabling in%d\n", i);
|
|
|
|
pc87360_write_value(data, LD_IN, i,
|
|
|
|
PC87365_REG_IN_STATUS,
|
|
|
|
(reg & 0x68) | 0x87);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-01-19 12:02:22 -07:00
|
|
|
/*
|
|
|
|
* We can't blindly trust the Super-I/O space configuration bit,
|
|
|
|
* most BIOS won't set it properly
|
|
|
|
*/
|
2008-10-18 21:27:34 -06:00
|
|
|
dev_dbg(&pdev->dev, "bios thermistors:%d\n", use_thermistors);
|
2006-01-09 15:24:41 -07:00
|
|
|
for (i = 11; i < data->innr; i++) {
|
2005-04-16 16:20:36 -06:00
|
|
|
reg = pc87360_read_value(data, LD_IN, i,
|
|
|
|
PC87365_REG_TEMP_STATUS);
|
hwmon/pc87360 separate alarm files: define some constants
Bring hwmon/pc87360 into agreement with
Documentation/hwmon/sysfs-interface.
Patchset adds separate limit alarms for voltages and temps, it also adds
temp[123]_fault files. On my Soekris, temps 1,2 are unused/unconnected,
so temp[123]_fault = 1,1,0 respectively. This agrees with
/usr/bin/sensors, which has always shown them as OPEN. Temps 4,5,6 are
thermistor based, and dont have a fault bit in their status register.
This patch:
2 different kinds of constants added:
- CHAN_ALM_* constants for (later) vin, temp alarm callbacks.
- CHAN_* conversion constants, used in _init_device, partly for RW1C bits
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-18 21:27:30 -06:00
|
|
|
use_thermistors = use_thermistors || (reg & CHAN_ENA);
|
2008-10-18 21:27:34 -06:00
|
|
|
/* thermistors are temp[4-6], measured on vin[11-14] */
|
|
|
|
dev_dbg(&pdev->dev, "bios temp%d_status:0x%02x\n", i-7, reg);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
2008-10-18 21:27:34 -06:00
|
|
|
dev_dbg(&pdev->dev, "using thermistors:%d\n", use_thermistors);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
i = use_thermistors ? 2 : 0;
|
2006-01-09 15:24:41 -07:00
|
|
|
for (; i < data->tempnr; i++) {
|
2008-10-18 21:27:34 -06:00
|
|
|
reg = pc87360_read_value(data, LD_TEMP, i,
|
|
|
|
PC87365_REG_TEMP_STATUS);
|
2012-01-14 22:49:53 -07:00
|
|
|
dev_dbg(&pdev->dev, "bios temp%d_status:0x%02x\n", i + 1, reg);
|
2005-04-16 16:20:36 -06:00
|
|
|
if (init >= init_temp[i]) {
|
|
|
|
/* Forcibly enable temperature channel */
|
hwmon/pc87360 separate alarm files: define some constants
Bring hwmon/pc87360 into agreement with
Documentation/hwmon/sysfs-interface.
Patchset adds separate limit alarms for voltages and temps, it also adds
temp[123]_fault files. On my Soekris, temps 1,2 are unused/unconnected,
so temp[123]_fault = 1,1,0 respectively. This agrees with
/usr/bin/sensors, which has always shown them as OPEN. Temps 4,5,6 are
thermistor based, and dont have a fault bit in their status register.
This patch:
2 different kinds of constants added:
- CHAN_ALM_* constants for (later) vin, temp alarm callbacks.
- CHAN_* conversion constants, used in _init_device, partly for RW1C bits
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-18 21:27:30 -06:00
|
|
|
if (!(reg & CHAN_ENA)) {
|
2012-01-14 22:49:53 -07:00
|
|
|
dev_dbg(&pdev->dev,
|
|
|
|
"Forcibly enabling temp%d\n", i + 1);
|
2005-04-16 16:20:36 -06:00
|
|
|
pc87360_write_value(data, LD_TEMP, i,
|
|
|
|
PC87365_REG_TEMP_STATUS,
|
|
|
|
0xCF);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (use_thermistors) {
|
2006-01-09 15:24:41 -07:00
|
|
|
for (i = 11; i < data->innr; i++) {
|
2005-04-16 16:20:36 -06:00
|
|
|
if (init >= init_in[i]) {
|
2012-01-19 12:02:22 -07:00
|
|
|
/*
|
|
|
|
* The pin may already be used by thermal
|
|
|
|
* diodes
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
reg = pc87360_read_value(data, LD_TEMP,
|
2012-01-14 22:49:53 -07:00
|
|
|
(i - 11) / 2, PC87365_REG_TEMP_STATUS);
|
hwmon/pc87360 separate alarm files: define some constants
Bring hwmon/pc87360 into agreement with
Documentation/hwmon/sysfs-interface.
Patchset adds separate limit alarms for voltages and temps, it also adds
temp[123]_fault files. On my Soekris, temps 1,2 are unused/unconnected,
so temp[123]_fault = 1,1,0 respectively. This agrees with
/usr/bin/sensors, which has always shown them as OPEN. Temps 4,5,6 are
thermistor based, and dont have a fault bit in their status register.
This patch:
2 different kinds of constants added:
- CHAN_ALM_* constants for (later) vin, temp alarm callbacks.
- CHAN_* conversion constants, used in _init_device, partly for RW1C bits
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-18 21:27:30 -06:00
|
|
|
if (reg & CHAN_ENA) {
|
2012-01-14 22:49:53 -07:00
|
|
|
dev_dbg(&pdev->dev,
|
|
|
|
"Skipping temp%d, pin already in use by temp%d\n",
|
|
|
|
i - 7, (i - 11) / 2);
|
2005-04-16 16:20:36 -06:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Forcibly enable thermistor channel */
|
|
|
|
reg = pc87360_read_value(data, LD_IN, i,
|
|
|
|
PC87365_REG_IN_STATUS);
|
hwmon/pc87360 separate alarm files: define some constants
Bring hwmon/pc87360 into agreement with
Documentation/hwmon/sysfs-interface.
Patchset adds separate limit alarms for voltages and temps, it also adds
temp[123]_fault files. On my Soekris, temps 1,2 are unused/unconnected,
so temp[123]_fault = 1,1,0 respectively. This agrees with
/usr/bin/sensors, which has always shown them as OPEN. Temps 4,5,6 are
thermistor based, and dont have a fault bit in their status register.
This patch:
2 different kinds of constants added:
- CHAN_ALM_* constants for (later) vin, temp alarm callbacks.
- CHAN_* conversion constants, used in _init_device, partly for RW1C bits
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-18 21:27:30 -06:00
|
|
|
if (!(reg & CHAN_ENA)) {
|
2012-01-14 22:49:53 -07:00
|
|
|
dev_dbg(&pdev->dev,
|
|
|
|
"Forcibly enabling temp%d\n",
|
|
|
|
i - 7);
|
2005-04-16 16:20:36 -06:00
|
|
|
pc87360_write_value(data, LD_IN, i,
|
|
|
|
PC87365_REG_TEMP_STATUS,
|
|
|
|
(reg & 0x60) | 0x8F);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->innr) {
|
|
|
|
reg = pc87360_read_value(data, LD_IN, NO_BANK,
|
|
|
|
PC87365_REG_IN_CONFIG);
|
2008-10-18 21:27:34 -06:00
|
|
|
dev_dbg(&pdev->dev, "bios vin-cfg:0x%02x\n", reg);
|
hwmon/pc87360 separate alarm files: define some constants
Bring hwmon/pc87360 into agreement with
Documentation/hwmon/sysfs-interface.
Patchset adds separate limit alarms for voltages and temps, it also adds
temp[123]_fault files. On my Soekris, temps 1,2 are unused/unconnected,
so temp[123]_fault = 1,1,0 respectively. This agrees with
/usr/bin/sensors, which has always shown them as OPEN. Temps 4,5,6 are
thermistor based, and dont have a fault bit in their status register.
This patch:
2 different kinds of constants added:
- CHAN_ALM_* constants for (later) vin, temp alarm callbacks.
- CHAN_* conversion constants, used in _init_device, partly for RW1C bits
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-18 21:27:30 -06:00
|
|
|
if (reg & CHAN_ENA) {
|
2012-01-14 22:49:53 -07:00
|
|
|
dev_dbg(&pdev->dev,
|
|
|
|
"Forcibly enabling monitoring (VLM)\n");
|
2005-04-16 16:20:36 -06:00
|
|
|
pc87360_write_value(data, LD_IN, NO_BANK,
|
|
|
|
PC87365_REG_IN_CONFIG,
|
|
|
|
reg & 0xFE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (data->tempnr) {
|
|
|
|
reg = pc87360_read_value(data, LD_TEMP, NO_BANK,
|
|
|
|
PC87365_REG_TEMP_CONFIG);
|
2008-10-18 21:27:34 -06:00
|
|
|
dev_dbg(&pdev->dev, "bios temp-cfg:0x%02x\n", reg);
|
hwmon/pc87360 separate alarm files: define some constants
Bring hwmon/pc87360 into agreement with
Documentation/hwmon/sysfs-interface.
Patchset adds separate limit alarms for voltages and temps, it also adds
temp[123]_fault files. On my Soekris, temps 1,2 are unused/unconnected,
so temp[123]_fault = 1,1,0 respectively. This agrees with
/usr/bin/sensors, which has always shown them as OPEN. Temps 4,5,6 are
thermistor based, and dont have a fault bit in their status register.
This patch:
2 different kinds of constants added:
- CHAN_ALM_* constants for (later) vin, temp alarm callbacks.
- CHAN_* conversion constants, used in _init_device, partly for RW1C bits
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-18 21:27:30 -06:00
|
|
|
if (reg & CHAN_ENA) {
|
2012-01-14 22:49:53 -07:00
|
|
|
dev_dbg(&pdev->dev,
|
|
|
|
"Forcibly enabling monitoring (TMS)\n");
|
2005-04-16 16:20:36 -06:00
|
|
|
pc87360_write_value(data, LD_TEMP, NO_BANK,
|
|
|
|
PC87365_REG_TEMP_CONFIG,
|
|
|
|
reg & 0xFE);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (init >= 2) {
|
|
|
|
/* Chip config as documented by National Semi. */
|
|
|
|
pc87360_write_value(data, LD_TEMP, 0xF, 0xA, 0x08);
|
2012-01-19 12:02:22 -07:00
|
|
|
/*
|
|
|
|
* We voluntarily omit the bank here, in case the
|
|
|
|
* sequence itself matters. It shouldn't be a problem,
|
|
|
|
* since nobody else is supposed to access the
|
|
|
|
* device at that point.
|
|
|
|
*/
|
2005-04-16 16:20:36 -06:00
|
|
|
pc87360_write_value(data, LD_TEMP, NO_BANK, 0xB, 0x04);
|
|
|
|
pc87360_write_value(data, LD_TEMP, NO_BANK, 0xC, 0x35);
|
|
|
|
pc87360_write_value(data, LD_TEMP, NO_BANK, 0xD, 0x05);
|
|
|
|
pc87360_write_value(data, LD_TEMP, NO_BANK, 0xE, 0x05);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-06-09 08:11:16 -06:00
|
|
|
static void pc87360_autodiv(struct device *dev, int nr)
|
2005-04-16 16:20:36 -06:00
|
|
|
{
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
u8 old_min = data->fan_min[nr];
|
|
|
|
|
|
|
|
/* Increase clock divider if needed and possible */
|
|
|
|
if ((data->fan_status[nr] & 0x04) /* overflow flag */
|
|
|
|
|| (data->fan[nr] >= 224)) { /* next to overflow */
|
|
|
|
if ((data->fan_status[nr] & 0x60) != 0x60) {
|
|
|
|
data->fan_status[nr] += 0x20;
|
|
|
|
data->fan_min[nr] >>= 1;
|
|
|
|
data->fan[nr] >>= 1;
|
2007-06-09 08:11:16 -06:00
|
|
|
dev_dbg(dev, "Increasing "
|
2005-04-16 16:20:36 -06:00
|
|
|
"clock divider to %d for fan %d\n",
|
2012-01-14 22:49:53 -07:00
|
|
|
FAN_DIV_FROM_REG(data->fan_status[nr]), nr + 1);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Decrease clock divider if possible */
|
|
|
|
while (!(data->fan_min[nr] & 0x80) /* min "nails" divider */
|
|
|
|
&& data->fan[nr] < 85 /* bad accuracy */
|
|
|
|
&& (data->fan_status[nr] & 0x60) != 0x00) {
|
|
|
|
data->fan_status[nr] -= 0x20;
|
|
|
|
data->fan_min[nr] <<= 1;
|
|
|
|
data->fan[nr] <<= 1;
|
2007-06-09 08:11:16 -06:00
|
|
|
dev_dbg(dev, "Decreasing "
|
2005-04-16 16:20:36 -06:00
|
|
|
"clock divider to %d for fan %d\n",
|
|
|
|
FAN_DIV_FROM_REG(data->fan_status[nr]),
|
2012-01-14 22:49:53 -07:00
|
|
|
nr + 1);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Write new fan min if it changed */
|
|
|
|
if (old_min != data->fan_min[nr]) {
|
|
|
|
pc87360_write_value(data, LD_FAN, NO_BANK,
|
|
|
|
PC87360_REG_FAN_MIN(nr),
|
|
|
|
data->fan_min[nr]);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct pc87360_data *pc87360_update_device(struct device *dev)
|
|
|
|
{
|
2007-06-09 08:11:16 -06:00
|
|
|
struct pc87360_data *data = dev_get_drvdata(dev);
|
2005-04-16 16:20:36 -06:00
|
|
|
u8 i;
|
|
|
|
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_lock(&data->update_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
if (time_after(jiffies, data->last_updated + HZ * 2) || !data->valid) {
|
2007-06-09 08:11:16 -06:00
|
|
|
dev_dbg(dev, "Data update\n");
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
/* Fans */
|
|
|
|
for (i = 0; i < data->fannr; i++) {
|
|
|
|
if (FAN_CONFIG_MONITOR(data->fan_conf, i)) {
|
|
|
|
data->fan_status[i] =
|
|
|
|
pc87360_read_value(data, LD_FAN,
|
|
|
|
NO_BANK, PC87360_REG_FAN_STATUS(i));
|
|
|
|
data->fan[i] = pc87360_read_value(data, LD_FAN,
|
|
|
|
NO_BANK, PC87360_REG_FAN(i));
|
|
|
|
data->fan_min[i] = pc87360_read_value(data,
|
|
|
|
LD_FAN, NO_BANK,
|
|
|
|
PC87360_REG_FAN_MIN(i));
|
|
|
|
/* Change clock divider if needed */
|
2007-06-09 08:11:16 -06:00
|
|
|
pc87360_autodiv(dev, i);
|
2005-04-16 16:20:36 -06:00
|
|
|
/* Clear bits and write new divider */
|
|
|
|
pc87360_write_value(data, LD_FAN, NO_BANK,
|
|
|
|
PC87360_REG_FAN_STATUS(i),
|
|
|
|
data->fan_status[i]);
|
|
|
|
}
|
|
|
|
if (FAN_CONFIG_CONTROL(data->fan_conf, i))
|
|
|
|
data->pwm[i] = pc87360_read_value(data, LD_FAN,
|
|
|
|
NO_BANK, PC87360_REG_PWM(i));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Voltages */
|
|
|
|
for (i = 0; i < data->innr; i++) {
|
|
|
|
data->in_status[i] = pc87360_read_value(data, LD_IN, i,
|
|
|
|
PC87365_REG_IN_STATUS);
|
|
|
|
/* Clear bits */
|
|
|
|
pc87360_write_value(data, LD_IN, i,
|
|
|
|
PC87365_REG_IN_STATUS,
|
|
|
|
data->in_status[i]);
|
hwmon/pc87360 separate alarm files: define some constants
Bring hwmon/pc87360 into agreement with
Documentation/hwmon/sysfs-interface.
Patchset adds separate limit alarms for voltages and temps, it also adds
temp[123]_fault files. On my Soekris, temps 1,2 are unused/unconnected,
so temp[123]_fault = 1,1,0 respectively. This agrees with
/usr/bin/sensors, which has always shown them as OPEN. Temps 4,5,6 are
thermistor based, and dont have a fault bit in their status register.
This patch:
2 different kinds of constants added:
- CHAN_ALM_* constants for (later) vin, temp alarm callbacks.
- CHAN_* conversion constants, used in _init_device, partly for RW1C bits
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-18 21:27:30 -06:00
|
|
|
if ((data->in_status[i] & CHAN_READY) == CHAN_READY) {
|
2005-04-16 16:20:36 -06:00
|
|
|
data->in[i] = pc87360_read_value(data, LD_IN,
|
|
|
|
i, PC87365_REG_IN);
|
|
|
|
}
|
hwmon/pc87360 separate alarm files: define some constants
Bring hwmon/pc87360 into agreement with
Documentation/hwmon/sysfs-interface.
Patchset adds separate limit alarms for voltages and temps, it also adds
temp[123]_fault files. On my Soekris, temps 1,2 are unused/unconnected,
so temp[123]_fault = 1,1,0 respectively. This agrees with
/usr/bin/sensors, which has always shown them as OPEN. Temps 4,5,6 are
thermistor based, and dont have a fault bit in their status register.
This patch:
2 different kinds of constants added:
- CHAN_ALM_* constants for (later) vin, temp alarm callbacks.
- CHAN_* conversion constants, used in _init_device, partly for RW1C bits
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-18 21:27:30 -06:00
|
|
|
if (data->in_status[i] & CHAN_ENA) {
|
2005-04-16 16:20:36 -06:00
|
|
|
data->in_min[i] = pc87360_read_value(data,
|
|
|
|
LD_IN, i,
|
|
|
|
PC87365_REG_IN_MIN);
|
|
|
|
data->in_max[i] = pc87360_read_value(data,
|
|
|
|
LD_IN, i,
|
|
|
|
PC87365_REG_IN_MAX);
|
|
|
|
if (i >= 11)
|
|
|
|
data->in_crit[i-11] =
|
|
|
|
pc87360_read_value(data, LD_IN,
|
|
|
|
i, PC87365_REG_TEMP_CRIT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (data->innr) {
|
|
|
|
data->in_alarms = pc87360_read_value(data, LD_IN,
|
|
|
|
NO_BANK, PC87365_REG_IN_ALARMS1)
|
|
|
|
| ((pc87360_read_value(data, LD_IN,
|
|
|
|
NO_BANK, PC87365_REG_IN_ALARMS2)
|
|
|
|
& 0x07) << 8);
|
|
|
|
data->vid = (data->vid_conf & 0xE0) ?
|
|
|
|
pc87360_read_value(data, LD_IN,
|
|
|
|
NO_BANK, PC87365_REG_VID) : 0x1F;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Temperatures */
|
|
|
|
for (i = 0; i < data->tempnr; i++) {
|
|
|
|
data->temp_status[i] = pc87360_read_value(data,
|
|
|
|
LD_TEMP, i,
|
|
|
|
PC87365_REG_TEMP_STATUS);
|
|
|
|
/* Clear bits */
|
|
|
|
pc87360_write_value(data, LD_TEMP, i,
|
|
|
|
PC87365_REG_TEMP_STATUS,
|
|
|
|
data->temp_status[i]);
|
hwmon/pc87360 separate alarm files: define some constants
Bring hwmon/pc87360 into agreement with
Documentation/hwmon/sysfs-interface.
Patchset adds separate limit alarms for voltages and temps, it also adds
temp[123]_fault files. On my Soekris, temps 1,2 are unused/unconnected,
so temp[123]_fault = 1,1,0 respectively. This agrees with
/usr/bin/sensors, which has always shown them as OPEN. Temps 4,5,6 are
thermistor based, and dont have a fault bit in their status register.
This patch:
2 different kinds of constants added:
- CHAN_ALM_* constants for (later) vin, temp alarm callbacks.
- CHAN_* conversion constants, used in _init_device, partly for RW1C bits
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-18 21:27:30 -06:00
|
|
|
if ((data->temp_status[i] & CHAN_READY) == CHAN_READY) {
|
2005-04-16 16:20:36 -06:00
|
|
|
data->temp[i] = pc87360_read_value(data,
|
|
|
|
LD_TEMP, i,
|
|
|
|
PC87365_REG_TEMP);
|
|
|
|
}
|
hwmon/pc87360 separate alarm files: define some constants
Bring hwmon/pc87360 into agreement with
Documentation/hwmon/sysfs-interface.
Patchset adds separate limit alarms for voltages and temps, it also adds
temp[123]_fault files. On my Soekris, temps 1,2 are unused/unconnected,
so temp[123]_fault = 1,1,0 respectively. This agrees with
/usr/bin/sensors, which has always shown them as OPEN. Temps 4,5,6 are
thermistor based, and dont have a fault bit in their status register.
This patch:
2 different kinds of constants added:
- CHAN_ALM_* constants for (later) vin, temp alarm callbacks.
- CHAN_* conversion constants, used in _init_device, partly for RW1C bits
Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
Cc: Jean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2008-10-18 21:27:30 -06:00
|
|
|
if (data->temp_status[i] & CHAN_ENA) {
|
2005-04-16 16:20:36 -06:00
|
|
|
data->temp_min[i] = pc87360_read_value(data,
|
|
|
|
LD_TEMP, i,
|
|
|
|
PC87365_REG_TEMP_MIN);
|
|
|
|
data->temp_max[i] = pc87360_read_value(data,
|
|
|
|
LD_TEMP, i,
|
|
|
|
PC87365_REG_TEMP_MAX);
|
|
|
|
data->temp_crit[i] = pc87360_read_value(data,
|
|
|
|
LD_TEMP, i,
|
|
|
|
PC87365_REG_TEMP_CRIT);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (data->tempnr) {
|
|
|
|
data->temp_alarms = pc87360_read_value(data, LD_TEMP,
|
|
|
|
NO_BANK, PC87365_REG_TEMP_ALARMS)
|
|
|
|
& 0x3F;
|
|
|
|
}
|
|
|
|
|
|
|
|
data->last_updated = jiffies;
|
|
|
|
data->valid = 1;
|
|
|
|
}
|
|
|
|
|
2006-01-18 15:19:26 -07:00
|
|
|
mutex_unlock(&data->update_lock);
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
return data;
|
|
|
|
}
|
|
|
|
|
2007-06-09 08:11:16 -06:00
|
|
|
static int __init pc87360_device_add(unsigned short address)
|
|
|
|
{
|
2010-08-14 13:08:48 -06:00
|
|
|
struct resource res[3];
|
|
|
|
int err, i, res_count;
|
2007-06-09 08:11:16 -06:00
|
|
|
|
|
|
|
pdev = platform_device_alloc("pc87360", address);
|
|
|
|
if (!pdev) {
|
|
|
|
err = -ENOMEM;
|
2011-01-12 13:55:11 -07:00
|
|
|
pr_err("Device allocation failed\n");
|
2007-06-09 08:11:16 -06:00
|
|
|
goto exit;
|
|
|
|
}
|
|
|
|
|
2010-08-14 13:08:48 -06:00
|
|
|
memset(res, 0, 3 * sizeof(struct resource));
|
|
|
|
res_count = 0;
|
2007-06-09 08:11:16 -06:00
|
|
|
for (i = 0; i < 3; i++) {
|
|
|
|
if (!extra_isa[i])
|
|
|
|
continue;
|
2010-08-14 13:08:48 -06:00
|
|
|
res[res_count].start = extra_isa[i];
|
|
|
|
res[res_count].end = extra_isa[i] + PC87360_EXTENT - 1;
|
|
|
|
res[res_count].name = "pc87360",
|
|
|
|
res[res_count].flags = IORESOURCE_IO,
|
2009-01-07 08:37:35 -07:00
|
|
|
|
2010-08-14 13:08:48 -06:00
|
|
|
err = acpi_check_resource_conflict(&res[res_count]);
|
2009-01-07 08:37:35 -07:00
|
|
|
if (err)
|
|
|
|
goto exit_device_put;
|
|
|
|
|
2010-08-14 13:08:48 -06:00
|
|
|
res_count++;
|
|
|
|
}
|
|
|
|
|
|
|
|
err = platform_device_add_resources(pdev, res, res_count);
|
|
|
|
if (err) {
|
2011-01-12 13:55:11 -07:00
|
|
|
pr_err("Device resources addition failed (%d)\n", err);
|
2010-08-14 13:08:48 -06:00
|
|
|
goto exit_device_put;
|
2007-06-09 08:11:16 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
err = platform_device_add(pdev);
|
|
|
|
if (err) {
|
2011-01-12 13:55:11 -07:00
|
|
|
pr_err("Device addition failed (%d)\n", err);
|
2007-06-09 08:11:16 -06:00
|
|
|
goto exit_device_put;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
exit_device_put:
|
|
|
|
platform_device_put(pdev);
|
|
|
|
exit:
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
2005-04-16 16:20:36 -06:00
|
|
|
static int __init pc87360_init(void)
|
|
|
|
{
|
2007-06-09 08:11:16 -06:00
|
|
|
int err, i;
|
|
|
|
unsigned short address = 0;
|
2005-04-16 16:20:36 -06:00
|
|
|
|
|
|
|
if (pc87360_find(0x2e, &devid, extra_isa)
|
|
|
|
&& pc87360_find(0x4e, &devid, extra_isa)) {
|
2011-01-12 13:55:11 -07:00
|
|
|
pr_warn("PC8736x not detected, module not inserted\n");
|
2005-04-16 16:20:36 -06:00
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Arbitrarily pick one of the addresses */
|
|
|
|
for (i = 0; i < 3; i++) {
|
|
|
|
if (extra_isa[i] != 0x0000) {
|
[PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (5/9)
Call the ISA chip drivers detection function directly instead of relying
on i2c_detect. The net effect is that address lists won't be handled
anymore, but they were mostly useless in the ISA case anyway (pc87360,
smsc47m1, smsc47b397 had already dropped them).
We don't need to handle multiple devices, all we may need is a way to
force a given address instead of the original one (some drivers already
do: sis5595, via686a, w83627hf), and, for drivers supporting multiple
chips, a way to force one given kind. All this may be added later on
demand, but I actually don't think there will be much demand.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-07-19 15:56:35 -06:00
|
|
|
address = extra_isa[i];
|
2005-04-16 16:20:36 -06:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
[PATCH] I2C: Separate non-i2c hwmon drivers from i2c-core (5/9)
Call the ISA chip drivers detection function directly instead of relying
on i2c_detect. The net effect is that address lists won't be handled
anymore, but they were mostly useless in the ISA case anyway (pc87360,
smsc47m1, smsc47b397 had already dropped them).
We don't need to handle multiple devices, all we may need is a way to
force a given address instead of the original one (some drivers already
do: sis5595, via686a, w83627hf), and, for drivers supporting multiple
chips, a way to force one given kind. All this may be added later on
demand, but I actually don't think there will be much demand.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2005-07-19 15:56:35 -06:00
|
|
|
if (address == 0x0000) {
|
2011-01-12 13:55:11 -07:00
|
|
|
pr_warn("No active logical device, module not inserted\n");
|
2005-04-16 16:20:36 -06:00
|
|
|
return -ENODEV;
|
|
|
|
}
|
|
|
|
|
2007-06-09 08:11:16 -06:00
|
|
|
err = platform_driver_register(&pc87360_driver);
|
|
|
|
if (err)
|
|
|
|
goto exit;
|
|
|
|
|
|
|
|
/* Sets global pdev as a side effect */
|
|
|
|
err = pc87360_device_add(address);
|
|
|
|
if (err)
|
|
|
|
goto exit_driver;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
exit_driver:
|
|
|
|
platform_driver_unregister(&pc87360_driver);
|
|
|
|
exit:
|
|
|
|
return err;
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
static void __exit pc87360_exit(void)
|
|
|
|
{
|
2007-06-09 08:11:16 -06:00
|
|
|
platform_device_unregister(pdev);
|
|
|
|
platform_driver_unregister(&pc87360_driver);
|
2005-04-16 16:20:36 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
|
|
|
|
MODULE_DESCRIPTION("PC8736x hardware monitor");
|
|
|
|
MODULE_LICENSE("GPL");
|
|
|
|
|
|
|
|
module_init(pc87360_init);
|
|
|
|
module_exit(pc87360_exit);
|