Skip to content

L
linux
Commit 1ea6dd38 authored by David Hubbard's avatar David Hubbard Committed by Mark M. Hoffman
Browse files
Options

hwmon/w83627ehf: Convert to a platform driver 

Remove i2c-isa from the w83627ehf driver, and use a platform driver
instead.
Signed-off-by: default avatarDavid Hubbard <david.c.hubbard@gmail.com>
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarMark M. Hoffman <mhoffman@lightlink.com>
parent 658291fc
Hide whitespace changes
Inline Side-by-side
Showing with 286 additions and 224 deletions
drivers/hwmon/Kconfig
View file @ 1ea6dd38
...@@ -618,8 +618,6 @@ config SENSORS_W83627HF ...@@ -618,8 +618,6 @@ config SENSORS_W83627HF
config SENSORS_W83627EHF config SENSORS_W83627EHF
tristate "Winbond W83627EHF/DHG" tristate "Winbond W83627EHF/DHG"
depends on I2C && EXPERIMENTAL
select I2C_ISA
help help
If you say yes here you get support for the hardware If you say yes here you get support for the hardware
monitoring functionality of the Winbond W83627EHF Super-I/O chip. monitoring functionality of the Winbond W83627EHF Super-I/O chip.
......
drivers/hwmon/w83627ehf.c
View file @ 1ea6dd38
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/i2c.h> #include <linux/jiffies.h>
#include <linux/i2c-isa.h> #include <linux/platform_device.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h> #include <linux/hwmon-sysfs.h>
#include <linux/err.h> #include <linux/err.h>
...@@ -50,25 +50,19 @@ ...@@ -50,25 +50,19 @@
#include <asm/io.h> #include <asm/io.h>
#include "lm75.h" #include "lm75.h"
/* The actual ISA address is read from Super-I/O configuration space */ enum kinds { w83627ehf, w83627dhg };
static unsigned short address;
/* /* used to set data->name = w83627ehf_device_names[data->sio_kind] */
* Super-I/O constants and functions static const char * w83627ehf_device_names[] = {
*/ "w83627ehf",
"w83627dhg",
};
#define DRVNAME "w83627ehf"
/* /*
* The three following globals are initialized in w83627ehf_find(), before * Super-I/O constants and functions
* the i2c-isa device is created. Otherwise, they could be stored in
* w83627ehf_data. This is ugly, but necessary, and when the driver is next
* updated to become a platform driver, the globals will disappear.
*/ */
static int REG; /* The register to read/write */
static int VAL; /* The value to read/write */
/* The w83627ehf/ehg have 10 voltage inputs, but the w83627dhg has 9. This
* value is also used in w83627ehf_detect() to export a device name in sysfs
* (e.g. w83627ehf or w83627dhg) */
static int w83627ehf_num_in;
#define W83627EHF_LD_HWM 0x0b #define W83627EHF_LD_HWM 0x0b
...@@ -83,38 +77,38 @@ static int w83627ehf_num_in; ...@@ -83,38 +77,38 @@ static int w83627ehf_num_in;
#define SIO_ID_MASK 0xFFF0 #define SIO_ID_MASK 0xFFF0
static inline void static inline void
superio_outb(int reg, int val) superio_outb(int ioreg, int reg, int val)
{ {
outb(reg, REG); outb(reg, ioreg);
outb(val, VAL); outb(val, ioreg + 1);
} }
static inline int static inline int
superio_inb(int reg) superio_inb(int ioreg, int reg)
{ {
outb(reg, REG); outb(reg, ioreg);
return inb(VAL); return inb(ioreg + 1);
} }
static inline void static inline void
superio_select(int ld) superio_select(int ioreg, int ld)
{ {
outb(SIO_REG_LDSEL, REG); outb(SIO_REG_LDSEL, ioreg);
outb(ld, VAL); outb(ld, ioreg + 1);
} }
static inline void static inline void
superio_enter(void) superio_enter(int ioreg)
{ {
outb(0x87, REG); outb(0x87, ioreg);
outb(0x87, REG); outb(0x87, ioreg);
} }
static inline void static inline void
superio_exit(void) superio_exit(int ioreg)
{ {
outb(0x02, REG); outb(0x02, ioreg);
outb(0x02, VAL); outb(0x02, ioreg + 1);
} }
/* /*
...@@ -124,8 +118,8 @@ superio_exit(void) ...@@ -124,8 +118,8 @@ superio_exit(void)
#define IOREGION_ALIGNMENT ~7 #define IOREGION_ALIGNMENT ~7
#define IOREGION_OFFSET 5 #define IOREGION_OFFSET 5
#define IOREGION_LENGTH 2 #define IOREGION_LENGTH 2
#define ADDR_REG_OFFSET 5 #define ADDR_REG_OFFSET 0
#define DATA_REG_OFFSET 6 #define DATA_REG_OFFSET 1
#define W83627EHF_REG_BANK 0x4E #define W83627EHF_REG_BANK 0x4E
#define W83627EHF_REG_CONFIG 0x40 #define W83627EHF_REG_CONFIG 0x40
...@@ -255,7 +249,9 @@ static inline u8 in_to_reg(u32 val, u8 nr) ...@@ -255,7 +249,9 @@ static inline u8 in_to_reg(u32 val, u8 nr)
*/ */
struct w83627ehf_data { struct w83627ehf_data {
struct i2c_client client; int addr; /* IO base of hw monitor block */
const char *name;
struct class_device *class_dev; struct class_device *class_dev;
struct mutex lock; struct mutex lock;
...@@ -264,6 +260,7 @@ struct w83627ehf_data { ...@@ -264,6 +260,7 @@ struct w83627ehf_data {
unsigned long last_updated; /* In jiffies */ unsigned long last_updated; /* In jiffies */
/* Register values */ /* Register values */
u8 in_num; /* number of in inputs we have */
u8 in[10]; /* Register value */ u8 in[10]; /* Register value */
u8 in_max[10]; /* Register value */ u8 in_max[10]; /* Register value */
u8 in_min[10]; /* Register value */ u8 in_min[10]; /* Register value */
...@@ -290,6 +287,11 @@ struct w83627ehf_data { ...@@ -290,6 +287,11 @@ struct w83627ehf_data {
u8 fan_stop_time[4]; u8 fan_stop_time[4];
}; };
struct w83627ehf_sio_data {
int sioreg;
enum kinds kind;
};
static inline int is_word_sized(u16 reg) static inline int is_word_sized(u16 reg)
{ {
return (((reg & 0xff00) == 0x100 return (((reg & 0xff00) == 0x100
...@@ -303,121 +305,117 @@ static inline int is_word_sized(u16 reg) ...@@ -303,121 +305,117 @@ static inline int is_word_sized(u16 reg)
nothing for registers which live in bank 0. For others, they respectively nothing for registers which live in bank 0. For others, they respectively
set the bank register to the correct value (before the register is set the bank register to the correct value (before the register is
accessed), and back to 0 (afterwards). */ accessed), and back to 0 (afterwards). */
static inline void w83627ehf_set_bank(struct i2c_client *client, u16 reg) static inline void w83627ehf_set_bank(struct w83627ehf_data *data, u16 reg)
{ {
if (reg & 0xff00) { if (reg & 0xff00) {
outb_p(W83627EHF_REG_BANK, client->addr + ADDR_REG_OFFSET); outb_p(W83627EHF_REG_BANK, data->addr + ADDR_REG_OFFSET);
outb_p(reg >> 8, client->addr + DATA_REG_OFFSET); outb_p(reg >> 8, data->addr + DATA_REG_OFFSET);
} }
} }
static inline void w83627ehf_reset_bank(struct i2c_client *client, u16 reg) static inline void w83627ehf_reset_bank(struct w83627ehf_data *data, u16 reg)
{ {
if (reg & 0xff00) { if (reg & 0xff00) {
outb_p(W83627EHF_REG_BANK, client->addr + ADDR_REG_OFFSET); outb_p(W83627EHF_REG_BANK, data->addr + ADDR_REG_OFFSET);
outb_p(0, client->addr + DATA_REG_OFFSET); outb_p(0, data->addr + DATA_REG_OFFSET);
} }
} }
static u16 w83627ehf_read_value(struct i2c_client *client, u16 reg) static u16 w83627ehf_read_value(struct w83627ehf_data *data, u16 reg)
{ {
struct w83627ehf_data *data = i2c_get_clientdata(client);
int res, word_sized = is_word_sized(reg); int res, word_sized = is_word_sized(reg);
mutex_lock(&data->lock); mutex_lock(&data->lock);
w83627ehf_set_bank(client, reg); w83627ehf_set_bank(data, reg);
outb_p(reg & 0xff, client->addr + ADDR_REG_OFFSET); outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
res = inb_p(client->addr + DATA_REG_OFFSET); res = inb_p(data->addr + DATA_REG_OFFSET);
if (word_sized) { if (word_sized) {
outb_p((reg & 0xff) + 1, outb_p((reg & 0xff) + 1,
client->addr + ADDR_REG_OFFSET); data->addr + ADDR_REG_OFFSET);
res = (res << 8) + inb_p(client->addr + DATA_REG_OFFSET); res = (res << 8) + inb_p(data->addr + DATA_REG_OFFSET);
} }
w83627ehf_reset_bank(client, reg); w83627ehf_reset_bank(data, reg);
mutex_unlock(&data->lock); mutex_unlock(&data->lock);
return res; return res;
} }
static int w83627ehf_write_value(struct i2c_client *client, u16 reg, u16 value) static int w83627ehf_write_value(struct w83627ehf_data *data, u16 reg, u16 value)
{ {
struct w83627ehf_data *data = i2c_get_clientdata(client);
int word_sized = is_word_sized(reg); int word_sized = is_word_sized(reg);
mutex_lock(&data->lock); mutex_lock(&data->lock);
w83627ehf_set_bank(client, reg); w83627ehf_set_bank(data, reg);
outb_p(reg & 0xff, client->addr + ADDR_REG_OFFSET); outb_p(reg & 0xff, data->addr + ADDR_REG_OFFSET);
if (word_sized) { if (word_sized) {
outb_p(value >> 8, client->addr + DATA_REG_OFFSET); outb_p(value >> 8, data->addr + DATA_REG_OFFSET);
outb_p((reg & 0xff) + 1, outb_p((reg & 0xff) + 1,
client->addr + ADDR_REG_OFFSET); data->addr + ADDR_REG_OFFSET);
} }
outb_p(value & 0xff, client->addr + DATA_REG_OFFSET); outb_p(value & 0xff, data->addr + DATA_REG_OFFSET);
w83627ehf_reset_bank(client, reg); w83627ehf_reset_bank(data, reg);
mutex_unlock(&data->lock); mutex_unlock(&data->lock);
return 0; return 0;
} }
/* This function assumes that the caller holds data->update_lock */ /* This function assumes that the caller holds data->update_lock */
static void w83627ehf_write_fan_div(struct i2c_client *client, int nr) static void w83627ehf_write_fan_div(struct w83627ehf_data *data, int nr)
{ {
struct w83627ehf_data *data = i2c_get_clientdata(client);
u8 reg; u8 reg;
switch (nr) { switch (nr) {
case 0: case 0:
reg = (w83627ehf_read_value(client, W83627EHF_REG_FANDIV1) & 0xcf) reg = (w83627ehf_read_value(data, W83627EHF_REG_FANDIV1) & 0xcf)
| ((data->fan_div[0] & 0x03) << 4); | ((data->fan_div[0] & 0x03) << 4);
/* fan5 input control bit is write only, compute the value */ /* fan5 input control bit is write only, compute the value */
reg |= (data->has_fan & (1 << 4)) ? 1 : 0; reg |= (data->has_fan & (1 << 4)) ? 1 : 0;
w83627ehf_write_value(client, W83627EHF_REG_FANDIV1, reg); w83627ehf_write_value(data, W83627EHF_REG_FANDIV1, reg);
reg = (w83627ehf_read_value(client, W83627EHF_REG_VBAT) & 0xdf) reg = (w83627ehf_read_value(data, W83627EHF_REG_VBAT) & 0xdf)
| ((data->fan_div[0] & 0x04) << 3); | ((data->fan_div[0] & 0x04) << 3);
w83627ehf_write_value(client, W83627EHF_REG_VBAT, reg); w83627ehf_write_value(data, W83627EHF_REG_VBAT, reg);
break; break;
case 1: case 1:
reg = (w83627ehf_read_value(client, W83627EHF_REG_FANDIV1) & 0x3f) reg = (w83627ehf_read_value(data, W83627EHF_REG_FANDIV1) & 0x3f)
| ((data->fan_div[1] & 0x03) << 6); | ((data->fan_div[1] & 0x03) << 6);
/* fan5 input control bit is write only, compute the value */ /* fan5 input control bit is write only, compute the value */
reg |= (data->has_fan & (1 << 4)) ? 1 : 0; reg |= (data->has_fan & (1 << 4)) ? 1 : 0;
w83627ehf_write_value(client, W83627EHF_REG_FANDIV1, reg); w83627ehf_write_value(data, W83627EHF_REG_FANDIV1, reg);
reg = (w83627ehf_read_value(client, W83627EHF_REG_VBAT) & 0xbf) reg = (w83627ehf_read_value(data, W83627EHF_REG_VBAT) & 0xbf)
| ((data->fan_div[1] & 0x04) << 4); | ((data->fan_div[1] & 0x04) << 4);
w83627ehf_write_value(client, W83627EHF_REG_VBAT, reg); w83627ehf_write_value(data, W83627EHF_REG_VBAT, reg);
break; break;
case 2: case 2:
reg = (w83627ehf_read_value(client, W83627EHF_REG_FANDIV2) & 0x3f) reg = (w83627ehf_read_value(data, W83627EHF_REG_FANDIV2) & 0x3f)
| ((data->fan_div[2] & 0x03) << 6); | ((data->fan_div[2] & 0x03) << 6);
w83627ehf_write_value(client, W83627EHF_REG_FANDIV2, reg); w83627ehf_write_value(data, W83627EHF_REG_FANDIV2, reg);
reg = (w83627ehf_read_value(client, W83627EHF_REG_VBAT) & 0x7f) reg = (w83627ehf_read_value(data, W83627EHF_REG_VBAT) & 0x7f)
| ((data->fan_div[2] & 0x04) << 5); | ((data->fan_div[2] & 0x04) << 5);
w83627ehf_write_value(client, W83627EHF_REG_VBAT, reg); w83627ehf_write_value(data, W83627EHF_REG_VBAT, reg);
break; break;
case 3: case 3:
reg = (w83627ehf_read_value(client, W83627EHF_REG_DIODE) & 0xfc) reg = (w83627ehf_read_value(data, W83627EHF_REG_DIODE) & 0xfc)
| (data->fan_div[3] & 0x03); | (data->fan_div[3] & 0x03);
w83627ehf_write_value(client, W83627EHF_REG_DIODE, reg); w83627ehf_write_value(data, W83627EHF_REG_DIODE, reg);
reg = (w83627ehf_read_value(client, W83627EHF_REG_SMI_OVT) & 0x7f) reg = (w83627ehf_read_value(data, W83627EHF_REG_SMI_OVT) & 0x7f)
| ((data->fan_div[3] & 0x04) << 5); | ((data->fan_div[3] & 0x04) << 5);
w83627ehf_write_value(client, W83627EHF_REG_SMI_OVT, reg); w83627ehf_write_value(data, W83627EHF_REG_SMI_OVT, reg);
break; break;
case 4: case 4:
reg = (w83627ehf_read_value(client, W83627EHF_REG_DIODE) & 0x73) reg = (w83627ehf_read_value(data, W83627EHF_REG_DIODE) & 0x73)
| ((data->fan_div[4] & 0x03) << 2) | ((data->fan_div[4] & 0x03) << 2)
| ((data->fan_div[4] & 0x04) << 5); | ((data->fan_div[4] & 0x04) << 5);
w83627ehf_write_value(client, W83627EHF_REG_DIODE, reg); w83627ehf_write_value(data, W83627EHF_REG_DIODE, reg);
break; break;
} }
} }
static struct w83627ehf_data *w83627ehf_update_device(struct device *dev) static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83627ehf_data *data = dev_get_drvdata(dev);
struct w83627ehf_data *data = i2c_get_clientdata(client);
int pwmcfg = 0, tolerance = 0; /* shut up the compiler */ int pwmcfg = 0, tolerance = 0; /* shut up the compiler */
int i; int i;
...@@ -426,33 +424,33 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev) ...@@ -426,33 +424,33 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
if (time_after(jiffies, data->last_updated + HZ) if (time_after(jiffies, data->last_updated + HZ)
|| !data->valid) { || !data->valid) {
/* Fan clock dividers */ /* Fan clock dividers */
i = w83627ehf_read_value(client, W83627EHF_REG_FANDIV1); i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV1);
data->fan_div[0] = (i >> 4) & 0x03; data->fan_div[0] = (i >> 4) & 0x03;
data->fan_div[1] = (i >> 6) & 0x03; data->fan_div[1] = (i >> 6) & 0x03;
i = w83627ehf_read_value(client, W83627EHF_REG_FANDIV2); i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV2);
data->fan_div[2] = (i >> 6) & 0x03; data->fan_div[2] = (i >> 6) & 0x03;
i = w83627ehf_read_value(client, W83627EHF_REG_VBAT); i = w83627ehf_read_value(data, W83627EHF_REG_VBAT);
data->fan_div[0] |= (i >> 3) & 0x04; data->fan_div[0] |= (i >> 3) & 0x04;
data->fan_div[1] |= (i >> 4) & 0x04; data->fan_div[1] |= (i >> 4) & 0x04;
data->fan_div[2] |= (i >> 5) & 0x04; data->fan_div[2] |= (i >> 5) & 0x04;
if (data->has_fan & ((1 << 3) | (1 << 4))) { if (data->has_fan & ((1 << 3) | (1 << 4))) {
i = w83627ehf_read_value(client, W83627EHF_REG_DIODE); i = w83627ehf_read_value(data, W83627EHF_REG_DIODE);
data->fan_div[3] = i & 0x03; data->fan_div[3] = i & 0x03;
data->fan_div[4] = ((i >> 2) & 0x03) data->fan_div[4] = ((i >> 2) & 0x03)
| ((i >> 5) & 0x04); | ((i >> 5) & 0x04);
} }
if (data->has_fan & (1 << 3)) { if (data->has_fan & (1 << 3)) {
i = w83627ehf_read_value(client, W83627EHF_REG_SMI_OVT); i = w83627ehf_read_value(data, W83627EHF_REG_SMI_OVT);
data->fan_div[3] |= (i >> 5) & 0x04; data->fan_div[3] |= (i >> 5) & 0x04;
} }
/* Measured voltages and limits */ /* Measured voltages and limits */
for (i = 0; i < w83627ehf_num_in; i++) { for (i = 0; i < data->in_num; i++) {
data->in[i] = w83627ehf_read_value(client, data->in[i] = w83627ehf_read_value(data,
W83627EHF_REG_IN(i)); W83627EHF_REG_IN(i));
data->in_min[i] = w83627ehf_read_value(client, data->in_min[i] = w83627ehf_read_value(data,
W83627EHF_REG_IN_MIN(i)); W83627EHF_REG_IN_MIN(i));
data->in_max[i] = w83627ehf_read_value(client, data->in_max[i] = w83627ehf_read_value(data,
W83627EHF_REG_IN_MAX(i)); W83627EHF_REG_IN_MAX(i));
} }
...@@ -461,9 +459,9 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev) ...@@ -461,9 +459,9 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
if (!(data->has_fan & (1 << i))) if (!(data->has_fan & (1 << i)))
continue; continue;
data->fan[i] = w83627ehf_read_value(client, data->fan[i] = w83627ehf_read_value(data,
W83627EHF_REG_FAN[i]); W83627EHF_REG_FAN[i]);
data->fan_min[i] = w83627ehf_read_value(client, data->fan_min[i] = w83627ehf_read_value(data,
W83627EHF_REG_FAN_MIN[i]); W83627EHF_REG_FAN_MIN[i]);
/* If we failed to measure the fan speed and clock /* If we failed to measure the fan speed and clock
...@@ -471,16 +469,16 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev) ...@@ -471,16 +469,16 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
time */ time */
if (data->fan[i] == 0xff if (data->fan[i] == 0xff
&& data->fan_div[i] < 0x07) { && data->fan_div[i] < 0x07) {
dev_dbg(&client->dev, "Increasing fan%d " dev_dbg(dev, "Increasing fan%d "
"clock divider from %u to %u\n", "clock divider from %u to %u\n",
i + 1, div_from_reg(data->fan_div[i]), i + 1, div_from_reg(data->fan_div[i]),
div_from_reg(data->fan_div[i] + 1)); div_from_reg(data->fan_div[i] + 1));
data->fan_div[i]++; data->fan_div[i]++;
w83627ehf_write_fan_div(client, i); w83627ehf_write_fan_div(data, i);
/* Preserve min limit if possible */ /* Preserve min limit if possible */
if (data->fan_min[i] >= 2 if (data->fan_min[i] >= 2
&& data->fan_min[i] != 255) && data->fan_min[i] != 255)
w83627ehf_write_value(client, w83627ehf_write_value(data,
W83627EHF_REG_FAN_MIN[i], W83627EHF_REG_FAN_MIN[i],
(data->fan_min[i] /= 2)); (data->fan_min[i] /= 2));
} }
...@@ -489,9 +487,9 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev) ...@@ -489,9 +487,9 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
/* pwmcfg, tolarance mapped for i=0, i=1 to same reg */ /* pwmcfg, tolarance mapped for i=0, i=1 to same reg */
if (i != 1) { if (i != 1) {
pwmcfg = w83627ehf_read_value(client, pwmcfg = w83627ehf_read_value(data,
W83627EHF_REG_PWM_ENABLE[i]); W83627EHF_REG_PWM_ENABLE[i]);
tolerance = w83627ehf_read_value(client, tolerance = w83627ehf_read_value(data,
W83627EHF_REG_TOLERANCE[i]); W83627EHF_REG_TOLERANCE[i]);
} }
data->pwm_mode[i] = data->pwm_mode[i] =
...@@ -500,14 +498,14 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev) ...@@ -500,14 +498,14 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
data->pwm_enable[i] = data->pwm_enable[i] =
((pwmcfg >> W83627EHF_PWM_ENABLE_SHIFT[i]) ((pwmcfg >> W83627EHF_PWM_ENABLE_SHIFT[i])
& 3) + 1; & 3) + 1;
data->pwm[i] = w83627ehf_read_value(client, data->pwm[i] = w83627ehf_read_value(data,
W83627EHF_REG_PWM[i]); W83627EHF_REG_PWM[i]);
data->fan_min_output[i] = w83627ehf_read_value(client, data->fan_min_output[i] = w83627ehf_read_value(data,
W83627EHF_REG_FAN_MIN_OUTPUT[i]); W83627EHF_REG_FAN_MIN_OUTPUT[i]);
data->fan_stop_time[i] = w83627ehf_read_value(client, data->fan_stop_time[i] = w83627ehf_read_value(data,
W83627EHF_REG_FAN_STOP_TIME[i]); W83627EHF_REG_FAN_STOP_TIME[i]);
data->target_temp[i] = data->target_temp[i] =
w83627ehf_read_value(client, w83627ehf_read_value(data,
W83627EHF_REG_TARGET[i]) & W83627EHF_REG_TARGET[i]) &
(data->pwm_mode[i] == 1 ? 0x7f : 0xff); (data->pwm_mode[i] == 1 ? 0x7f : 0xff);
data->tolerance[i] = (tolerance >> (i == 1 ? 4 : 0)) data->tolerance[i] = (tolerance >> (i == 1 ? 4 : 0))
...@@ -515,26 +513,26 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev) ...@@ -515,26 +513,26 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
} }
/* Measured temperatures and limits */ /* Measured temperatures and limits */
data->temp1 = w83627ehf_read_value(client, data->temp1 = w83627ehf_read_value(data,
W83627EHF_REG_TEMP1); W83627EHF_REG_TEMP1);
data->temp1_max = w83627ehf_read_value(client, data->temp1_max = w83627ehf_read_value(data,
W83627EHF_REG_TEMP1_OVER); W83627EHF_REG_TEMP1_OVER);
data->temp1_max_hyst = w83627ehf_read_value(client, data->temp1_max_hyst = w83627ehf_read_value(data,
W83627EHF_REG_TEMP1_HYST); W83627EHF_REG_TEMP1_HYST);
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
data->temp[i] = w83627ehf_read_value(client, data->temp[i] = w83627ehf_read_value(data,
W83627EHF_REG_TEMP[i]); W83627EHF_REG_TEMP[i]);
data->temp_max[i] = w83627ehf_read_value(client, data->temp_max[i] = w83627ehf_read_value(data,
W83627EHF_REG_TEMP_OVER[i]); W83627EHF_REG_TEMP_OVER[i]);
data->temp_max_hyst[i] = w83627ehf_read_value(client, data->temp_max_hyst[i] = w83627ehf_read_value(data,
W83627EHF_REG_TEMP_HYST[i]); W83627EHF_REG_TEMP_HYST[i]);
} }
data->alarms = w83627ehf_read_value(client, data->alarms = w83627ehf_read_value(data,
W83627EHF_REG_ALARM1) | W83627EHF_REG_ALARM1) |
(w83627ehf_read_value(client, (w83627ehf_read_value(data,
W83627EHF_REG_ALARM2) << 8) | W83627EHF_REG_ALARM2) << 8) |
(w83627ehf_read_value(client, (w83627ehf_read_value(data,
W83627EHF_REG_ALARM3) << 16); W83627EHF_REG_ALARM3) << 16);
data->last_updated = jiffies; data->last_updated = jiffies;
...@@ -567,15 +565,14 @@ static ssize_t \ ...@@ -567,15 +565,14 @@ static ssize_t \
store_in_##reg (struct device *dev, struct device_attribute *attr, \ store_in_##reg (struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct w83627ehf_data *data = dev_get_drvdata(dev); \
struct w83627ehf_data *data = i2c_get_clientdata(client); \
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \ struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
int nr = sensor_attr->index; \ int nr = sensor_attr->index; \
u32 val = simple_strtoul(buf, NULL, 10); \ u32 val = simple_strtoul(buf, NULL, 10); \
\ \
mutex_lock(&data->update_lock); \ mutex_lock(&data->update_lock); \
data->in_##reg[nr] = in_to_reg(val, nr); \ data->in_##reg[nr] = in_to_reg(val, nr); \
w83627ehf_write_value(client, W83627EHF_REG_IN_##REG(nr), \ w83627ehf_write_value(data, W83627EHF_REG_IN_##REG(nr), \
data->in_##reg[nr]); \ data->in_##reg[nr]); \
mutex_unlock(&data->update_lock); \ mutex_unlock(&data->update_lock); \
return count; \ return count; \
...@@ -673,8 +670,7 @@ static ssize_t ...@@ -673,8 +670,7 @@ static ssize_t
store_fan_min(struct device *dev, struct device_attribute *attr, store_fan_min(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83627ehf_data *data = dev_get_drvdata(dev);
struct w83627ehf_data *data = i2c_get_clientdata(client);
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
unsigned int val = simple_strtoul(buf, NULL, 10); unsigned int val = simple_strtoul(buf, NULL, 10);
...@@ -730,9 +726,9 @@ store_fan_min(struct device *dev, struct device_attribute *attr, ...@@ -730,9 +726,9 @@ store_fan_min(struct device *dev, struct device_attribute *attr,
nr + 1, div_from_reg(data->fan_div[nr]), nr + 1, div_from_reg(data->fan_div[nr]),
div_from_reg(new_div)); div_from_reg(new_div));
data->fan_div[nr] = new_div; data->fan_div[nr] = new_div;
w83627ehf_write_fan_div(client, nr); w83627ehf_write_fan_div(data, nr);
} }
w83627ehf_write_value(client, W83627EHF_REG_FAN_MIN[nr], w83627ehf_write_value(data, W83627EHF_REG_FAN_MIN[nr],
data->fan_min[nr]); data->fan_min[nr]);
mutex_unlock(&data->update_lock); mutex_unlock(&data->update_lock);
...@@ -793,13 +789,12 @@ static ssize_t \ ...@@ -793,13 +789,12 @@ static ssize_t \
store_temp1_##reg(struct device *dev, struct device_attribute *attr, \ store_temp1_##reg(struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct w83627ehf_data *data = dev_get_drvdata(dev); \
struct w83627ehf_data *data = i2c_get_clientdata(client); \
u32 val = simple_strtoul(buf, NULL, 10); \ u32 val = simple_strtoul(buf, NULL, 10); \
\ \
mutex_lock(&data->update_lock); \ mutex_lock(&data->update_lock); \
data->temp1_##reg = temp1_to_reg(val, -128000, 127000); \ data->temp1_##reg = temp1_to_reg(val, -128000, 127000); \
w83627ehf_write_value(client, W83627EHF_REG_TEMP1_##REG, \ w83627ehf_write_value(data, W83627EHF_REG_TEMP1_##REG, \
data->temp1_##reg); \ data->temp1_##reg); \
mutex_unlock(&data->update_lock); \ mutex_unlock(&data->update_lock); \
return count; \ return count; \
...@@ -827,15 +822,14 @@ static ssize_t \ ...@@ -827,15 +822,14 @@ static ssize_t \
store_##reg(struct device *dev, struct device_attribute *attr, \ store_##reg(struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct w83627ehf_data *data = dev_get_drvdata(dev); \
struct w83627ehf_data *data = i2c_get_clientdata(client); \
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \ struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
int nr = sensor_attr->index; \ int nr = sensor_attr->index; \
u32 val = simple_strtoul(buf, NULL, 10); \ u32 val = simple_strtoul(buf, NULL, 10); \
\ \
mutex_lock(&data->update_lock); \ mutex_lock(&data->update_lock); \
data->reg[nr] = LM75_TEMP_TO_REG(val); \ data->reg[nr] = LM75_TEMP_TO_REG(val); \
w83627ehf_write_value(client, W83627EHF_REG_TEMP_##REG[nr], \ w83627ehf_write_value(data, W83627EHF_REG_TEMP_##REG[nr], \
data->reg[nr]); \ data->reg[nr]); \
mutex_unlock(&data->update_lock); \ mutex_unlock(&data->update_lock); \
return count; \ return count; \
...@@ -882,8 +876,7 @@ static ssize_t ...@@ -882,8 +876,7 @@ static ssize_t
store_pwm_mode(struct device *dev, struct device_attribute *attr, store_pwm_mode(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83627ehf_data *data = dev_get_drvdata(dev);
struct w83627ehf_data *data = i2c_get_clientdata(client);
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
u32 val = simple_strtoul(buf, NULL, 10); u32 val = simple_strtoul(buf, NULL, 10);
...@@ -892,12 +885,12 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr, ...@@ -892,12 +885,12 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
if (val > 1) if (val > 1)
return -EINVAL; return -EINVAL;
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
reg = w83627ehf_read_value(client, W83627EHF_REG_PWM_ENABLE[nr]); reg = w83627ehf_read_value(data, W83627EHF_REG_PWM_ENABLE[nr]);
data->pwm_mode[nr] = val; data->pwm_mode[nr] = val;
reg &= ~(1 << W83627EHF_PWM_MODE_SHIFT[nr]); reg &= ~(1 << W83627EHF_PWM_MODE_SHIFT[nr]);
if (!val) if (!val)
reg |= 1 << W83627EHF_PWM_MODE_SHIFT[nr]; reg |= 1 << W83627EHF_PWM_MODE_SHIFT[nr];
w83627ehf_write_value(client, W83627EHF_REG_PWM_ENABLE[nr], reg); w83627ehf_write_value(data, W83627EHF_REG_PWM_ENABLE[nr], reg);
mutex_unlock(&data->update_lock); mutex_unlock(&data->update_lock);
return count; return count;
} }
...@@ -906,15 +899,14 @@ static ssize_t ...@@ -906,15 +899,14 @@ static ssize_t
store_pwm(struct device *dev, struct device_attribute *attr, store_pwm(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83627ehf_data *data = dev_get_drvdata(dev);
struct w83627ehf_data *data = i2c_get_clientdata(client);
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
u32 val = SENSORS_LIMIT(simple_strtoul(buf, NULL, 10), 0, 255); u32 val = SENSORS_LIMIT(simple_strtoul(buf, NULL, 10), 0, 255);
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
data->pwm[nr] = val; data->pwm[nr] = val;
w83627ehf_write_value(client, W83627EHF_REG_PWM[nr], val); w83627ehf_write_value(data, W83627EHF_REG_PWM[nr], val);
mutex_unlock(&data->update_lock); mutex_unlock(&data->update_lock);
return count; return count;
} }
...@@ -923,8 +915,7 @@ static ssize_t ...@@ -923,8 +915,7 @@ static ssize_t
store_pwm_enable(struct device *dev, struct device_attribute *attr, store_pwm_enable(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83627ehf_data *data = dev_get_drvdata(dev);
struct w83627ehf_data *data = i2c_get_clientdata(client);
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
u32 val = simple_strtoul(buf, NULL, 10); u32 val = simple_strtoul(buf, NULL, 10);
...@@ -933,11 +924,11 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr, ...@@ -933,11 +924,11 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,
if (!val || (val > 2)) /* only modes 1 and 2 are supported */ if (!val || (val > 2)) /* only modes 1 and 2 are supported */
return -EINVAL; return -EINVAL;
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
reg = w83627ehf_read_value(client, W83627EHF_REG_PWM_ENABLE[nr]); reg = w83627ehf_read_value(data, W83627EHF_REG_PWM_ENABLE[nr]);
data->pwm_enable[nr] = val; data->pwm_enable[nr] = val;
reg &= ~(0x03 << W83627EHF_PWM_ENABLE_SHIFT[nr]); reg &= ~(0x03 << W83627EHF_PWM_ENABLE_SHIFT[nr]);
reg |= (val - 1) << W83627EHF_PWM_ENABLE_SHIFT[nr]; reg |= (val - 1) << W83627EHF_PWM_ENABLE_SHIFT[nr];
w83627ehf_write_value(client, W83627EHF_REG_PWM_ENABLE[nr], reg); w83627ehf_write_value(data, W83627EHF_REG_PWM_ENABLE[nr], reg);
mutex_unlock(&data->update_lock); mutex_unlock(&data->update_lock);
return count; return count;
} }
...@@ -960,15 +951,14 @@ static ssize_t ...@@ -960,15 +951,14 @@ static ssize_t
store_target_temp(struct device *dev, struct device_attribute *attr, store_target_temp(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83627ehf_data *data = dev_get_drvdata(dev);
struct w83627ehf_data *data = i2c_get_clientdata(client);
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
u8 val = temp1_to_reg(simple_strtoul(buf, NULL, 10), 0, 127000); u8 val = temp1_to_reg(simple_strtoul(buf, NULL, 10), 0, 127000);
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
data->target_temp[nr] = val; data->target_temp[nr] = val;
w83627ehf_write_value(client, W83627EHF_REG_TARGET[nr], val); w83627ehf_write_value(data, W83627EHF_REG_TARGET[nr], val);
mutex_unlock(&data->update_lock); mutex_unlock(&data->update_lock);
return count; return count;
} }
...@@ -977,8 +967,7 @@ static ssize_t ...@@ -977,8 +967,7 @@ static ssize_t
store_tolerance(struct device *dev, struct device_attribute *attr, store_tolerance(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83627ehf_data *data = dev_get_drvdata(dev);
struct w83627ehf_data *data = i2c_get_clientdata(client);
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
int nr = sensor_attr->index; int nr = sensor_attr->index;
u16 reg; u16 reg;
...@@ -986,13 +975,13 @@ store_tolerance(struct device *dev, struct device_attribute *attr, ...@@ -986,13 +975,13 @@ store_tolerance(struct device *dev, struct device_attribute *attr,
u8 val = temp1_to_reg(simple_strtoul(buf, NULL, 10), 0, 15000); u8 val = temp1_to_reg(simple_strtoul(buf, NULL, 10), 0, 15000);
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
reg = w83627ehf_read_value(client, W83627EHF_REG_TOLERANCE[nr]); reg = w83627ehf_read_value(data, W83627EHF_REG_TOLERANCE[nr]);
data->tolerance[nr] = val; data->tolerance[nr] = val;
if (nr == 1) if (nr == 1)
reg = (reg & 0x0f) | (val << 4); reg = (reg & 0x0f) | (val << 4);
else else
reg = (reg & 0xf0) | val; reg = (reg & 0xf0) | val;
w83627ehf_write_value(client, W83627EHF_REG_TOLERANCE[nr], reg); w83627ehf_write_value(data, W83627EHF_REG_TOLERANCE[nr], reg);
mutex_unlock(&data->update_lock); mutex_unlock(&data->update_lock);
return count; return count;
} }
...@@ -1063,14 +1052,13 @@ static ssize_t \ ...@@ -1063,14 +1052,13 @@ static ssize_t \
store_##reg(struct device *dev, struct device_attribute *attr, \ store_##reg(struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{\ {\
struct i2c_client *client = to_i2c_client(dev); \ struct w83627ehf_data *data = dev_get_drvdata(dev); \
struct w83627ehf_data *data = i2c_get_clientdata(client); \
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \ struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
int nr = sensor_attr->index; \ int nr = sensor_attr->index; \
u32 val = SENSORS_LIMIT(simple_strtoul(buf, NULL, 10), 1, 255); \ u32 val = SENSORS_LIMIT(simple_strtoul(buf, NULL, 10), 1, 255); \
mutex_lock(&data->update_lock); \ mutex_lock(&data->update_lock); \
data->reg[nr] = val; \ data->reg[nr] = val; \
w83627ehf_write_value(client, W83627EHF_REG_##REG[nr], val); \ w83627ehf_write_value(data, W83627EHF_REG_##REG[nr], val); \
mutex_unlock(&data->update_lock); \ mutex_unlock(&data->update_lock); \
return count; \ return count; \
} }
...@@ -1092,21 +1080,28 @@ static ssize_t \ ...@@ -1092,21 +1080,28 @@ static ssize_t \
store_##reg(struct device *dev, struct device_attribute *attr, \ store_##reg(struct device *dev, struct device_attribute *attr, \
const char *buf, size_t count) \ const char *buf, size_t count) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct w83627ehf_data *data = dev_get_drvdata(dev); \
struct w83627ehf_data *data = i2c_get_clientdata(client); \
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \ struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr); \
int nr = sensor_attr->index; \ int nr = sensor_attr->index; \
u8 val = step_time_to_reg(simple_strtoul(buf, NULL, 10), \ u8 val = step_time_to_reg(simple_strtoul(buf, NULL, 10), \
data->pwm_mode[nr]); \ data->pwm_mode[nr]); \
mutex_lock(&data->update_lock); \ mutex_lock(&data->update_lock); \
data->reg[nr] = val; \ data->reg[nr] = val; \
w83627ehf_write_value(client, W83627EHF_REG_##REG[nr], val); \ w83627ehf_write_value(data, W83627EHF_REG_##REG[nr], val); \
mutex_unlock(&data->update_lock); \ mutex_unlock(&data->update_lock); \
return count; \ return count; \
} \ } \
fan_time_functions(fan_stop_time, FAN_STOP_TIME) fan_time_functions(fan_stop_time, FAN_STOP_TIME)
static ssize_t show_name(struct device *dev, struct device_attribute *attr,
char *buf)
{
struct w83627ehf_data *data = dev_get_drvdata(dev);
return sprintf(buf, "%s\n", data->name);
}
static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
static struct sensor_device_attribute sda_sf3_arrays_fan4[] = { static struct sensor_device_attribute sda_sf3_arrays_fan4[] = {
SENSOR_ATTR(pwm4_stop_time, S_IWUSR | S_IRUGO, show_fan_stop_time, SENSOR_ATTR(pwm4_stop_time, S_IWUSR | S_IRUGO, show_fan_stop_time,
...@@ -1131,7 +1126,7 @@ static struct sensor_device_attribute sda_sf3_arrays[] = { ...@@ -1131,7 +1126,7 @@ static struct sensor_device_attribute sda_sf3_arrays[] = {
}; };
/* /*
* Driver and client management * Driver and device management
*/ */
static void w83627ehf_device_remove_files(struct device *dev) static void w83627ehf_device_remove_files(struct device *dev)
...@@ -1139,12 +1134,13 @@ static void w83627ehf_device_remove_files(struct device *dev) ...@@ -1139,12 +1134,13 @@ static void w83627ehf_device_remove_files(struct device *dev)
/* some entries in the following arrays may not have been used in /* some entries in the following arrays may not have been used in
* device_create_file(), but device_remove_file() will ignore them */ * device_create_file(), but device_remove_file() will ignore them */
int i; int i;
struct w83627ehf_data *data = dev_get_drvdata(dev);
for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays); i++) for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays); i++)
device_remove_file(dev, &sda_sf3_arrays[i].dev_attr); device_remove_file(dev, &sda_sf3_arrays[i].dev_attr);
for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays_fan4); i++) for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays_fan4); i++)
device_remove_file(dev, &sda_sf3_arrays_fan4[i].dev_attr); device_remove_file(dev, &sda_sf3_arrays_fan4[i].dev_attr);
for (i = 0; i < w83627ehf_num_in; i++) { for (i = 0; i < data->in_num; i++) {
device_remove_file(dev, &sda_in_input[i].dev_attr); device_remove_file(dev, &sda_in_input[i].dev_attr);
device_remove_file(dev, &sda_in_alarm[i].dev_attr); device_remove_file(dev, &sda_in_alarm[i].dev_attr);
device_remove_file(dev, &sda_in_min[i].dev_attr); device_remove_file(dev, &sda_in_min[i].dev_attr);
...@@ -1165,43 +1161,48 @@ static void w83627ehf_device_remove_files(struct device *dev) ...@@ -1165,43 +1161,48 @@ static void w83627ehf_device_remove_files(struct device *dev)
} }
for (i = 0; i < ARRAY_SIZE(sda_temp); i++) for (i = 0; i < ARRAY_SIZE(sda_temp); i++)
device_remove_file(dev, &sda_temp[i].dev_attr); device_remove_file(dev, &sda_temp[i].dev_attr);
}
static struct i2c_driver w83627ehf_driver; device_remove_file(dev, &dev_attr_name);
}
static void w83627ehf_init_client(struct i2c_client *client) /* Get the monitoring functions started */
static inline void __devinit w83627ehf_init_device(struct w83627ehf_data *data)
{ {
int i; int i;
u8 tmp; u8 tmp;
/* Start monitoring is needed */ /* Start monitoring is needed */
tmp = w83627ehf_read_value(client, W83627EHF_REG_CONFIG); tmp = w83627ehf_read_value(data, W83627EHF_REG_CONFIG);
if (!(tmp & 0x01)) if (!(tmp & 0x01))
w83627ehf_write_value(client, W83627EHF_REG_CONFIG, w83627ehf_write_value(data, W83627EHF_REG_CONFIG,
tmp | 0x01); tmp | 0x01);
/* Enable temp2 and temp3 if needed */ /* Enable temp2 and temp3 if needed */
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
tmp = w83627ehf_read_value(client, tmp = w83627ehf_read_value(data,
W83627EHF_REG_TEMP_CONFIG[i]); W83627EHF_REG_TEMP_CONFIG[i]);
if (tmp & 0x01) if (tmp & 0x01)
w83627ehf_write_value(client, w83627ehf_write_value(data,
W83627EHF_REG_TEMP_CONFIG[i], W83627EHF_REG_TEMP_CONFIG[i],
tmp & 0xfe); tmp & 0xfe);
} }
} }
static int w83627ehf_detect(struct i2c_adapter *adapter) static int __devinit w83627ehf_probe(struct platform_device *pdev)
{ {
struct i2c_client *client; struct device *dev = &pdev->dev;
struct w83627ehf_sio_data *sio_data = dev->platform_data;
struct w83627ehf_data *data; struct w83627ehf_data *data;
struct device *dev; struct resource *res;
u8 fan4pin, fan5pin; u8 fan4pin, fan5pin;
int i, err = 0; int i, err = 0;
if (!request_region(address + IOREGION_OFFSET, IOREGION_LENGTH, res = platform_get_resource(pdev, IORESOURCE_IO, 0);
w83627ehf_driver.driver.name)) { if (!request_region(res->start, IOREGION_LENGTH, DRVNAME)) {
err = -EBUSY; err = -EBUSY;
dev_err(dev, "Failed to request region 0x%lx-0x%lx\n",
(unsigned long)res->start,
(unsigned long)res->start + IOREGION_LENGTH - 1);
goto exit; goto exit;
} }
...@@ -1210,41 +1211,29 @@ static int w83627ehf_detect(struct i2c_adapter *adapter) ...@@ -1210,41 +1211,29 @@ static int w83627ehf_detect(struct i2c_adapter *adapter)
goto exit_release; goto exit_release;
} }
client = &data->client; data->addr = res->start;
i2c_set_clientdata(client, data);
client->addr = address;
mutex_init(&data->lock); mutex_init(&data->lock);
client->adapter = adapter;
client->driver = &w83627ehf_driver;
client->flags = 0;
dev = &client->dev;
if (w83627ehf_num_in == 9)
strlcpy(client->name, "w83627dhg", I2C_NAME_SIZE);
else /* just say ehf. 627EHG is 627EHF in lead-free packaging. */
strlcpy(client->name, "w83627ehf", I2C_NAME_SIZE);
data->valid = 0;
mutex_init(&data->update_lock); mutex_init(&data->update_lock);
data->name = w83627ehf_device_names[sio_data->kind];
platform_set_drvdata(pdev, data);
/* Tell the i2c layer a new client has arrived */ /* 627EHG and 627EHF have 10 voltage inputs; DHG has 9 */
if ((err = i2c_attach_client(client))) data->in_num = (sio_data->kind == w83627dhg) ? 9 : 10;
goto exit_free;
/* Initialize the chip */ /* Initialize the chip */
w83627ehf_init_client(client); w83627ehf_init_device(data);
/* A few vars need to be filled upon startup */ /* A few vars need to be filled upon startup */
for (i = 0; i < 5; i++) for (i = 0; i < 5; i++)
data->fan_min[i] = w83627ehf_read_value(client, data->fan_min[i] = w83627ehf_read_value(data,
W83627EHF_REG_FAN_MIN[i]); W83627EHF_REG_FAN_MIN[i]);
/* fan4 and fan5 share some pins with the GPIO and serial flash */ /* fan4 and fan5 share some pins with the GPIO and serial flash */
superio_enter(); superio_enter(sio_data->sioreg);
fan5pin = superio_inb(0x24) & 0x2; fan5pin = superio_inb(sio_data->sioreg, 0x24) & 0x2;
fan4pin = superio_inb(0x29) & 0x6; fan4pin = superio_inb(sio_data->sioreg, 0x29) & 0x6;
superio_exit(); superio_exit(sio_data->sioreg);
/* It looks like fan4 and fan5 pins can be alternatively used /* It looks like fan4 and fan5 pins can be alternatively used
as fan on/off switches, but fan5 control is write only :/ as fan on/off switches, but fan5 control is write only :/
...@@ -1253,7 +1242,7 @@ static int w83627ehf_detect(struct i2c_adapter *adapter) ...@@ -1253,7 +1242,7 @@ static int w83627ehf_detect(struct i2c_adapter *adapter)
is not the default. */ is not the default. */
data->has_fan = 0x07; /* fan1, fan2 and fan3 */ data->has_fan = 0x07; /* fan1, fan2 and fan3 */
i = w83627ehf_read_value(client, W83627EHF_REG_FANDIV1); i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV1);
if ((i & (1 << 2)) && (!fan4pin)) if ((i & (1 << 2)) && (!fan4pin))
data->has_fan |= (1 << 3); data->has_fan |= (1 << 3);
if (!(i & (1 << 1)) && (!fan5pin)) if (!(i & (1 << 1)) && (!fan5pin))
...@@ -1273,7 +1262,7 @@ static int w83627ehf_detect(struct i2c_adapter *adapter) ...@@ -1273,7 +1262,7 @@ static int w83627ehf_detect(struct i2c_adapter *adapter)
goto exit_remove; goto exit_remove;
} }
for (i = 0; i < w83627ehf_num_in; i++) for (i = 0; i < data->in_num; i++)
if ((err = device_create_file(dev, &sda_in_input[i].dev_attr)) if ((err = device_create_file(dev, &sda_in_input[i].dev_attr))
|| (err = device_create_file(dev, || (err = device_create_file(dev,
&sda_in_alarm[i].dev_attr)) &sda_in_alarm[i].dev_attr))
...@@ -1313,6 +1302,10 @@ static int w83627ehf_detect(struct i2c_adapter *adapter) ...@@ -1313,6 +1302,10 @@ static int w83627ehf_detect(struct i2c_adapter *adapter)
if ((err = device_create_file(dev, &sda_temp[i].dev_attr))) if ((err = device_create_file(dev, &sda_temp[i].dev_attr)))
goto exit_remove; goto exit_remove;
err = device_create_file(dev, &dev_attr_name);
if (err)
goto exit_remove;
data->class_dev = hwmon_device_register(dev); data->class_dev = hwmon_device_register(dev);
if (IS_ERR(data->class_dev)) { if (IS_ERR(data->class_dev)) {
err = PTR_ERR(data->class_dev); err = PTR_ERR(data->class_dev);
...@@ -1323,95 +1316,166 @@ static int w83627ehf_detect(struct i2c_adapter *adapter) ...@@ -1323,95 +1316,166 @@ static int w83627ehf_detect(struct i2c_adapter *adapter)
exit_remove: exit_remove:
w83627ehf_device_remove_files(dev); w83627ehf_device_remove_files(dev);
i2c_detach_client(client);
exit_free:
kfree(data); kfree(data);
platform_set_drvdata(pdev, NULL);
exit_release: exit_release:
release_region(address + IOREGION_OFFSET, IOREGION_LENGTH); release_region(res->start, IOREGION_LENGTH);
exit: exit:
return err; return err;
} }
static int w83627ehf_detach_client(struct i2c_client *client) static int __devexit w83627ehf_remove(struct platform_device *pdev)
{ {
struct w83627ehf_data *data = i2c_get_clientdata(client); struct w83627ehf_data *data = platform_get_drvdata(pdev);
int err;
hwmon_device_unregister(data->class_dev); hwmon_device_unregister(data->class_dev);
w83627ehf_device_remove_files(&client->dev); w83627ehf_device_remove_files(&pdev->dev);
release_region(data->addr, IOREGION_LENGTH);
if ((err = i2c_detach_client(client))) platform_set_drvdata(pdev, NULL);
return err;
release_region(client->addr + IOREGION_OFFSET, IOREGION_LENGTH);
kfree(data); kfree(data);
return 0; return 0;
} }
static struct i2c_driver w83627ehf_driver = { static struct platform_driver w83627ehf_driver = {
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "w83627ehf", .name = DRVNAME,
}, },
.attach_adapter = w83627ehf_detect, .probe = w83627ehf_probe,
.detach_client = w83627ehf_detach_client, .remove = __devexit_p(w83627ehf_remove),
}; };
static int __init w83627ehf_find(int sioaddr, unsigned short *addr) /* w83627ehf_find() looks for a '627 in the Super-I/O config space */
static int __init w83627ehf_find(int sioaddr, unsigned short *addr,
struct w83627ehf_sio_data *sio_data)
{ {
static const char __initdata sio_name_W83627EHF[] = "W83627EHF";
static const char __initdata sio_name_W83627EHG[] = "W83627EHG";
static const char __initdata sio_name_W83627DHG[] = "W83627DHG";
u16 val; u16 val;
const char *sio_name;
REG = sioaddr; superio_enter(sioaddr);
VAL = sioaddr + 1;
superio_enter();
val = (superio_inb(SIO_REG_DEVID) << 8) val = (superio_inb(sioaddr, SIO_REG_DEVID) << 8)
| superio_inb(SIO_REG_DEVID + 1); | superio_inb(sioaddr, SIO_REG_DEVID + 1);
switch (val & SIO_ID_MASK) { switch (val & SIO_ID_MASK) {
case SIO_W83627DHG_ID:
w83627ehf_num_in = 9;
break;
case SIO_W83627EHF_ID: case SIO_W83627EHF_ID:
sio_data->kind = w83627ehf;
sio_name = sio_name_W83627EHF;
break;
case SIO_W83627EHG_ID: case SIO_W83627EHG_ID:
w83627ehf_num_in = 10; sio_data->kind = w83627ehf;
sio_name = sio_name_W83627EHG;
break;
case SIO_W83627DHG_ID:
sio_data->kind = w83627dhg;
sio_name = sio_name_W83627DHG;
break; break;
default: default:
printk(KERN_WARNING "w83627ehf: unsupported chip ID: 0x%04x\n", pr_info(DRVNAME ": unsupported chip ID: 0x%04x\n",
val); val);
superio_exit(); superio_exit(sioaddr);
return -ENODEV; return -ENODEV;
} }
superio_select(W83627EHF_LD_HWM); /* We have a known chip, find the HWM I/O address */
val = (superio_inb(SIO_REG_ADDR) << 8) superio_select(sioaddr, W83627EHF_LD_HWM);
| superio_inb(SIO_REG_ADDR + 1); val = (superio_inb(sioaddr, SIO_REG_ADDR) << 8)
| superio_inb(sioaddr, SIO_REG_ADDR + 1);
*addr = val & IOREGION_ALIGNMENT; *addr = val & IOREGION_ALIGNMENT;
if (*addr == 0) { if (*addr == 0) {
superio_exit(); superio_exit(sioaddr);
return -ENODEV; return -ENODEV;
} }
/* Activate logical device if needed */ /* Activate logical device if needed */
val = superio_inb(SIO_REG_ENABLE); val = superio_inb(sioaddr, SIO_REG_ENABLE);
if (!(val & 0x01)) if (!(val & 0x01))
superio_outb(SIO_REG_ENABLE, val | 0x01); superio_outb(sioaddr, SIO_REG_ENABLE, val | 0x01);
superio_exit(sioaddr);
pr_info(DRVNAME ": Found %s chip at %#x\n", sio_name, *addr);
sio_data->sioreg = sioaddr;
superio_exit();
return 0; return 0;
} }
/* when Super-I/O functions move to a separate file, the Super-I/O
* bus will manage the lifetime of the device and this module will only keep
* track of the w83627ehf driver. But since we platform_device_alloc(), we
* must keep track of the device */
static struct platform_device *pdev;
static int __init sensors_w83627ehf_init(void) static int __init sensors_w83627ehf_init(void)
{ {
if (w83627ehf_find(0x2e, &address) int err;
&& w83627ehf_find(0x4e, &address)) unsigned short address;
struct resource res;
struct w83627ehf_sio_data sio_data;
/* initialize sio_data->kind and sio_data->sioreg.
*
* when Super-I/O functions move to a separate file, the Super-I/O
* driver will probe 0x2e and 0x4e and auto-detect the presence of a
* w83627ehf hardware monitor, and call probe() */
if (w83627ehf_find(0x2e, &address, &sio_data) &&
w83627ehf_find(0x4e, &address, &sio_data))
return -ENODEV; return -ENODEV;
return i2c_isa_add_driver(&w83627ehf_driver); err = platform_driver_register(&w83627ehf_driver);
if (err)
goto exit;
if (!(pdev = platform_device_alloc(DRVNAME, address))) {
err = -ENOMEM;
printk(KERN_ERR DRVNAME ": Device allocation failed\n");
goto exit_unregister;
}
err = platform_device_add_data(pdev, &sio_data,
sizeof(struct w83627ehf_sio_data));
if (err) {
printk(KERN_ERR DRVNAME ": Platform data allocation failed\n");
goto exit_device_put;
}
memset(&res, 0, sizeof(res));
res.name = DRVNAME;
res.start = address + IOREGION_OFFSET;
res.end = address + IOREGION_OFFSET + IOREGION_LENGTH - 1;
res.flags = IORESOURCE_IO;
err = platform_device_add_resources(pdev, &res, 1);
if (err) {
printk(KERN_ERR DRVNAME ": Device resource addition failed "
"(%d)\n", err);
goto exit_device_put;
}
/* platform_device_add calls probe() */
err = platform_device_add(pdev);
if (err) {
printk(KERN_ERR DRVNAME ": Device addition failed (%d)\n",
err);
goto exit_device_put;
}
return 0;
exit_device_put:
platform_device_put(pdev);
exit_unregister:
platform_driver_unregister(&w83627ehf_driver);
exit:
return err;
} }
static void __exit sensors_w83627ehf_exit(void) static void __exit sensors_w83627ehf_exit(void)
{ {
i2c_isa_del_driver(&w83627ehf_driver); platform_device_unregister(pdev);
platform_driver_unregister(&w83627ehf_driver);
} }
MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>"); MODULE_AUTHOR("Jean Delvare <khali@linux-fr.org>");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7