forked from Minki/linux
New driver for HTU21D (humidity sensor)
Add support for Fam16h (Kabini) to k10temp Add support for NCT6102D/6106D and NCT6791D to nct6775 driver Add support for ADS1115 to ads1015 driver Add support for hibernate to w83627ehf and nct6775 drivers Some minor cleanups -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIcBAABAgAGBQJSJQNWAAoJEMsfJm/On5mBNN0P/izDVmmq1Q/7+7chD/qAjxPJ KiJ9J9ITJF+dKrdgvmw3zJ1jRb1Mjf1yYoy9c5GAHrDM+mLt52HQY8HNSujz9cQ+ bIZj+RLYGvf/5DBbuYle9vZtTQN63NEjHiJYLQdJpfpVCTOKLdTJQTP55mTjtQln TIbHVcVxUYfJHAPDCHuFAhRhSL9bhoXhJzmU1i8xrlNl6rqFsMkKXJSozrgAaQ7r 6s9edBObQHQSqcH/S1bURVvyYa2fmqCh+o9ixMpYo0yYNr1/6oifn4z5FuPEEfro rP1MbRfGYQsSDTomaOHYgZEON46FFTFE8AT0+1XOEsdkpOTRX81qqKDqTt17EE4f rCTWuBoFmkUyek56Qmw/Zaza+RNoHi+evvGPER6xyBNSq9On8uK83stZIB7JOLPg u8BaeZNvhfY3THlcuWJ3FyGGfNFvtbE5UyLDFSaVwz933NVVUnIAoQ8iKbTwyIu8 WdO+unklarKEjKJxArsygBS4vuNhRPOPyFuO03lRtObbCndjJUcgTCbiPsRdWQ2t DGJkFfQ4scJ/LmLtJIKsGaulUAVyWrwfL/ZSWL84dZtX14zb98V6DSicCNg4SWiK jtZwN9YccwsBXr0t3VDWDsUfKHHgR+baAbWpgxGismgLhACwmf7tzYnEaSeALGMV +t9tAn/uTq8UeQfC3fjV =isg0 -----END PGP SIGNATURE----- Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pull hwmon updates from Guenter Roeck: - new driver for HTU21D (humidity sensor) - add support for Fam16h (Kabini) to k10temp - add support for NCT6102D/6106D and NCT6791D to nct6775 driver - add support for ADS1115 to ads1015 driver - add support for hibernate to w83627ehf and nct6775 drivers - some minor cleanups * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (htu21) Add Measurement Specialties HTU21D support hwmon: Change my email address. hwmon: (k10temp) Add support for Fam16h (Kabini) hwmon: (adt7462) ADT7462_REG_VOLT_MAX() should return 0 hwmon: (ads1015) Add support for ADS1115 hwmon: (w83627ehf) Add support for hibernate hwmon: (nct6775) Add support for hibernate hwmon: use dev_get_platdata() hwmon: (nct6775) Fix size of data->temp array hwmon: (nct6775) Avoid using device platform data outside probe function hwmon: (nct6775) Add support for NCT6791D hwmon: (nct6775) Add support for beep attributes hwmon: (nct6775) Add support for critical low/high temperature limits on NCT6106 hwmon: (nct6775) Add support for NCT6102D/6106D hwmon: (nct6775) Support two SuperIO chips in the same system hwmon: (nct6775) Allocate attributes dynamically from templates hwmon: (coretemp) Atom CPUs don't support TjMax; no warning needed
This commit is contained in:
Linus Torvalds
commit
7e75224188
@ -6,6 +6,10 @@ Supported chips:
|
||||
Prefix: 'ads1015'
|
||||
Datasheet: Publicly available at the Texas Instruments website :
|
||||
http://focus.ti.com/lit/ds/symlink/ads1015.pdf
|
||||
* Texas Instruments ADS1115
|
||||
Prefix: 'ads1115'
|
||||
Datasheet: Publicly available at the Texas Instruments website :
|
||||
http://focus.ti.com/lit/ds/symlink/ads1115.pdf
|
||||
|
||||
Authors:
|
||||
Dirk Eibach, Guntermann & Drunck GmbH <eibach@gdsys.de>
|
||||
@ -13,9 +17,9 @@ Authors:
|
||||
Description
|
||||
-----------
|
||||
|
||||
This driver implements support for the Texas Instruments ADS1015.
|
||||
This driver implements support for the Texas Instruments ADS1015/ADS1115.
|
||||
|
||||
This device is a 12-bit A-D converter with 4 inputs.
|
||||
This device is a 12/16-bit A-D converter with 4 inputs.
|
||||
|
||||
The inputs can be used single ended or in certain differential combinations.
|
||||
|
||||
|
||||
46
Documentation/hwmon/htu21
Normal file
46
Documentation/hwmon/htu21
Normal file
@ -0,0 +1,46 @@
|
||||
Kernel driver htu21
|
||||
===================
|
||||
|
||||
Supported chips:
|
||||
* Measurement Specialties HTU21D
|
||||
Prefix: 'htu21'
|
||||
Addresses scanned: none
|
||||
Datasheet: Publicly available at the Measurement Specialties website
|
||||
http://www.meas-spec.com/downloads/HTU21D.pdf
|
||||
|
||||
|
||||
Author:
|
||||
William Markezana <william.markezana@meas-spec.com>
|
||||
|
||||
Description
|
||||
-----------
|
||||
|
||||
The HTU21D is a humidity and temperature sensor in a DFN package of
|
||||
only 3 x 3 mm footprint and 0.9 mm height.
|
||||
|
||||
The devices communicate with the I2C protocol. All sensors are set to the
|
||||
same I2C address 0x40, so an entry with I2C_BOARD_INFO("htu21", 0x40) can
|
||||
be used in the board setup code.
|
||||
|
||||
This driver does not auto-detect devices. You will have to instantiate the
|
||||
devices explicitly. Please see Documentation/i2c/instantiating-devices
|
||||
for details.
|
||||
|
||||
sysfs-Interface
|
||||
---------------
|
||||
|
||||
temp1_input - temperature input
|
||||
humidity1_input - humidity input
|
||||
|
||||
Notes
|
||||
-----
|
||||
|
||||
The driver uses the default resolution settings of 12 bit for humidity and 14
|
||||
bit for temperature, which results in typical measurement times of 11 ms for
|
||||
humidity and 44 ms for temperature. To keep self heating below 0.1 degree
|
||||
Celsius, the device should not be active for more than 10% of the time. For
|
||||
this reason, the driver performs no more than two measurements per second and
|
||||
reports cached information if polled more frequently.
|
||||
|
||||
Different resolutions, the on-chip heater, using the CRC checksum and reading
|
||||
the serial number are not supported yet.
|
||||
@ -12,6 +12,7 @@ Supported chips:
|
||||
* AMD Family 12h processors: "Llano" (E2/A4/A6/A8-Series)
|
||||
* AMD Family 14h processors: "Brazos" (C/E/G/Z-Series)
|
||||
* AMD Family 15h processors: "Bulldozer" (FX-Series), "Trinity"
|
||||
* AMD Family 16h processors: "Kabini"
|
||||
|
||||
Prefix: 'k10temp'
|
||||
Addresses scanned: PCI space
|
||||
|
||||
@ -296,8 +296,8 @@ config SENSORS_K10TEMP
|
||||
If you say yes here you get support for the temperature
|
||||
sensor(s) inside your CPU. Supported are later revisions of
|
||||
the AMD Family 10h and all revisions of the AMD Family 11h,
|
||||
12h (Llano), 14h (Brazos) and 15h (Bulldozer/Trinity)
|
||||
microarchitectures.
|
||||
12h (Llano), 14h (Brazos), 15h (Bulldozer/Trinity) and
|
||||
16h (Kabini) microarchitectures.
|
||||
|
||||
This driver can also be built as a module. If so, the module
|
||||
will be called k10temp.
|
||||
@ -511,6 +511,16 @@ config SENSORS_HIH6130
|
||||
This driver can also be built as a module. If so, the module
|
||||
will be called hih6130.
|
||||
|
||||
config SENSORS_HTU21
|
||||
tristate "Measurement Specialties HTU21D humidity/temperature sensors"
|
||||
depends on I2C
|
||||
help
|
||||
If you say yes here you get support for the Measurement Specialties
|
||||
HTU21D humidity and temperature sensors.
|
||||
|
||||
This driver can also be built as a module. If so, the module
|
||||
will be called htu21.
|
||||
|
||||
config SENSORS_CORETEMP
|
||||
tristate "Intel Core/Core2/Atom temperature sensor"
|
||||
depends on X86
|
||||
@ -1202,8 +1212,8 @@ config SENSORS_ADS1015
|
||||
tristate "Texas Instruments ADS1015"
|
||||
depends on I2C
|
||||
help
|
||||
If you say yes here you get support for Texas Instruments ADS1015
|
||||
12-bit 4-input ADC device.
|
||||
If you say yes here you get support for Texas Instruments
|
||||
ADS1015/ADS1115 12/16-bit 4-input ADC device.
|
||||
|
||||
This driver can also be built as a module. If so, the module
|
||||
will be called ads1015.
|
||||
|
||||
@ -65,6 +65,7 @@ obj-$(CONFIG_SENSORS_GL518SM) += gl518sm.o
|
||||
obj-$(CONFIG_SENSORS_GL520SM) += gl520sm.o
|
||||
obj-$(CONFIG_SENSORS_GPIO_FAN) += gpio-fan.o
|
||||
obj-$(CONFIG_SENSORS_HIH6130) += hih6130.o
|
||||
obj-$(CONFIG_SENSORS_HTU21) += htu21.o
|
||||
obj-$(CONFIG_SENSORS_ULTRA45) += ultra45_env.o
|
||||
obj-$(CONFIG_SENSORS_I5K_AMB) += i5k_amb.o
|
||||
obj-$(CONFIG_SENSORS_IBMAEM) += ibmaem.o
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* A hwmon driver for ACPI 4.0 power meters
|
||||
* Copyright (C) 2009 IBM
|
||||
*
|
||||
* Author: Darrick J. Wong <djwong@us.ibm.com>
|
||||
* Author: Darrick J. Wong <darrick.wong@oracle.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
|
||||
@ -1001,7 +1001,7 @@ static void __exit acpi_power_meter_exit(void)
|
||||
acpi_bus_unregister_driver(&acpi_power_meter_driver);
|
||||
}
|
||||
|
||||
MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>");
|
||||
MODULE_AUTHOR("Darrick J. Wong <darrick.wong@oracle.com>");
|
||||
MODULE_DESCRIPTION("ACPI 4.0 power meter driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
|
||||
@ -46,17 +46,28 @@ static const unsigned int fullscale_table[8] = {
|
||||
6144, 4096, 2048, 1024, 512, 256, 256, 256 };
|
||||
|
||||
/* Data rates in samples per second */
|
||||
static const unsigned int data_rate_table[8] = {
|
||||
128, 250, 490, 920, 1600, 2400, 3300, 3300 };
|
||||
static const unsigned int data_rate_table_1015[8] = {
|
||||
128, 250, 490, 920, 1600, 2400, 3300, 3300
|
||||
};
|
||||
|
||||
static const unsigned int data_rate_table_1115[8] = {
|
||||
8, 16, 32, 64, 128, 250, 475, 860
|
||||
};
|
||||
|
||||
#define ADS1015_DEFAULT_CHANNELS 0xff
|
||||
#define ADS1015_DEFAULT_PGA 2
|
||||
#define ADS1015_DEFAULT_DATA_RATE 4
|
||||
|
||||
enum ads1015_chips {
|
||||
ads1015,
|
||||
ads1115,
|
||||
};
|
||||
|
||||
struct ads1015_data {
|
||||
struct device *hwmon_dev;
|
||||
struct mutex update_lock; /* mutex protect updates */
|
||||
struct ads1015_channel_data channel_data[ADS1015_CHANNELS];
|
||||
enum ads1015_chips id;
|
||||
};
|
||||
|
||||
static int ads1015_read_adc(struct i2c_client *client, unsigned int channel)
|
||||
@ -66,6 +77,8 @@ static int ads1015_read_adc(struct i2c_client *client, unsigned int channel)
|
||||
unsigned int pga = data->channel_data[channel].pga;
|
||||
unsigned int data_rate = data->channel_data[channel].data_rate;
|
||||
unsigned int conversion_time_ms;
|
||||
const unsigned int * const rate_table = data->id == ads1115 ?
|
||||
data_rate_table_1115 : data_rate_table_1015;
|
||||
int res;
|
||||
|
||||
mutex_lock(&data->update_lock);
|
||||
@ -75,7 +88,7 @@ static int ads1015_read_adc(struct i2c_client *client, unsigned int channel)
|
||||
if (res < 0)
|
||||
goto err_unlock;
|
||||
config = res;
|
||||
conversion_time_ms = DIV_ROUND_UP(1000, data_rate_table[data_rate]);
|
||||
conversion_time_ms = DIV_ROUND_UP(1000, rate_table[data_rate]);
|
||||
|
||||
/* setup and start single conversion */
|
||||
config &= 0x001f;
|
||||
@ -113,8 +126,9 @@ static int ads1015_reg_to_mv(struct i2c_client *client, unsigned int channel,
|
||||
struct ads1015_data *data = i2c_get_clientdata(client);
|
||||
unsigned int pga = data->channel_data[channel].pga;
|
||||
int fullscale = fullscale_table[pga];
|
||||
const unsigned mask = data->id == ads1115 ? 0x7fff : 0x7ff0;
|
||||
|
||||
return DIV_ROUND_CLOSEST(reg * fullscale, 0x7ff0);
|
||||
return DIV_ROUND_CLOSEST(reg * fullscale, mask);
|
||||
}
|
||||
|
||||
/* sysfs callback function */
|
||||
@ -257,7 +271,7 @@ static int ads1015_probe(struct i2c_client *client,
|
||||
GFP_KERNEL);
|
||||
if (!data)
|
||||
return -ENOMEM;
|
||||
|
||||
data->id = id->driver_data;
|
||||
i2c_set_clientdata(client, data);
|
||||
mutex_init(&data->update_lock);
|
||||
|
||||
@ -286,7 +300,8 @@ exit_remove:
|
||||
}
|
||||
|
||||
static const struct i2c_device_id ads1015_id[] = {
|
||||
{ "ads1015", 0 },
|
||||
{ "ads1015", ads1015},
|
||||
{ "ads1115", ads1115},
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, ads1015_id);
|
||||
|
||||
@ -145,7 +145,7 @@ static int ads7828_remove(struct i2c_client *client)
|
||||
static int ads7828_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct ads7828_platform_data *pdata = client->dev.platform_data;
|
||||
struct ads7828_platform_data *pdata = dev_get_platdata(&client->dev);
|
||||
struct ads7828_data *data;
|
||||
int err;
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* A hwmon driver for the Analog Devices ADT7462
|
||||
* Copyright (C) 2008 IBM
|
||||
*
|
||||
* Author: Darrick J. Wong <djwong@us.ibm.com>
|
||||
* Author: Darrick J. Wong <darrick.wong@oracle.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
|
||||
@ -333,7 +333,7 @@ static int ADT7462_REG_VOLT_MAX(struct adt7462_data *data, int which)
|
||||
return 0x4C;
|
||||
break;
|
||||
}
|
||||
return -ENODEV;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ADT7462_REG_VOLT_MIN(struct adt7462_data *data, int which)
|
||||
@ -392,7 +392,7 @@ static int ADT7462_REG_VOLT_MIN(struct adt7462_data *data, int which)
|
||||
return 0x77;
|
||||
break;
|
||||
}
|
||||
return -ENODEV;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ADT7462_REG_VOLT(struct adt7462_data *data, int which)
|
||||
@ -1970,6 +1970,6 @@ static int adt7462_remove(struct i2c_client *client)
|
||||
|
||||
module_i2c_driver(adt7462_driver);
|
||||
|
||||
MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>");
|
||||
MODULE_AUTHOR("Darrick J. Wong <darrick.wong@oracle.com>");
|
||||
MODULE_DESCRIPTION("ADT7462 driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* A hwmon driver for the Analog Devices ADT7470
|
||||
* Copyright (C) 2007 IBM
|
||||
*
|
||||
* Author: Darrick J. Wong <djwong@us.ibm.com>
|
||||
* Author: Darrick J. Wong <darrick.wong@oracle.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
|
||||
@ -1314,6 +1314,6 @@ static int adt7470_remove(struct i2c_client *client)
|
||||
|
||||
module_i2c_driver(adt7470_driver);
|
||||
|
||||
MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>");
|
||||
MODULE_AUTHOR("Darrick J. Wong <darrick.wong@oracle.com>");
|
||||
MODULE_DESCRIPTION("ADT7470 driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
@ -316,6 +316,18 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
|
||||
return tjmax;
|
||||
}
|
||||
|
||||
static bool cpu_has_tjmax(struct cpuinfo_x86 *c)
|
||||
{
|
||||
u8 model = c->x86_model;
|
||||
|
||||
return model > 0xe &&
|
||||
model != 0x1c &&
|
||||
model != 0x26 &&
|
||||
model != 0x27 &&
|
||||
model != 0x35 &&
|
||||
model != 0x36;
|
||||
}
|
||||
|
||||
static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
|
||||
{
|
||||
int err;
|
||||
@ -328,7 +340,7 @@ static int get_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
|
||||
*/
|
||||
err = rdmsr_safe_on_cpu(id, MSR_IA32_TEMPERATURE_TARGET, &eax, &edx);
|
||||
if (err) {
|
||||
if (c->x86_model > 0xe && c->x86_model != 0x1c)
|
||||
if (cpu_has_tjmax(c))
|
||||
dev_warn(dev, "Unable to read TjMax from CPU %u\n", id);
|
||||
} else {
|
||||
val = (eax >> 16) & 0xff;
|
||||
|
||||
@ -77,7 +77,7 @@ struct ds620_data {
|
||||
|
||||
static void ds620_init_client(struct i2c_client *client)
|
||||
{
|
||||
struct ds620_platform_data *ds620_info = client->dev.platform_data;
|
||||
struct ds620_platform_data *ds620_info = dev_get_platdata(&client->dev);
|
||||
u16 conf, new_conf;
|
||||
|
||||
new_conf = conf =
|
||||
|
||||
@ -1375,7 +1375,7 @@ static void f71805f_init_device(struct f71805f_data *data)
|
||||
|
||||
static int f71805f_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct f71805f_sio_data *sio_data = pdev->dev.platform_data;
|
||||
struct f71805f_sio_data *sio_data = dev_get_platdata(&pdev->dev);
|
||||
struct f71805f_data *data;
|
||||
struct resource *res;
|
||||
int i, err;
|
||||
|
||||
@ -2267,7 +2267,7 @@ static int f71882fg_create_fan_sysfs_files(
|
||||
static int f71882fg_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct f71882fg_data *data;
|
||||
struct f71882fg_sio_data *sio_data = pdev->dev.platform_data;
|
||||
struct f71882fg_sio_data *sio_data = dev_get_platdata(&pdev->dev);
|
||||
int nr_fans = f71882fg_nr_fans[sio_data->type];
|
||||
int nr_temps = f71882fg_nr_temps[sio_data->type];
|
||||
int err, i;
|
||||
|
||||
@ -832,7 +832,8 @@ static int f75375_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct f75375_data *data;
|
||||
struct f75375s_platform_data *f75375s_pdata = client->dev.platform_data;
|
||||
struct f75375s_platform_data *f75375s_pdata =
|
||||
dev_get_platdata(&client->dev);
|
||||
int err;
|
||||
|
||||
if (!i2c_check_functionality(client->adapter,
|
||||
|
||||
@ -717,7 +717,7 @@ static void g762_of_clock_disable(struct i2c_client *client) { }
|
||||
|
||||
static int g762_pdata_prop_import(struct i2c_client *client)
|
||||
{
|
||||
struct g762_platform_data *pdata = client->dev.platform_data;
|
||||
struct g762_platform_data *pdata = dev_get_platdata(&client->dev);
|
||||
int ret;
|
||||
|
||||
if (!pdata)
|
||||
|
||||
@ -495,7 +495,7 @@ static int gpio_fan_probe(struct platform_device *pdev)
|
||||
{
|
||||
int err;
|
||||
struct gpio_fan_data *fan_data;
|
||||
struct gpio_fan_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct gpio_fan_platform_data *pdata = dev_get_platdata(&pdev->dev);
|
||||
|
||||
#ifdef CONFIG_OF_GPIO
|
||||
if (!pdata) {
|
||||
|
||||
199
drivers/hwmon/htu21.c
Normal file
199
drivers/hwmon/htu21.c
Normal file
@ -0,0 +1,199 @@
|
||||
/*
|
||||
* Measurement Specialties HTU21D humidity and temperature sensor driver
|
||||
*
|
||||
* Copyright (C) 2013 William Markezana <william.markezana@meas-spec.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.
|
||||
*
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
#include <linux/init.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/hwmon.h>
|
||||
#include <linux/hwmon-sysfs.h>
|
||||
#include <linux/err.h>
|
||||
#include <linux/mutex.h>
|
||||
#include <linux/device.h>
|
||||
#include <linux/jiffies.h>
|
||||
|
||||
/* HTU21 Commands */
|
||||
#define HTU21_T_MEASUREMENT_HM 0xE3
|
||||
#define HTU21_RH_MEASUREMENT_HM 0xE5
|
||||
|
||||
struct htu21 {
|
||||
struct device *hwmon_dev;
|
||||
struct mutex lock;
|
||||
bool valid;
|
||||
unsigned long last_update;
|
||||
int temperature;
|
||||
int humidity;
|
||||
};
|
||||
|
||||
static inline int htu21_temp_ticks_to_millicelsius(int ticks)
|
||||
{
|
||||
ticks &= ~0x0003; /* clear status bits */
|
||||
/*
|
||||
* Formula T = -46.85 + 175.72 * ST / 2^16 from datasheet p14,
|
||||
* optimized for integer fixed point (3 digits) arithmetic
|
||||
*/
|
||||
return ((21965 * ticks) >> 13) - 46850;
|
||||
}
|
||||
|
||||
static inline int htu21_rh_ticks_to_per_cent_mille(int ticks)
|
||||
{
|
||||
ticks &= ~0x0003; /* clear status bits */
|
||||
/*
|
||||
* Formula RH = -6 + 125 * SRH / 2^16 from datasheet p14,
|
||||
* optimized for integer fixed point (3 digits) arithmetic
|
||||
*/
|
||||
return ((15625 * ticks) >> 13) - 6000;
|
||||
}
|
||||
|
||||
static int htu21_update_measurements(struct i2c_client *client)
|
||||
{
|
||||
int ret = 0;
|
||||
struct htu21 *htu21 = i2c_get_clientdata(client);
|
||||
|
||||
mutex_lock(&htu21->lock);
|
||||
|
||||
if (time_after(jiffies, htu21->last_update + HZ / 2) ||
|
||||
!htu21->valid) {
|
||||
ret = i2c_smbus_read_word_swapped(client,
|
||||
HTU21_T_MEASUREMENT_HM);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
htu21->temperature = htu21_temp_ticks_to_millicelsius(ret);
|
||||
ret = i2c_smbus_read_word_swapped(client,
|
||||
HTU21_RH_MEASUREMENT_HM);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
htu21->humidity = htu21_rh_ticks_to_per_cent_mille(ret);
|
||||
htu21->last_update = jiffies;
|
||||
htu21->valid = true;
|
||||
}
|
||||
out:
|
||||
mutex_unlock(&htu21->lock);
|
||||
|
||||
return ret >= 0 ? 0 : ret;
|
||||
}
|
||||
|
||||
static ssize_t htu21_show_temperature(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct i2c_client *client = to_i2c_client(dev);
|
||||
struct htu21 *htu21 = i2c_get_clientdata(client);
|
||||
int ret = htu21_update_measurements(client);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
return sprintf(buf, "%d\n", htu21->temperature);
|
||||
}
|
||||
|
||||
static ssize_t htu21_show_humidity(struct device *dev,
|
||||
struct device_attribute *attr, char *buf)
|
||||
{
|
||||
struct i2c_client *client = to_i2c_client(dev);
|
||||
struct htu21 *htu21 = i2c_get_clientdata(client);
|
||||
int ret = htu21_update_measurements(client);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
return sprintf(buf, "%d\n", htu21->humidity);
|
||||
}
|
||||
|
||||
static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO,
|
||||
htu21_show_temperature, NULL, 0);
|
||||
static SENSOR_DEVICE_ATTR(humidity1_input, S_IRUGO,
|
||||
htu21_show_humidity, NULL, 0);
|
||||
|
||||
static struct attribute *htu21_attributes[] = {
|
||||
&sensor_dev_attr_temp1_input.dev_attr.attr,
|
||||
&sensor_dev_attr_humidity1_input.dev_attr.attr,
|
||||
NULL
|
||||
};
|
||||
|
||||
static const struct attribute_group htu21_group = {
|
||||
.attrs = htu21_attributes,
|
||||
};
|
||||
|
||||
static int htu21_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct htu21 *htu21;
|
||||
int err;
|
||||
|
||||
if (!i2c_check_functionality(client->adapter,
|
||||
I2C_FUNC_SMBUS_READ_WORD_DATA)) {
|
||||
dev_err(&client->dev,
|
||||
"adapter does not support SMBus word transactions\n");
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
htu21 = devm_kzalloc(&client->dev, sizeof(*htu21), GFP_KERNEL);
|
||||
if (!htu21)
|
||||
return -ENOMEM;
|
||||
|
||||
i2c_set_clientdata(client, htu21);
|
||||
|
||||
mutex_init(&htu21->lock);
|
||||
|
||||
err = sysfs_create_group(&client->dev.kobj, &htu21_group);
|
||||
if (err) {
|
||||
dev_dbg(&client->dev, "could not create sysfs files\n");
|
||||
return err;
|
||||
}
|
||||
htu21->hwmon_dev = hwmon_device_register(&client->dev);
|
||||
if (IS_ERR(htu21->hwmon_dev)) {
|
||||
dev_dbg(&client->dev, "unable to register hwmon device\n");
|
||||
err = PTR_ERR(htu21->hwmon_dev);
|
||||
goto error;
|
||||
}
|
||||
|
||||
dev_info(&client->dev, "initialized\n");
|
||||
|
||||
return 0;
|
||||
|
||||
error:
|
||||
sysfs_remove_group(&client->dev.kobj, &htu21_group);
|
||||
return err;
|
||||
}
|
||||
|
||||
static int htu21_remove(struct i2c_client *client)
|
||||
{
|
||||
struct htu21 *htu21 = i2c_get_clientdata(client);
|
||||
|
||||
hwmon_device_unregister(htu21->hwmon_dev);
|
||||
sysfs_remove_group(&client->dev.kobj, &htu21_group);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct i2c_device_id htu21_id[] = {
|
||||
{ "htu21", 0 },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, htu21_id);
|
||||
|
||||
static struct i2c_driver htu21_driver = {
|
||||
.class = I2C_CLASS_HWMON,
|
||||
.driver = {
|
||||
.name = "htu21",
|
||||
},
|
||||
.probe = htu21_probe,
|
||||
.remove = htu21_remove,
|
||||
.id_table = htu21_id,
|
||||
};
|
||||
|
||||
module_i2c_driver(htu21_driver);
|
||||
|
||||
MODULE_AUTHOR("William Markezana <william.markezana@meas-spec.com>");
|
||||
MODULE_DESCRIPTION("MEAS HTU21D humidity and temperature sensor driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
@ -3,7 +3,7 @@
|
||||
* temperature sensors
|
||||
* Copyright (C) 2007 IBM
|
||||
*
|
||||
* Author: Darrick J. Wong <djwong@us.ibm.com>
|
||||
* Author: Darrick J. Wong <darrick.wong@oracle.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
|
||||
@ -609,7 +609,7 @@ static void __exit i5k_amb_exit(void)
|
||||
platform_driver_unregister(&i5k_amb_driver);
|
||||
}
|
||||
|
||||
MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>");
|
||||
MODULE_AUTHOR("Darrick J. Wong <darrick.wong@oracle.com>");
|
||||
MODULE_DESCRIPTION("Intel 5000 chipset FB-DIMM AMB temperature sensor");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* temperature/power/energy sensors and capping functionality.
|
||||
* Copyright (C) 2008 IBM
|
||||
*
|
||||
* Author: Darrick J. Wong <djwong@us.ibm.com>
|
||||
* Author: Darrick J. Wong <darrick.wong@oracle.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
|
||||
@ -1103,7 +1103,7 @@ static void __exit aem_exit(void)
|
||||
aem_delete(p1);
|
||||
}
|
||||
|
||||
MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>");
|
||||
MODULE_AUTHOR("Darrick J. Wong <darrick.wong@oracle.com>");
|
||||
MODULE_DESCRIPTION("IBM AEM power/temp/energy sensor driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* A hwmon driver for the IBM PowerExecutive temperature/power sensors
|
||||
* Copyright (C) 2007 IBM
|
||||
*
|
||||
* Author: Darrick J. Wong <djwong@us.ibm.com>
|
||||
* Author: Darrick J. Wong <darrick.wong@oracle.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
|
||||
@ -606,7 +606,7 @@ static void __exit ibmpex_exit(void)
|
||||
ibmpex_bmc_delete(p);
|
||||
}
|
||||
|
||||
MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>");
|
||||
MODULE_AUTHOR("Darrick J. Wong <darrick.wong@oracle.com>");
|
||||
MODULE_DESCRIPTION("IBM PowerExecutive power/temperature sensor driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
|
||||
@ -232,9 +232,9 @@ static int ina2xx_probe(struct i2c_client *client,
|
||||
if (!data)
|
||||
return -ENOMEM;
|
||||
|
||||
if (client->dev.platform_data) {
|
||||
if (dev_get_platdata(&client->dev)) {
|
||||
pdata =
|
||||
(struct ina2xx_platform_data *)client->dev.platform_data;
|
||||
(struct ina2xx_platform_data *)dev_get_platdata(&client->dev);
|
||||
shunt = pdata->shunt_uohms;
|
||||
} else if (!of_property_read_u32(client->dev.of_node,
|
||||
"shunt-resistor", &val)) {
|
||||
|
||||
@ -1962,7 +1962,7 @@ exit:
|
||||
static void it87_remove_files(struct device *dev)
|
||||
{
|
||||
struct it87_data *data = platform_get_drvdata(pdev);
|
||||
struct it87_sio_data *sio_data = dev->platform_data;
|
||||
struct it87_sio_data *sio_data = dev_get_platdata(dev);
|
||||
int i;
|
||||
|
||||
sysfs_remove_group(&dev->kobj, &it87_group);
|
||||
@ -2014,7 +2014,7 @@ static int it87_probe(struct platform_device *pdev)
|
||||
struct it87_data *data;
|
||||
struct resource *res;
|
||||
struct device *dev = &pdev->dev;
|
||||
struct it87_sio_data *sio_data = dev->platform_data;
|
||||
struct it87_sio_data *sio_data = dev_get_platdata(dev);
|
||||
int err = 0, i;
|
||||
int enable_pwm_interface;
|
||||
int fan_beep_need_rw;
|
||||
@ -2316,7 +2316,7 @@ static int it87_check_pwm(struct device *dev)
|
||||
/* Called when we have found a new IT87. */
|
||||
static void it87_init_device(struct platform_device *pdev)
|
||||
{
|
||||
struct it87_sio_data *sio_data = pdev->dev.platform_data;
|
||||
struct it87_sio_data *sio_data = dev_get_platdata(&pdev->dev);
|
||||
struct it87_data *data = platform_get_drvdata(pdev);
|
||||
int tmp, i;
|
||||
u8 mask;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* k10temp.c - AMD Family 10h/11h/12h/14h/15h processor hardware monitoring
|
||||
* k10temp.c - AMD Family 10h/11h/12h/14h/15h/16h processor hardware monitoring
|
||||
*
|
||||
* Copyright (c) 2009 Clemens Ladisch <clemens@ladisch.de>
|
||||
*
|
||||
@ -211,6 +211,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = {
|
||||
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },
|
||||
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
|
||||
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
|
||||
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
|
||||
{}
|
||||
};
|
||||
MODULE_DEVICE_TABLE(pci, k10temp_id_table);
|
||||
|
||||
@ -855,8 +855,8 @@ static void lm87_init_client(struct i2c_client *client)
|
||||
{
|
||||
struct lm87_data *data = i2c_get_clientdata(client);
|
||||
|
||||
if (client->dev.platform_data) {
|
||||
data->channel = *(u8 *)client->dev.platform_data;
|
||||
if (dev_get_platdata(&client->dev)) {
|
||||
data->channel = *(u8 *)dev_get_platdata(&client->dev);
|
||||
lm87_write_value(client,
|
||||
LM87_REG_CHANNEL_MODE, data->channel);
|
||||
} else {
|
||||
|
||||
@ -261,7 +261,7 @@ static int max197_probe(struct platform_device *pdev)
|
||||
{
|
||||
int ch, ret;
|
||||
struct max197_data *data;
|
||||
struct max197_platform_data *pdata = pdev->dev.platform_data;
|
||||
struct max197_platform_data *pdata = dev_get_platdata(&pdev->dev);
|
||||
enum max197_chips chip = platform_get_device_id(pdev)->driver_data;
|
||||
|
||||
if (pdata == NULL) {
|
||||
|
||||
@ -428,7 +428,7 @@ static int max6639_init_client(struct i2c_client *client)
|
||||
{
|
||||
struct max6639_data *data = i2c_get_clientdata(client);
|
||||
struct max6639_platform_data *max6639_info =
|
||||
client->dev.platform_data;
|
||||
dev_get_platdata(&client->dev);
|
||||
int i;
|
||||
int rpm_range = 1; /* default: 4000 RPM */
|
||||
int err;
|
||||
|
||||
@ -143,12 +143,13 @@ static int mcp3021_probe(struct i2c_client *client,
|
||||
break;
|
||||
}
|
||||
|
||||
if (client->dev.platform_data) {
|
||||
data->vdd = *(u32 *)client->dev.platform_data;
|
||||
if (dev_get_platdata(&client->dev)) {
|
||||
data->vdd = *(u32 *)dev_get_platdata(&client->dev);
|
||||
if (data->vdd > MCP3021_VDD_MAX || data->vdd < MCP3021_VDD_MIN)
|
||||
return -EINVAL;
|
||||
} else
|
||||
} else {
|
||||
data->vdd = MCP3021_VDD_REF;
|
||||
}
|
||||
|
||||
err = sysfs_create_file(&client->dev.kobj, &dev_attr_in0_input.attr);
|
||||
if (err)
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -424,7 +424,7 @@ static int ntc_thermistor_probe(struct platform_device *pdev)
|
||||
if (IS_ERR(pdata))
|
||||
return PTR_ERR(pdata);
|
||||
else if (pdata == NULL)
|
||||
pdata = pdev->dev.platform_data;
|
||||
pdata = dev_get_platdata(&pdev->dev);
|
||||
|
||||
if (!pdata) {
|
||||
dev_err(&pdev->dev, "No platform init data supplied.\n");
|
||||
|
||||
@ -983,7 +983,7 @@ static int pc87427_request_regions(struct platform_device *pdev,
|
||||
|
||||
static void pc87427_init_device(struct device *dev)
|
||||
{
|
||||
struct pc87427_sio_data *sio_data = dev->platform_data;
|
||||
struct pc87427_sio_data *sio_data = dev_get_platdata(dev);
|
||||
struct pc87427_data *data = dev_get_drvdata(dev);
|
||||
int i;
|
||||
u8 reg;
|
||||
@ -1075,7 +1075,7 @@ static void pc87427_remove_files(struct device *dev)
|
||||
|
||||
static int pc87427_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct pc87427_sio_data *sio_data = pdev->dev.platform_data;
|
||||
struct pc87427_sio_data *sio_data = dev_get_platdata(&pdev->dev);
|
||||
struct pc87427_data *data;
|
||||
int i, err, res_count;
|
||||
|
||||
|
||||
@ -1726,7 +1726,7 @@ int pmbus_do_probe(struct i2c_client *client, const struct i2c_device_id *id,
|
||||
struct pmbus_driver_info *info)
|
||||
{
|
||||
struct device *dev = &client->dev;
|
||||
const struct pmbus_platform_data *pdata = dev->platform_data;
|
||||
const struct pmbus_platform_data *pdata = dev_get_platdata(dev);
|
||||
struct pmbus_data *data;
|
||||
int ret;
|
||||
|
||||
|
||||
@ -165,7 +165,7 @@ static ssize_t s3c_hwmon_ch_show(struct device *dev,
|
||||
{
|
||||
struct sensor_device_attribute *sen_attr = to_sensor_dev_attr(attr);
|
||||
struct s3c_hwmon *hwmon = platform_get_drvdata(to_platform_device(dev));
|
||||
struct s3c_hwmon_pdata *pdata = dev->platform_data;
|
||||
struct s3c_hwmon_pdata *pdata = dev_get_platdata(dev);
|
||||
struct s3c_hwmon_chcfg *cfg;
|
||||
int ret;
|
||||
|
||||
@ -194,7 +194,7 @@ static ssize_t s3c_hwmon_label_show(struct device *dev,
|
||||
char *buf)
|
||||
{
|
||||
struct sensor_device_attribute *sen_attr = to_sensor_dev_attr(attr);
|
||||
struct s3c_hwmon_pdata *pdata = dev->platform_data;
|
||||
struct s3c_hwmon_pdata *pdata = dev_get_platdata(dev);
|
||||
struct s3c_hwmon_chcfg *cfg;
|
||||
|
||||
cfg = pdata->in[sen_attr->index];
|
||||
@ -274,7 +274,7 @@ static void s3c_hwmon_remove_attr(struct device *dev,
|
||||
*/
|
||||
static int s3c_hwmon_probe(struct platform_device *dev)
|
||||
{
|
||||
struct s3c_hwmon_pdata *pdata = dev->dev.platform_data;
|
||||
struct s3c_hwmon_pdata *pdata = dev_get_platdata(&dev->dev);
|
||||
struct s3c_hwmon *hwmon;
|
||||
int ret = 0;
|
||||
int i;
|
||||
|
||||
@ -940,11 +940,11 @@ static int sht15_probe(struct platform_device *pdev)
|
||||
data->dev = &pdev->dev;
|
||||
init_waitqueue_head(&data->wait_queue);
|
||||
|
||||
if (pdev->dev.platform_data == NULL) {
|
||||
if (dev_get_platdata(&pdev->dev) == NULL) {
|
||||
dev_err(&pdev->dev, "no platform data supplied\n");
|
||||
return -EINVAL;
|
||||
}
|
||||
data->pdata = pdev->dev.platform_data;
|
||||
data->pdata = dev_get_platdata(&pdev->dev);
|
||||
data->supply_uv = data->pdata->supply_mv * 1000;
|
||||
if (data->pdata->checksum)
|
||||
data->checksumming = true;
|
||||
|
||||
@ -668,7 +668,7 @@ static void smsc47m1_remove_files(struct device *dev)
|
||||
static int __init smsc47m1_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct smsc47m1_sio_data *sio_data = dev->platform_data;
|
||||
struct smsc47m1_sio_data *sio_data = dev_get_platdata(dev);
|
||||
struct smsc47m1_data *data;
|
||||
struct resource *res;
|
||||
int err;
|
||||
@ -940,7 +940,7 @@ exit_device:
|
||||
static void __exit sm_smsc47m1_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&smsc47m1_driver);
|
||||
smsc47m1_restore(pdev->dev.platform_data);
|
||||
smsc47m1_restore(dev_get_platdata(&pdev->dev));
|
||||
platform_device_unregister(pdev);
|
||||
}
|
||||
|
||||
|
||||
@ -673,7 +673,7 @@ static void w83627ehf_write_fan_div(struct w83627ehf_data *data, int nr)
|
||||
static void w83627ehf_write_fan_div_common(struct device *dev,
|
||||
struct w83627ehf_data *data, int nr)
|
||||
{
|
||||
struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
||||
struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
||||
|
||||
if (sio_data->kind == nct6776)
|
||||
; /* no dividers, do nothing */
|
||||
@ -724,7 +724,7 @@ static void w83627ehf_update_fan_div(struct w83627ehf_data *data)
|
||||
static void w83627ehf_update_fan_div_common(struct device *dev,
|
||||
struct w83627ehf_data *data)
|
||||
{
|
||||
struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
||||
struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
||||
|
||||
if (sio_data->kind == nct6776)
|
||||
; /* no dividers, do nothing */
|
||||
@ -781,7 +781,7 @@ static void w83627ehf_update_pwm(struct w83627ehf_data *data)
|
||||
static void w83627ehf_update_pwm_common(struct device *dev,
|
||||
struct w83627ehf_data *data)
|
||||
{
|
||||
struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
||||
struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
||||
|
||||
if (sio_data->kind == nct6775 || sio_data->kind == nct6776)
|
||||
nct6775_update_pwm(data);
|
||||
@ -792,7 +792,7 @@ static void w83627ehf_update_pwm_common(struct device *dev,
|
||||
static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
|
||||
{
|
||||
struct w83627ehf_data *data = dev_get_drvdata(dev);
|
||||
struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
||||
struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
||||
|
||||
int i;
|
||||
|
||||
@ -1392,7 +1392,7 @@ store_pwm_mode(struct device *dev, struct device_attribute *attr,
|
||||
{
|
||||
struct w83627ehf_data *data = dev_get_drvdata(dev);
|
||||
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
|
||||
struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
||||
struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
||||
int nr = sensor_attr->index;
|
||||
unsigned long val;
|
||||
int err;
|
||||
@ -1448,7 +1448,7 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
struct w83627ehf_data *data = dev_get_drvdata(dev);
|
||||
struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
||||
struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
||||
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
|
||||
int nr = sensor_attr->index;
|
||||
unsigned long val;
|
||||
@ -1527,7 +1527,7 @@ store_tolerance(struct device *dev, struct device_attribute *attr,
|
||||
const char *buf, size_t count)
|
||||
{
|
||||
struct w83627ehf_data *data = dev_get_drvdata(dev);
|
||||
struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
||||
struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
||||
struct sensor_device_attribute *sensor_attr = to_sensor_dev_attr(attr);
|
||||
int nr = sensor_attr->index;
|
||||
u16 reg;
|
||||
@ -2065,7 +2065,7 @@ w83627ehf_check_fan_inputs(const struct w83627ehf_sio_data *sio_data,
|
||||
static int w83627ehf_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
||||
struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
||||
struct w83627ehf_data *data;
|
||||
struct resource *res;
|
||||
u8 en_vrm10;
|
||||
@ -2618,7 +2618,7 @@ static int w83627ehf_remove(struct platform_device *pdev)
|
||||
static int w83627ehf_suspend(struct device *dev)
|
||||
{
|
||||
struct w83627ehf_data *data = w83627ehf_update_device(dev);
|
||||
struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
||||
struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
||||
|
||||
mutex_lock(&data->update_lock);
|
||||
data->vbat = w83627ehf_read_value(data, W83627EHF_REG_VBAT);
|
||||
@ -2634,7 +2634,7 @@ static int w83627ehf_suspend(struct device *dev)
|
||||
static int w83627ehf_resume(struct device *dev)
|
||||
{
|
||||
struct w83627ehf_data *data = dev_get_drvdata(dev);
|
||||
struct w83627ehf_sio_data *sio_data = dev->platform_data;
|
||||
struct w83627ehf_sio_data *sio_data = dev_get_platdata(dev);
|
||||
int i;
|
||||
|
||||
mutex_lock(&data->update_lock);
|
||||
@ -2694,6 +2694,8 @@ static int w83627ehf_resume(struct device *dev)
|
||||
static const struct dev_pm_ops w83627ehf_dev_pm_ops = {
|
||||
.suspend = w83627ehf_suspend,
|
||||
.resume = w83627ehf_resume,
|
||||
.freeze = w83627ehf_suspend,
|
||||
.restore = w83627ehf_resume,
|
||||
};
|
||||
|
||||
#define W83627EHF_DEV_PM_OPS (&w83627ehf_dev_pm_ops)
|
||||
|
||||
@ -1415,7 +1415,7 @@ static const struct attribute_group w83627hf_group_opt = {
|
||||
static int w83627hf_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct device *dev = &pdev->dev;
|
||||
struct w83627hf_sio_data *sio_data = dev->platform_data;
|
||||
struct w83627hf_sio_data *sio_data = dev_get_platdata(dev);
|
||||
struct w83627hf_data *data;
|
||||
struct resource *res;
|
||||
int err, i;
|
||||
@ -1636,7 +1636,7 @@ static int w83627hf_read_value(struct w83627hf_data *data, u16 reg)
|
||||
|
||||
static int w83627thf_read_gpio5(struct platform_device *pdev)
|
||||
{
|
||||
struct w83627hf_sio_data *sio_data = pdev->dev.platform_data;
|
||||
struct w83627hf_sio_data *sio_data = dev_get_platdata(&pdev->dev);
|
||||
int res = 0xff, sel;
|
||||
|
||||
superio_enter(sio_data);
|
||||
@ -1669,7 +1669,7 @@ exit:
|
||||
|
||||
static int w83687thf_read_vid(struct platform_device *pdev)
|
||||
{
|
||||
struct w83627hf_sio_data *sio_data = pdev->dev.platform_data;
|
||||
struct w83627hf_sio_data *sio_data = dev_get_platdata(&pdev->dev);
|
||||
int res = 0xff;
|
||||
|
||||
superio_enter(sio_data);
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
* A driver for the Integrated Circuits ICS932S401
|
||||
* Copyright (C) 2008 IBM
|
||||
*
|
||||
* Author: Darrick J. Wong <djwong@us.ibm.com>
|
||||
* Author: Darrick J. Wong <darrick.wong@oracle.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
|
||||
@ -482,7 +482,7 @@ static int ics932s401_remove(struct i2c_client *client)
|
||||
|
||||
module_i2c_driver(ics932s401_driver);
|
||||
|
||||
MODULE_AUTHOR("Darrick J. Wong <djwong@us.ibm.com>");
|
||||
MODULE_AUTHOR("Darrick J. Wong <darrick.wong@oracle.com>");
|
||||
MODULE_DESCRIPTION("ICS932S401 driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user