Skip to content

L
linux
Commit 7666c13c authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files
Options

hwmon/w83781d: No longer use i2c-isa 

Reimplement the ISA device support as a platform driver, so that we no
longer rely on i2c-isa.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
parent 47a5dba1
Show whitespace changes
Inline Side-by-side
Showing with 377 additions and 195 deletions
drivers/hwmon/Kconfig
View file @ 7666c13c
...@@ -523,7 +523,6 @@ config SENSORS_VT8231 ...@@ -523,7 +523,6 @@ config SENSORS_VT8231
config SENSORS_W83781D config SENSORS_W83781D
tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F" tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"
depends on HWMON && I2C depends on HWMON && I2C
select I2C_ISA
select HWMON_VID select HWMON_VID
help help
If you say yes here you get support for the Winbond W8378x series If you say yes here you get support for the Winbond W8378x series
......
drivers/hwmon/w83781d.c
View file @ 7666c13c
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
Copyright (c) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>, Copyright (c) 1998 - 2001 Frodo Looijaard <frodol@dds.nl>,
Philip Edelbrock <phil@netroedge.com>, Philip Edelbrock <phil@netroedge.com>,
and Mark Studebaker <mdsxyz123@yahoo.com> and Mark Studebaker <mdsxyz123@yahoo.com>
Copyright (c) 2007 Jean Delvare <khali@linux-fr.org>
This program is free software; you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
...@@ -38,7 +39,8 @@ ...@@ -38,7 +39,8 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-isa.h> #include <linux/platform_device.h>
#include <linux/ioport.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-vid.h> #include <linux/hwmon-vid.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
...@@ -47,6 +49,9 @@ ...@@ -47,6 +49,9 @@
#include <asm/io.h> #include <asm/io.h>
#include "lm75.h" #include "lm75.h"
/* ISA device, if found */
static struct platform_device *pdev;
/* Addresses to scan */ /* Addresses to scan */
static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, static unsigned short normal_i2c[] = { 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,
0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b, 0x26, 0x27, 0x28, 0x29, 0x2a, 0x2b,
...@@ -221,8 +226,8 @@ DIV_TO_REG(long val, enum chips type) ...@@ -221,8 +226,8 @@ DIV_TO_REG(long val, enum chips type)
a bit - except if there could be more than one SMBus. Groan. No solution a bit - except if there could be more than one SMBus. Groan. No solution
for this yet. */ for this yet. */
/* For each registered chip, we need to keep some data in memory. /* For ISA chips, we abuse the i2c_client addr and name fields. We also use
The structure is dynamically allocated. */ the driver field to differentiate between I2C and ISA chips. */
struct w83781d_data { struct w83781d_data {
struct i2c_client client; struct i2c_client client;
struct class_device *class_dev; struct class_device *class_dev;
...@@ -263,14 +268,16 @@ struct w83781d_data { ...@@ -263,14 +268,16 @@ struct w83781d_data {
}; };
static int w83781d_attach_adapter(struct i2c_adapter *adapter); static int w83781d_attach_adapter(struct i2c_adapter *adapter);
static int w83781d_isa_attach_adapter(struct i2c_adapter *adapter);
static int w83781d_detect(struct i2c_adapter *adapter, int address, int kind); static int w83781d_detect(struct i2c_adapter *adapter, int address, int kind);
static int w83781d_detach_client(struct i2c_client *client); static int w83781d_detach_client(struct i2c_client *client);
static int __devinit w83781d_isa_probe(struct platform_device *pdev);
static int __devexit w83781d_isa_remove(struct platform_device *pdev);
static int w83781d_read_value(struct i2c_client *client, u16 reg); static int w83781d_read_value(struct i2c_client *client, u16 reg);
static int w83781d_write_value(struct i2c_client *client, u16 reg, u16 value); static int w83781d_write_value(struct i2c_client *client, u16 reg, u16 value);
static struct w83781d_data *w83781d_update_device(struct device *dev); static struct w83781d_data *w83781d_update_device(struct device *dev);
static void w83781d_init_client(struct i2c_client *client); static void w83781d_init_device(struct device *dev);
static struct i2c_driver w83781d_driver = { static struct i2c_driver w83781d_driver = {
.driver = { .driver = {
...@@ -281,13 +288,13 @@ static struct i2c_driver w83781d_driver = { ...@@ -281,13 +288,13 @@ static struct i2c_driver w83781d_driver = {
.detach_client = w83781d_detach_client, .detach_client = w83781d_detach_client,
}; };
static struct i2c_driver w83781d_isa_driver = { static struct platform_driver w83781d_isa_driver = {
.driver = { .driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "w83781d-isa", .name = "w83781d",
}, },
.attach_adapter = w83781d_isa_attach_adapter, .probe = w83781d_isa_probe,
.detach_client = w83781d_detach_client, .remove = w83781d_isa_remove,
}; };
...@@ -305,8 +312,8 @@ show_in_reg(in_max); ...@@ -305,8 +312,8 @@ show_in_reg(in_max);
#define store_in_reg(REG, reg) \ #define store_in_reg(REG, reg) \
static ssize_t store_in_##reg (struct device *dev, const char *buf, size_t count, int nr) \ static ssize_t store_in_##reg (struct device *dev, const char *buf, size_t count, int nr) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct w83781d_data *data = dev_get_drvdata(dev); \
struct w83781d_data *data = i2c_get_clientdata(client); \ struct i2c_client *client = &data->client; \
u32 val; \ u32 val; \
\ \
val = simple_strtoul(buf, NULL, 10) / 10; \ val = simple_strtoul(buf, NULL, 10) / 10; \
...@@ -368,8 +375,8 @@ show_fan_reg(fan_min); ...@@ -368,8 +375,8 @@ show_fan_reg(fan_min);
static ssize_t static ssize_t
store_fan_min(struct device *dev, const char *buf, size_t count, int nr) store_fan_min(struct device *dev, const char *buf, size_t count, int nr)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83781d_data *data = dev_get_drvdata(dev);
struct w83781d_data *data = i2c_get_clientdata(client); struct i2c_client *client = &data->client;
u32 val; u32 val;
val = simple_strtoul(buf, NULL, 10); val = simple_strtoul(buf, NULL, 10);
...@@ -427,8 +434,8 @@ show_temp_reg(temp_max_hyst); ...@@ -427,8 +434,8 @@ show_temp_reg(temp_max_hyst);
#define store_temp_reg(REG, reg) \ #define store_temp_reg(REG, reg) \
static ssize_t store_temp_##reg (struct device *dev, const char *buf, size_t count, int nr) \ static ssize_t store_temp_##reg (struct device *dev, const char *buf, size_t count, int nr) \
{ \ { \
struct i2c_client *client = to_i2c_client(dev); \ struct w83781d_data *data = dev_get_drvdata(dev); \
struct w83781d_data *data = i2c_get_clientdata(client); \ struct i2c_client *client = &data->client; \
s32 val; \ s32 val; \
\ \
val = simple_strtol(buf, NULL, 10); \ val = simple_strtol(buf, NULL, 10); \
...@@ -498,8 +505,7 @@ show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf) ...@@ -498,8 +505,7 @@ show_vrm_reg(struct device *dev, struct device_attribute *attr, char *buf)
static ssize_t static ssize_t
store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) store_vrm_reg(struct device *dev, struct device_attribute *attr, const char *buf, size_t count)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83781d_data *data = dev_get_drvdata(dev);
struct w83781d_data *data = i2c_get_clientdata(client);
u32 val; u32 val;
val = simple_strtoul(buf, NULL, 10); val = simple_strtoul(buf, NULL, 10);
...@@ -539,8 +545,8 @@ static ssize_t ...@@ -539,8 +545,8 @@ static ssize_t
store_beep_reg(struct device *dev, const char *buf, size_t count, store_beep_reg(struct device *dev, const char *buf, size_t count,
int update_mask) int update_mask)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83781d_data *data = dev_get_drvdata(dev);
struct w83781d_data *data = i2c_get_clientdata(client); struct i2c_client *client = &data->client;
u32 val, val2; u32 val, val2;
val = simple_strtoul(buf, NULL, 10); val = simple_strtoul(buf, NULL, 10);
...@@ -599,8 +605,8 @@ show_fan_div_reg(struct device *dev, char *buf, int nr) ...@@ -599,8 +605,8 @@ show_fan_div_reg(struct device *dev, char *buf, int nr)
static ssize_t static ssize_t
store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr) store_fan_div_reg(struct device *dev, const char *buf, size_t count, int nr)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83781d_data *data = dev_get_drvdata(dev);
struct w83781d_data *data = i2c_get_clientdata(client); struct i2c_client *client = &data->client;
unsigned long min; unsigned long min;
u8 reg; u8 reg;
unsigned long val = simple_strtoul(buf, NULL, 10); unsigned long val = simple_strtoul(buf, NULL, 10);
...@@ -666,8 +672,8 @@ show_pwmenable_reg(struct device *dev, char *buf, int nr) ...@@ -666,8 +672,8 @@ show_pwmenable_reg(struct device *dev, char *buf, int nr)
static ssize_t static ssize_t
store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr) store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83781d_data *data = dev_get_drvdata(dev);
struct w83781d_data *data = i2c_get_clientdata(client); struct i2c_client *client = &data->client;
u32 val; u32 val;
val = simple_strtoul(buf, NULL, 10); val = simple_strtoul(buf, NULL, 10);
...@@ -682,8 +688,8 @@ store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr) ...@@ -682,8 +688,8 @@ store_pwm_reg(struct device *dev, const char *buf, size_t count, int nr)
static ssize_t static ssize_t
store_pwmenable_reg(struct device *dev, const char *buf, size_t count, int nr) store_pwmenable_reg(struct device *dev, const char *buf, size_t count, int nr)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83781d_data *data = dev_get_drvdata(dev);
struct w83781d_data *data = i2c_get_clientdata(client); struct i2c_client *client = &data->client;
u32 val, reg; u32 val, reg;
val = simple_strtoul(buf, NULL, 10); val = simple_strtoul(buf, NULL, 10);
...@@ -755,8 +761,8 @@ show_sensor_reg(struct device *dev, char *buf, int nr) ...@@ -755,8 +761,8 @@ show_sensor_reg(struct device *dev, char *buf, int nr)
static ssize_t static ssize_t
store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr) store_sensor_reg(struct device *dev, const char *buf, size_t count, int nr)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83781d_data *data = dev_get_drvdata(dev);
struct w83781d_data *data = i2c_get_clientdata(client); struct i2c_client *client = &data->client;
u32 val, tmp; u32 val, tmp;
val = simple_strtoul(buf, NULL, 10); val = simple_strtoul(buf, NULL, 10);
...@@ -813,6 +819,16 @@ sysfs_sensor(1); ...@@ -813,6 +819,16 @@ sysfs_sensor(1);
sysfs_sensor(2); sysfs_sensor(2);
sysfs_sensor(3); sysfs_sensor(3);
/* I2C devices get this name attribute automatically, but for ISA devices
we must create it by ourselves. */
static ssize_t
show_name(struct device *dev, struct device_attribute *devattr, char *buf)
{
struct w83781d_data *data = dev_get_drvdata(dev);
return sprintf(buf, "%s\n", data->client.name);
}
static DEVICE_ATTR(name, S_IRUGO, show_name, NULL);
/* This function is called when: /* This function is called when:
* w83781d_driver is inserted (when this module is loaded), for each * w83781d_driver is inserted (when this module is loaded), for each
available adapter available adapter
...@@ -825,12 +841,6 @@ w83781d_attach_adapter(struct i2c_adapter *adapter) ...@@ -825,12 +841,6 @@ w83781d_attach_adapter(struct i2c_adapter *adapter)
return i2c_probe(adapter, &addr_data, w83781d_detect); return i2c_probe(adapter, &addr_data, w83781d_detect);
} }
static int
w83781d_isa_attach_adapter(struct i2c_adapter *adapter)
{
return w83781d_detect(adapter, isa_address, -1);
}
/* Assumes that adapter is of I2C, not ISA variety. /* Assumes that adapter is of I2C, not ISA variety.
* OTHERWISE DON'T CALL THIS * OTHERWISE DON'T CALL THIS
*/ */
...@@ -994,78 +1004,86 @@ static const struct attribute_group w83781d_group_opt = { ...@@ -994,78 +1004,86 @@ static const struct attribute_group w83781d_group_opt = {
.attrs = w83781d_attributes_opt, .attrs = w83781d_attributes_opt,
}; };
/* No clean up is done on error, it's up to the caller */
static int static int
w83781d_detect(struct i2c_adapter *adapter, int address, int kind) w83781d_create_files(struct device *dev, int kind, int is_isa)
{ {
int i = 0, val1 = 0, val2;
struct i2c_client *client;
struct device *dev;
struct w83781d_data *data;
int err; int err;
const char *client_name = "";
int is_isa = i2c_is_isa_adapter(adapter);
enum vendor { winbond, asus } vendid;
if (!is_isa if ((err = sysfs_create_group(&dev->kobj, &w83781d_group)))
&& !i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) { return err;
err = -EINVAL;
goto ERROR0; if (kind != w83783s) {
if ((err = device_create_file(dev, &dev_attr_in1_input))
|| (err = device_create_file(dev, &dev_attr_in1_min))
|| (err = device_create_file(dev, &dev_attr_in1_max)))
return err;
}
if (kind != as99127f && kind != w83781d && kind != w83783s) {
if ((err = device_create_file(dev, &dev_attr_in7_input))
|| (err = device_create_file(dev, &dev_attr_in7_min))
|| (err = device_create_file(dev, &dev_attr_in7_max))
|| (err = device_create_file(dev, &dev_attr_in8_input))
|| (err = device_create_file(dev, &dev_attr_in8_min))
|| (err = device_create_file(dev, &dev_attr_in8_max)))
return err;
}
if (kind != w83783s) {
if ((err = device_create_file(dev, &dev_attr_temp3_input))
|| (err = device_create_file(dev, &dev_attr_temp3_max))
|| (err = device_create_file(dev,
&dev_attr_temp3_max_hyst)))
return err;
} }
/* Prevent users from forcing a kind for a bus it isn't supposed if (kind != w83781d && kind != as99127f) {
to possibly be on */ if ((err = device_create_file(dev, &dev_attr_pwm1))
if (is_isa && (kind == as99127f || kind == w83783s)) { || (err = device_create_file(dev, &dev_attr_pwm2))
dev_err(&adapter->dev, || (err = device_create_file(dev, &dev_attr_pwm2_enable)))
"Cannot force I2C-only chip for ISA address 0x%02x.\n", return err;
address); }
err = -EINVAL; if (kind == w83782d && !is_isa) {
goto ERROR0; if ((err = device_create_file(dev, &dev_attr_pwm3))
|| (err = device_create_file(dev, &dev_attr_pwm4)))
return err;
} }
if (is_isa) if (kind != as99127f && kind != w83781d) {
if (!request_region(address, W83781D_EXTENT, if ((err = device_create_file(dev, &dev_attr_temp1_type))
w83781d_isa_driver.driver.name)) { || (err = device_create_file(dev,
dev_dbg(&adapter->dev, "Request of region " &dev_attr_temp2_type)))
"0x%x-0x%x for w83781d failed\n", address, return err;
address + W83781D_EXTENT - 1); if (kind != w83783s) {
err = -EBUSY; if ((err = device_create_file(dev,
goto ERROR0; &dev_attr_temp3_type)))
return err;
}
} }
/* Probe whether there is anything available on this address. Already
done for SMBus clients */
if (kind < 0) {
if (is_isa) { if (is_isa) {
err = device_create_file(&pdev->dev, &dev_attr_name);
#define REALLY_SLOW_IO if (err)
/* We need the timeouts for at least some LM78-like return err;
chips. But only if we read 'undefined' registers. */
i = inb_p(address + 1);
if (inb_p(address + 2) != i
|| inb_p(address + 3) != i
|| inb_p(address + 7) != i) {
dev_dbg(&adapter->dev, "Detection of w83781d "
"chip failed at step 1\n");
err = -ENODEV;
goto ERROR1;
} }
#undef REALLY_SLOW_IO
/* Let's just hope nothing breaks here */ return 0;
i = inb_p(address + 5) & 0x7f; }
outb_p(~i & 0x7f, address + 5);
val2 = inb_p(address + 5) & 0x7f; static int
if (val2 != (~i & 0x7f)) { w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
outb_p(i, address + 5); {
dev_dbg(&adapter->dev, "Detection of w83781d " int val1 = 0, val2;
"chip failed at step 2 (0x%x != " struct i2c_client *client;
"0x%x at 0x%x)\n", val2, ~i & 0x7f, struct device *dev;
address + 5); struct w83781d_data *data;
err = -ENODEV; int err;
const char *client_name = "";
enum vendor { winbond, asus } vendid;
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA)) {
err = -EINVAL;
goto ERROR1; goto ERROR1;
} }
}
}
/* OK. For now, we presume we have a valid client. We now create the /* OK. For now, we presume we have a valid client. We now create the
client structure, even though we cannot fill it completely yet. client structure, even though we cannot fill it completely yet.
...@@ -1081,8 +1099,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -1081,8 +1099,7 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
client->addr = address; client->addr = address;
mutex_init(&data->lock); mutex_init(&data->lock);
client->adapter = adapter; client->adapter = adapter;
client->driver = is_isa ? &w83781d_isa_driver : &w83781d_driver; client->driver = &w83781d_driver;
client->flags = 0;
dev = &client->dev; dev = &client->dev;
/* Now, we do the remaining detection. */ /* Now, we do the remaining detection. */
...@@ -1111,8 +1128,8 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -1111,8 +1128,8 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
} }
/* If Winbond SMBus, check address at 0x48. /* If Winbond SMBus, check address at 0x48.
Asus doesn't support, except for as99127f rev.2 */ Asus doesn't support, except for as99127f rev.2 */
if ((!is_isa) && (((!(val1 & 0x80)) && (val2 == 0xa3)) || if ((!(val1 & 0x80) && (val2 == 0xa3)) ||
((val1 & 0x80) && (val2 == 0x5c)))) { ((val1 & 0x80) && (val2 == 0x5c))) {
if (w83781d_read_value if (w83781d_read_value
(client, W83781D_REG_I2C_ADDR) != address) { (client, W83781D_REG_I2C_ADDR) != address) {
dev_dbg(&adapter->dev, "Detection of w83781d " dev_dbg(&adapter->dev, "Detection of w83781d "
...@@ -1149,12 +1166,11 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -1149,12 +1166,11 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
kind = w83781d; kind = w83781d;
else if (val1 == 0x30 && vendid == winbond) else if (val1 == 0x30 && vendid == winbond)
kind = w83782d; kind = w83782d;
else if (val1 == 0x40 && vendid == winbond && !is_isa else if (val1 == 0x40 && vendid == winbond && address == 0x2d)
&& address == 0x2d)
kind = w83783s; kind = w83783s;
else if (val1 == 0x21 && vendid == winbond) else if (val1 == 0x21 && vendid == winbond)
kind = w83627hf; kind = w83627hf;
else if (val1 == 0x31 && !is_isa && address >= 0x28) else if (val1 == 0x31 && address >= 0x28)
kind = as99127f; kind = as99127f;
else { else {
if (kind == 0) if (kind == 0)
...@@ -1182,86 +1198,23 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -1182,86 +1198,23 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
strlcpy(client->name, client_name, I2C_NAME_SIZE); strlcpy(client->name, client_name, I2C_NAME_SIZE);
data->type = kind; data->type = kind;
data->valid = 0;
mutex_init(&data->update_lock);
/* Tell the I2C layer a new client has arrived */ /* Tell the I2C layer a new client has arrived */
if ((err = i2c_attach_client(client))) if ((err = i2c_attach_client(client)))
goto ERROR2; goto ERROR2;
/* attach secondary i2c lm75-like clients */ /* attach secondary i2c lm75-like clients */
if (!is_isa) {
if ((err = w83781d_detect_subclients(adapter, address, if ((err = w83781d_detect_subclients(adapter, address,
kind, client))) kind, client)))
goto ERROR3; goto ERROR3;
} else {
data->lm75[0] = NULL;
data->lm75[1] = NULL;
}
/* Initialize the chip */ /* Initialize the chip */
w83781d_init_client(client); w83781d_init_device(dev);
/* A few vars need to be filled upon startup */
for (i = 1; i <= 3; i++) {
data->fan_min[i - 1] = w83781d_read_value(client,
W83781D_REG_FAN_MIN(i));
}
if (kind != w83781d && kind != as99127f)
for (i = 0; i < 4; i++)
data->pwmenable[i] = 1;
/* Register sysfs hooks */ /* Register sysfs hooks */
if ((err = sysfs_create_group(&dev->kobj, &w83781d_group))) err = w83781d_create_files(dev, kind, 0);
if (err)
goto ERROR4; goto ERROR4;
if (kind != w83783s) {
if ((err = device_create_file(dev, &dev_attr_in1_input))
|| (err = device_create_file(dev, &dev_attr_in1_min))
|| (err = device_create_file(dev, &dev_attr_in1_max)))
goto ERROR4;
}
if (kind != as99127f && kind != w83781d && kind != w83783s) {
if ((err = device_create_file(dev, &dev_attr_in7_input))
|| (err = device_create_file(dev, &dev_attr_in7_min))
|| (err = device_create_file(dev, &dev_attr_in7_max))
|| (err = device_create_file(dev, &dev_attr_in8_input))
|| (err = device_create_file(dev, &dev_attr_in8_min))
|| (err = device_create_file(dev, &dev_attr_in8_max)))
goto ERROR4;
}
if (kind != w83783s) {
if ((err = device_create_file(dev, &dev_attr_temp3_input))
|| (err = device_create_file(dev, &dev_attr_temp3_max))
|| (err = device_create_file(dev,
&dev_attr_temp3_max_hyst)))
goto ERROR4;
}
if (kind != w83781d && kind != as99127f) {
if ((err = device_create_file(dev, &dev_attr_pwm1))
|| (err = device_create_file(dev, &dev_attr_pwm2))
|| (err = device_create_file(dev, &dev_attr_pwm2_enable)))
goto ERROR4;
}
if (kind == w83782d && !is_isa) {
if ((err = device_create_file(dev, &dev_attr_pwm3))
|| (err = device_create_file(dev, &dev_attr_pwm4)))
goto ERROR4;
}
if (kind != as99127f && kind != w83781d) {
if ((err = device_create_file(dev, &dev_attr_temp1_type))
|| (err = device_create_file(dev,
&dev_attr_temp2_type)))
goto ERROR4;
if (kind != w83783s) {
if ((err = device_create_file(dev,
&dev_attr_temp3_type)))
goto ERROR4;
}
}
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);
...@@ -1287,9 +1240,6 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -1287,9 +1240,6 @@ w83781d_detect(struct i2c_adapter *adapter, int address, int kind)
ERROR2: ERROR2:
kfree(data); kfree(data);
ERROR1: ERROR1:
if (is_isa)
release_region(address, W83781D_EXTENT);
ERROR0:
return err; return err;
} }
...@@ -1305,8 +1255,6 @@ w83781d_detach_client(struct i2c_client *client) ...@@ -1305,8 +1255,6 @@ w83781d_detach_client(struct i2c_client *client)
sysfs_remove_group(&client->dev.kobj, &w83781d_group); sysfs_remove_group(&client->dev.kobj, &w83781d_group);
sysfs_remove_group(&client->dev.kobj, &w83781d_group_opt); sysfs_remove_group(&client->dev.kobj, &w83781d_group_opt);
} }
if (i2c_is_isa_client(client))
release_region(client->addr, W83781D_EXTENT);
if ((err = i2c_detach_client(client))) if ((err = i2c_detach_client(client)))
return err; return err;
...@@ -1322,6 +1270,88 @@ w83781d_detach_client(struct i2c_client *client) ...@@ -1322,6 +1270,88 @@ w83781d_detach_client(struct i2c_client *client)
return 0; return 0;
} }
static int __devinit
w83781d_isa_probe(struct platform_device *pdev)
{
int err, reg;
struct w83781d_data *data;
struct resource *res;
const char *name;
/* Reserve the ISA region */
res = platform_get_resource(pdev, IORESOURCE_IO, 0);
if (!request_region(res->start, W83781D_EXTENT, "w83781d")) {
err = -EBUSY;
goto exit;
}
if (!(data = kzalloc(sizeof(struct w83781d_data), GFP_KERNEL))) {
err = -ENOMEM;
goto exit_release_region;
}
mutex_init(&data->lock);
data->client.addr = res->start;
i2c_set_clientdata(&data->client, data);
platform_set_drvdata(pdev, data);
reg = w83781d_read_value(&data->client, W83781D_REG_WCHIPID);
switch (reg) {
case 0x21:
data->type = w83627hf;
name = "w83627hf";
break;
case 0x30:
data->type = w83782d;
name = "w83782d";
break;
default:
data->type = w83781d;
name = "w83781d";
}
strlcpy(data->client.name, name, I2C_NAME_SIZE);
/* Initialize the W83781D chip */
w83781d_init_device(&pdev->dev);
/* Register sysfs hooks */
err = w83781d_create_files(&pdev->dev, data->type, 1);
if (err)
goto exit_remove_files;
data->class_dev = hwmon_device_register(&pdev->dev);
if (IS_ERR(data->class_dev)) {
err = PTR_ERR(data->class_dev);
goto exit_remove_files;
}
return 0;
exit_remove_files:
sysfs_remove_group(&pdev->dev.kobj, &w83781d_group);
sysfs_remove_group(&pdev->dev.kobj, &w83781d_group_opt);
device_remove_file(&pdev->dev, &dev_attr_name);
kfree(data);
exit_release_region:
release_region(res->start, W83781D_EXTENT);
exit:
return err;
}
static int __devexit
w83781d_isa_remove(struct platform_device *pdev)
{
struct w83781d_data *data = platform_get_drvdata(pdev);
hwmon_device_unregister(data->class_dev);
sysfs_remove_group(&pdev->dev.kobj, &w83781d_group);
sysfs_remove_group(&pdev->dev.kobj, &w83781d_group_opt);
device_remove_file(&pdev->dev, &dev_attr_name);
release_region(data->client.addr, W83781D_EXTENT);
kfree(data);
return 0;
}
/* The SMBus locks itself, usually, but nothing may access the Winbond between /* The SMBus locks itself, usually, but nothing may access the Winbond between
bank switches. ISA access must always be locked explicitly! bank switches. ISA access must always be locked explicitly!
We ignore the W83781D BUSY flag at this moment - it could lead to deadlocks, We ignore the W83781D BUSY flag at this moment - it could lead to deadlocks,
...@@ -1336,7 +1366,7 @@ w83781d_read_value(struct i2c_client *client, u16 reg) ...@@ -1336,7 +1366,7 @@ w83781d_read_value(struct i2c_client *client, u16 reg)
struct i2c_client *cl; struct i2c_client *cl;
mutex_lock(&data->lock); mutex_lock(&data->lock);
if (i2c_is_isa_client(client)) { if (!client->driver) { /* ISA device */
word_sized = (((reg & 0xff00) == 0x100) word_sized = (((reg & 0xff00) == 0x100)
|| ((reg & 0xff00) == 0x200)) || ((reg & 0xff00) == 0x200))
&& (((reg & 0x00ff) == 0x50) && (((reg & 0x00ff) == 0x50)
...@@ -1405,7 +1435,7 @@ w83781d_write_value(struct i2c_client *client, u16 reg, u16 value) ...@@ -1405,7 +1435,7 @@ w83781d_write_value(struct i2c_client *client, u16 reg, u16 value)
struct i2c_client *cl; struct i2c_client *cl;
mutex_lock(&data->lock); mutex_lock(&data->lock);
if (i2c_is_isa_client(client)) { if (!client->driver) { /* ISA device */
word_sized = (((reg & 0xff00) == 0x100) word_sized = (((reg & 0xff00) == 0x100)
|| ((reg & 0xff00) == 0x200)) || ((reg & 0xff00) == 0x200))
&& (((reg & 0x00ff) == 0x53) && (((reg & 0x00ff) == 0x53)
...@@ -1462,9 +1492,10 @@ w83781d_write_value(struct i2c_client *client, u16 reg, u16 value) ...@@ -1462,9 +1492,10 @@ w83781d_write_value(struct i2c_client *client, u16 reg, u16 value)
} }
static void static void
w83781d_init_client(struct i2c_client *client) w83781d_init_device(struct device *dev)
{ {
struct w83781d_data *data = i2c_get_clientdata(client); struct w83781d_data *data = dev_get_drvdata(dev);
struct i2c_client *client = &data->client;
int i, p; int i, p;
int type = data->type; int type = data->type;
u8 tmp; u8 tmp;
...@@ -1477,7 +1508,7 @@ w83781d_init_client(struct i2c_client *client) ...@@ -1477,7 +1508,7 @@ w83781d_init_client(struct i2c_client *client)
It might even go away if nobody reports it as being useful, It might even go away if nobody reports it as being useful,
as I see very little reason why this would be needed at as I see very little reason why this would be needed at
all. */ all. */
dev_info(&client->dev, "If reset=1 solved a problem you were " dev_info(dev, "If reset=1 solved a problem you were "
"having, please report!\n"); "having, please report!\n");
/* save these registers */ /* save these registers */
...@@ -1527,7 +1558,7 @@ w83781d_init_client(struct i2c_client *client) ...@@ -1527,7 +1558,7 @@ w83781d_init_client(struct i2c_client *client)
/* Enable temp2 */ /* Enable temp2 */
tmp = w83781d_read_value(client, W83781D_REG_TEMP2_CONFIG); tmp = w83781d_read_value(client, W83781D_REG_TEMP2_CONFIG);
if (tmp & 0x01) { if (tmp & 0x01) {
dev_warn(&client->dev, "Enabling temp2, readings " dev_warn(dev, "Enabling temp2, readings "
"might not make sense\n"); "might not make sense\n");
w83781d_write_value(client, W83781D_REG_TEMP2_CONFIG, w83781d_write_value(client, W83781D_REG_TEMP2_CONFIG,
tmp & 0xfe); tmp & 0xfe);
...@@ -1538,7 +1569,7 @@ w83781d_init_client(struct i2c_client *client) ...@@ -1538,7 +1569,7 @@ w83781d_init_client(struct i2c_client *client)
tmp = w83781d_read_value(client, tmp = w83781d_read_value(client,
W83781D_REG_TEMP3_CONFIG); W83781D_REG_TEMP3_CONFIG);
if (tmp & 0x01) { if (tmp & 0x01) {
dev_warn(&client->dev, "Enabling temp3, " dev_warn(dev, "Enabling temp3, "
"readings might not make sense\n"); "readings might not make sense\n");
w83781d_write_value(client, w83781d_write_value(client,
W83781D_REG_TEMP3_CONFIG, tmp & 0xfe); W83781D_REG_TEMP3_CONFIG, tmp & 0xfe);
...@@ -1551,12 +1582,23 @@ w83781d_init_client(struct i2c_client *client) ...@@ -1551,12 +1582,23 @@ w83781d_init_client(struct i2c_client *client)
(w83781d_read_value(client, (w83781d_read_value(client,
W83781D_REG_CONFIG) & 0xf7) W83781D_REG_CONFIG) & 0xf7)
| 0x01); | 0x01);
/* A few vars need to be filled upon startup */
for (i = 1; i <= 3; i++) {
data->fan_min[i - 1] = w83781d_read_value(client,
W83781D_REG_FAN_MIN(i));
}
if (type != w83781d && type != as99127f)
for (i = 0; i < 4; i++)
data->pwmenable[i] = 1;
mutex_init(&data->update_lock);
} }
static struct w83781d_data *w83781d_update_device(struct device *dev) static struct w83781d_data *w83781d_update_device(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev); struct w83781d_data *data = dev_get_drvdata(dev);
struct w83781d_data *data = i2c_get_clientdata(client); struct i2c_client *client = &data->client;
int i; int i;
mutex_lock(&data->update_lock); mutex_lock(&data->update_lock);
...@@ -1589,8 +1631,7 @@ static struct w83781d_data *w83781d_update_device(struct device *dev) ...@@ -1589,8 +1631,7 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
data->pwm[i - 1] = data->pwm[i - 1] =
w83781d_read_value(client, w83781d_read_value(client,
W83781D_REG_PWM(i)); W83781D_REG_PWM(i));
if ((data->type != w83782d if ((data->type != w83782d || !client->driver)
|| i2c_is_isa_client(client))
&& i == 2) && i == 2)
break; break;
} }
...@@ -1672,6 +1713,133 @@ static struct w83781d_data *w83781d_update_device(struct device *dev) ...@@ -1672,6 +1713,133 @@ static struct w83781d_data *w83781d_update_device(struct device *dev)
return data; return data;
} }
/* return 1 if a supported chip is found, 0 otherwise */
static int __init
w83781d_isa_found(unsigned short address)
{
int val, save, found = 0;
if (!request_region(address, W83781D_EXTENT, "w83781d"))
return 0;
#define REALLY_SLOW_IO
/* We need the timeouts for at least some W83781D-like
chips. But only if we read 'undefined' registers. */
val = inb_p(address + 1);
if (inb_p(address + 2) != val
|| inb_p(address + 3) != val
|| inb_p(address + 7) != val) {
pr_debug("w83781d: Detection failed at step 1\n");
goto release;
}
#undef REALLY_SLOW_IO
/* We should be able to change the 7 LSB of the address port. The
MSB (busy flag) should be clear initially, set after the write. */
save = inb_p(address + W83781D_ADDR_REG_OFFSET);
if (save & 0x80) {
pr_debug("w83781d: Detection failed at step 2\n");
goto release;
}
val = ~save & 0x7f;
outb_p(val, address + W83781D_ADDR_REG_OFFSET);
if (inb_p(address + W83781D_ADDR_REG_OFFSET) != (val | 0x80)) {
outb_p(save, address + W83781D_ADDR_REG_OFFSET);
pr_debug("w83781d: Detection failed at step 3\n");
goto release;
}
/* We found a device, now see if it could be a W83781D */
outb_p(W83781D_REG_CONFIG, address + W83781D_ADDR_REG_OFFSET);
val = inb_p(address + W83781D_DATA_REG_OFFSET);
if (val & 0x80) {
pr_debug("w83781d: Detection failed at step 4\n");
goto release;
}
outb_p(W83781D_REG_BANK, address + W83781D_ADDR_REG_OFFSET);
save = inb_p(address + W83781D_DATA_REG_OFFSET);
outb_p(W83781D_REG_CHIPMAN, address + W83781D_ADDR_REG_OFFSET);
val = inb_p(address + W83781D_DATA_REG_OFFSET);
if ((!(save & 0x80) && (val != 0xa3))
|| ((save & 0x80) && (val != 0x5c))) {
pr_debug("w83781d: Detection failed at step 5\n");
goto release;
}
outb_p(W83781D_REG_I2C_ADDR, address + W83781D_ADDR_REG_OFFSET);
val = inb_p(address + W83781D_DATA_REG_OFFSET);
if (val < 0x03 || val > 0x77) { /* Not a valid I2C address */
pr_debug("w83781d: Detection failed at step 6\n");
goto release;
}
/* The busy flag should be clear again */
if (inb_p(address + W83781D_ADDR_REG_OFFSET) & 0x80) {
pr_debug("w83781d: Detection failed at step 7\n");
goto release;
}
/* Determine the chip type */
outb_p(W83781D_REG_BANK, address + W83781D_ADDR_REG_OFFSET);
save = inb_p(address + W83781D_DATA_REG_OFFSET);
outb_p(save & 0xf8, address + W83781D_DATA_REG_OFFSET);
outb_p(W83781D_REG_WCHIPID, address + W83781D_ADDR_REG_OFFSET);
val = inb_p(address + W83781D_DATA_REG_OFFSET);
if ((val & 0xfe) == 0x10 /* W83781D */
|| val == 0x30 /* W83782D */
|| val == 0x21) /* W83627HF */
found = 1;
if (found)
pr_info("w83781d: Found a %s chip at %#x\n",
val == 0x21 ? "W83627HF" :
val == 0x30 ? "W83782D" : "W83781D", (int)address);
release:
release_region(address, W83781D_EXTENT);
return found;
}
static int __init
w83781d_isa_device_add(unsigned short address)
{
struct resource res = {
.start = address,
.end = address + W83781D_EXTENT,
.name = "w83781d",
.flags = IORESOURCE_IO,
};
int err;
pdev = platform_device_alloc("w83781d", address);
if (!pdev) {
err = -ENOMEM;
printk(KERN_ERR "w83781d: Device allocation failed\n");
goto exit;
}
err = platform_device_add_resources(pdev, &res, 1);
if (err) {
printk(KERN_ERR "w83781d: Device resource addition failed "
"(%d)\n", err);
goto exit_device_put;
}
err = platform_device_add(pdev);
if (err) {
printk(KERN_ERR "w83781d: Device addition failed (%d)\n",
err);
goto exit_device_put;
}
return 0;
exit_device_put:
platform_device_put(pdev);
exit:
pdev = NULL;
return err;
}
static int __init static int __init
sensors_w83781d_init(void) sensors_w83781d_init(void)
{ {
...@@ -1679,21 +1847,36 @@ sensors_w83781d_init(void) ...@@ -1679,21 +1847,36 @@ sensors_w83781d_init(void)
res = i2c_add_driver(&w83781d_driver); res = i2c_add_driver(&w83781d_driver);
if (res) if (res)
return res; goto exit;
/* Don't exit if this one fails, we still want the I2C variants if (w83781d_isa_found(isa_address)) {
to work! */ res = platform_driver_register(&w83781d_isa_driver);
if (i2c_isa_add_driver(&w83781d_isa_driver)) if (res)
isa_address = 0; goto exit_unreg_i2c_driver;
/* Sets global pdev as a side effect */
res = w83781d_isa_device_add(isa_address);
if (res)
goto exit_unreg_isa_driver;
}
return 0; return 0;
exit_unreg_isa_driver:
platform_driver_unregister(&w83781d_isa_driver);
exit_unreg_i2c_driver:
i2c_del_driver(&w83781d_driver);
exit:
return res;
} }
static void __exit static void __exit
sensors_w83781d_exit(void) sensors_w83781d_exit(void)
{ {
if (isa_address) if (pdev) {
i2c_isa_del_driver(&w83781d_isa_driver); platform_device_unregister(pdev);
platform_driver_unregister(&w83781d_isa_driver);
}
i2c_del_driver(&w83781d_driver); i2c_del_driver(&w83781d_driver);
} }
......
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