malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

Browse Source 
* 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6:
  hwmon: (smsc47m1) restore missing name attribute
  hwmon: (w83627ehf) don't assume bank 0
  hwmon: (w83627ehf) read fan_div values during probe
  hwmon: fix w83781d temp sensor type setting
This commit is contained in:
Linus Torvalds 2007-08-18 09:41:19 -07:00
commit ef1c5339d9
3 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/hwmon/smsc47m1.c
View File

@ -585,6 +585,8 @@ static int __devinit smsc47m1_probe(struct platform_device *pdev)
if ((err = device_create_file(dev, &dev_attr_alarms))) if ((err = device_create_file(dev, &dev_attr_alarms)))
goto error_remove_files; goto error_remove_files;
if ((err = device_create_file(dev, &dev_attr_name)))
goto error_remove_files;
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)) {

34
drivers/hwmon/w83627ehf.c
View File

@ -309,18 +309,16 @@ static inline int is_word_sized(u16 reg)
|| (reg & 0x00ff) == 0x55)); || (reg & 0x00ff) == 0x55));
} }
/* We assume that the default bank is 0, thus the following two functions do /* Registers 0x50-0x5f are banked */
nothing for registers which live in bank 0. For others, they respectively
set the bank register to the correct value (before the register is
accessed), and back to 0 (afterwards). */
static inline void w83627ehf_set_bank(struct w83627ehf_data *data, u16 reg) static inline void w83627ehf_set_bank(struct w83627ehf_data *data, u16 reg)
{ {
if (reg & 0xff00) { if ((reg & 0x00f0) == 0x50) {
outb_p(W83627EHF_REG_BANK, data->addr + ADDR_REG_OFFSET); outb_p(W83627EHF_REG_BANK, data->addr + ADDR_REG_OFFSET);
outb_p(reg >> 8, data->addr + DATA_REG_OFFSET); outb_p(reg >> 8, data->addr + DATA_REG_OFFSET);
} }
} }
/* Not strictly necessary, but play it safe for now */
static inline void w83627ehf_reset_bank(struct w83627ehf_data *data, u16 reg) static inline void w83627ehf_reset_bank(struct w83627ehf_data *data, u16 reg)
{ {
if (reg & 0xff00) { if (reg & 0xff00) {
@ -421,17 +419,10 @@ static void w83627ehf_write_fan_div(struct w83627ehf_data *data, int nr)
} }
} }
static struct w83627ehf_data *w83627ehf_update_device(struct device *dev) static void w83627ehf_update_fan_div(struct w83627ehf_data *data)
{ {
struct w83627ehf_data *data = dev_get_drvdata(dev);
int pwmcfg = 0, tolerance = 0; /* shut up the compiler */
int i; int i;
mutex_lock(&data->update_lock);
if (time_after(jiffies, data->last_updated + HZ + HZ/2)
|| !data->valid) {
/* Fan clock dividers */
i = w83627ehf_read_value(data, 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;
@ -451,6 +442,20 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
i = w83627ehf_read_value(data, 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;
} }
}
static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
{
struct w83627ehf_data *data = dev_get_drvdata(dev);
int pwmcfg = 0, tolerance = 0; /* shut up the compiler */
int i;
mutex_lock(&data->update_lock);
if (time_after(jiffies, data->last_updated + HZ + HZ/2)
|| !data->valid) {
/* Fan clock dividers */
w83627ehf_update_fan_div(data);
/* Measured voltages and limits */ /* Measured voltages and limits */
for (i = 0; i < data->in_num; i++) { for (i = 0; i < data->in_num; i++) {
@ -1312,6 +1317,9 @@ static int __devinit w83627ehf_probe(struct platform_device *pdev)
if (!(i & (1 << 1)) && (!fan5pin)) if (!(i & (1 << 1)) && (!fan5pin))
data->has_fan |= (1 << 4); data->has_fan |= (1 << 4);
/* Read fan clock dividers immediately */
w83627ehf_update_fan_div(data);
/* Register sysfs hooks */ /* Register sysfs hooks */
for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays); i++) for (i = 0; i < ARRAY_SIZE(sda_sf3_arrays); i++)
if ((err = device_create_file(dev, if ((err = device_create_file(dev,

4
drivers/hwmon/w83781d.c
View File

@ -740,9 +740,9 @@ store_sensor(struct device *dev, struct device_attribute *da,
static SENSOR_DEVICE_ATTR(temp1_type, S_IRUGO | S_IWUSR, static SENSOR_DEVICE_ATTR(temp1_type, S_IRUGO | S_IWUSR,
show_sensor, store_sensor, 0); show_sensor, store_sensor, 0);
static SENSOR_DEVICE_ATTR(temp2_type, S_IRUGO | S_IWUSR, static SENSOR_DEVICE_ATTR(temp2_type, S_IRUGO | S_IWUSR,
show_sensor, store_sensor, 0); show_sensor, store_sensor, 1);
static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO | S_IWUSR, static SENSOR_DEVICE_ATTR(temp3_type, S_IRUGO | S_IWUSR,
show_sensor, store_sensor, 0); show_sensor, store_sensor, 2);
/* I2C devices get this name attribute automatically, but for ISA devices /* I2C devices get this name attribute automatically, but for ISA devices
we must create it by ourselves. */ we must create it by ourselves. */