Commit 303760b4 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman

[PATCH] hwmon: hwmon vs i2c, second round (07/11)

The only part left in i2c-sensor is the VRM/VRD/VID handling code.
This is in no way related to i2c, so it doesn't belong there. Move
the code to hwmon, where it belongs.

Note that not all hardware monitoring drivers do VRM/VRD/VID
operations, so less drivers depend on hwmon-vid than there were
depending on i2c-sensor.
Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f4b50261
...@@ -23,7 +23,9 @@ Technical changes: ...@@ -23,7 +23,9 @@ Technical changes:
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-vid.h> /* if you need VRM support */ #include <linux/hwmon.h> /* for hardware monitoring drivers */
#include <linux/hwmon-sysfs.h>
#include <linux/hwmon-vid.h> /* if you need VRM support */
#include <asm/io.h> /* if you have I/O operations */ #include <asm/io.h> /* if you have I/O operations */
Please respect this inclusion order. Some extra headers may be Please respect this inclusion order. Some extra headers may be
required for a given driver (e.g. "lm75.h"). required for a given driver (e.g. "lm75.h").
......
...@@ -19,10 +19,13 @@ config HWMON ...@@ -19,10 +19,13 @@ config HWMON
This support can also be built as a module. If so, the module This support can also be built as a module. If so, the module
will be called hwmon. will be called hwmon.
config HWMON_VID
tristate
default n
config SENSORS_ADM1021 config SENSORS_ADM1021
tristate "Analog Devices ADM1021 and compatibles" tristate "Analog Devices ADM1021 and compatibles"
depends on HWMON && I2C depends on HWMON && I2C
select I2C_SENSOR
help help
If you say yes here you get support for Analog Devices ADM1021 If you say yes here you get support for Analog Devices ADM1021
and ADM1023 sensor chips and clones: Maxim MAX1617 and MAX1617A, and ADM1023 sensor chips and clones: Maxim MAX1617 and MAX1617A,
...@@ -35,7 +38,7 @@ config SENSORS_ADM1021 ...@@ -35,7 +38,7 @@ config SENSORS_ADM1021
config SENSORS_ADM1025 config SENSORS_ADM1025
tristate "Analog Devices ADM1025 and compatibles" tristate "Analog Devices ADM1025 and compatibles"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR select HWMON_VID
help help
If you say yes here you get support for Analog Devices ADM1025 If you say yes here you get support for Analog Devices ADM1025
and Philips NE1619 sensor chips. and Philips NE1619 sensor chips.
...@@ -46,7 +49,7 @@ config SENSORS_ADM1025 ...@@ -46,7 +49,7 @@ config SENSORS_ADM1025
config SENSORS_ADM1026 config SENSORS_ADM1026
tristate "Analog Devices ADM1026 and compatibles" tristate "Analog Devices ADM1026 and compatibles"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR select HWMON_VID
help help
If you say yes here you get support for Analog Devices ADM1026 If you say yes here you get support for Analog Devices ADM1026
sensor chip. sensor chip.
...@@ -57,7 +60,6 @@ config SENSORS_ADM1026 ...@@ -57,7 +60,6 @@ config SENSORS_ADM1026
config SENSORS_ADM1031 config SENSORS_ADM1031
tristate "Analog Devices ADM1031 and compatibles" tristate "Analog Devices ADM1031 and compatibles"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for Analog Devices ADM1031 If you say yes here you get support for Analog Devices ADM1031
and ADM1030 sensor chips. and ADM1030 sensor chips.
...@@ -68,7 +70,7 @@ config SENSORS_ADM1031 ...@@ -68,7 +70,7 @@ config SENSORS_ADM1031
config SENSORS_ADM9240 config SENSORS_ADM9240
tristate "Analog Devices ADM9240 and compatibles" tristate "Analog Devices ADM9240 and compatibles"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR select HWMON_VID
help help
If you say yes here you get support for Analog Devices ADM9240, If you say yes here you get support for Analog Devices ADM9240,
Dallas DS1780, National Semiconductor LM81 sensor chips. Dallas DS1780, National Semiconductor LM81 sensor chips.
...@@ -79,7 +81,7 @@ config SENSORS_ADM9240 ...@@ -79,7 +81,7 @@ config SENSORS_ADM9240
config SENSORS_ASB100 config SENSORS_ASB100
tristate "Asus ASB100 Bach" tristate "Asus ASB100 Bach"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR select HWMON_VID
help help
If you say yes here you get support for the ASB100 Bach sensor If you say yes here you get support for the ASB100 Bach sensor
chip found on some Asus mainboards. chip found on some Asus mainboards.
...@@ -90,7 +92,7 @@ config SENSORS_ASB100 ...@@ -90,7 +92,7 @@ config SENSORS_ASB100
config SENSORS_ATXP1 config SENSORS_ATXP1
tristate "Attansic ATXP1 VID controller" tristate "Attansic ATXP1 VID controller"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR select HWMON_VID
help help
If you say yes here you get support for the Attansic ATXP1 VID If you say yes here you get support for the Attansic ATXP1 VID
controller. controller.
...@@ -104,7 +106,6 @@ config SENSORS_ATXP1 ...@@ -104,7 +106,6 @@ config SENSORS_ATXP1
config SENSORS_DS1621 config SENSORS_DS1621
tristate "Dallas Semiconductor DS1621 and DS1625" tristate "Dallas Semiconductor DS1621 and DS1625"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for Dallas Semiconductor If you say yes here you get support for Dallas Semiconductor
DS1621 and DS1625 sensor chips. DS1621 and DS1625 sensor chips.
...@@ -115,7 +116,6 @@ config SENSORS_DS1621 ...@@ -115,7 +116,6 @@ config SENSORS_DS1621
config SENSORS_FSCHER config SENSORS_FSCHER
tristate "FSC Hermes" tristate "FSC Hermes"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for Fujitsu Siemens If you say yes here you get support for Fujitsu Siemens
Computers Hermes sensor chips. Computers Hermes sensor chips.
...@@ -126,7 +126,6 @@ config SENSORS_FSCHER ...@@ -126,7 +126,6 @@ config SENSORS_FSCHER
config SENSORS_FSCPOS config SENSORS_FSCPOS
tristate "FSC Poseidon" tristate "FSC Poseidon"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for Fujitsu Siemens If you say yes here you get support for Fujitsu Siemens
Computers Poseidon sensor chips. Computers Poseidon sensor chips.
...@@ -137,7 +136,6 @@ config SENSORS_FSCPOS ...@@ -137,7 +136,6 @@ config SENSORS_FSCPOS
config SENSORS_GL518SM config SENSORS_GL518SM
tristate "Genesys Logic GL518SM" tristate "Genesys Logic GL518SM"
depends on HWMON && I2C depends on HWMON && I2C
select I2C_SENSOR
help help
If you say yes here you get support for Genesys Logic GL518SM If you say yes here you get support for Genesys Logic GL518SM
sensor chips. sensor chips.
...@@ -148,7 +146,7 @@ config SENSORS_GL518SM ...@@ -148,7 +146,7 @@ config SENSORS_GL518SM
config SENSORS_GL520SM config SENSORS_GL520SM
tristate "Genesys Logic GL520SM" tristate "Genesys Logic GL520SM"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR select HWMON_VID
help help
If you say yes here you get support for Genesys Logic GL520SM If you say yes here you get support for Genesys Logic GL520SM
sensor chips. sensor chips.
...@@ -159,8 +157,8 @@ config SENSORS_GL520SM ...@@ -159,8 +157,8 @@ config SENSORS_GL520SM
config SENSORS_IT87 config SENSORS_IT87
tristate "ITE IT87xx and compatibles" tristate "ITE IT87xx and compatibles"
depends on HWMON && I2C depends on HWMON && I2C
select I2C_SENSOR
select I2C_ISA select I2C_ISA
select HWMON_VID
help help
If you say yes here you get support for ITE IT87xx sensor chips If you say yes here you get support for ITE IT87xx sensor chips
and clones: SiS960. and clones: SiS960.
...@@ -171,7 +169,6 @@ config SENSORS_IT87 ...@@ -171,7 +169,6 @@ config SENSORS_IT87
config SENSORS_LM63 config SENSORS_LM63
tristate "National Semiconductor LM63" tristate "National Semiconductor LM63"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for the National Semiconductor If you say yes here you get support for the National Semiconductor
LM63 remote diode digital temperature sensor with integrated fan LM63 remote diode digital temperature sensor with integrated fan
...@@ -184,7 +181,6 @@ config SENSORS_LM63 ...@@ -184,7 +181,6 @@ config SENSORS_LM63
config SENSORS_LM75 config SENSORS_LM75
tristate "National Semiconductor LM75 and compatibles" tristate "National Semiconductor LM75 and compatibles"
depends on HWMON && I2C depends on HWMON && I2C
select I2C_SENSOR
help help
If you say yes here you get support for National Semiconductor LM75 If you say yes here you get support for National Semiconductor LM75
sensor chips and clones: Dallas Semiconductor DS75 and DS1775 (in sensor chips and clones: Dallas Semiconductor DS75 and DS1775 (in
...@@ -200,7 +196,6 @@ config SENSORS_LM75 ...@@ -200,7 +196,6 @@ config SENSORS_LM75
config SENSORS_LM77 config SENSORS_LM77
tristate "National Semiconductor LM77" tristate "National Semiconductor LM77"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for National Semiconductor LM77 If you say yes here you get support for National Semiconductor LM77
sensor chips. sensor chips.
...@@ -211,7 +206,6 @@ config SENSORS_LM77 ...@@ -211,7 +206,6 @@ config SENSORS_LM77
config SENSORS_LM78 config SENSORS_LM78
tristate "National Semiconductor LM78 and compatibles" tristate "National Semiconductor LM78 and compatibles"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
select I2C_ISA select I2C_ISA
help help
If you say yes here you get support for National Semiconductor LM78, If you say yes here you get support for National Semiconductor LM78,
...@@ -223,7 +217,6 @@ config SENSORS_LM78 ...@@ -223,7 +217,6 @@ config SENSORS_LM78
config SENSORS_LM80 config SENSORS_LM80
tristate "National Semiconductor LM80" tristate "National Semiconductor LM80"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for National Semiconductor If you say yes here you get support for National Semiconductor
LM80 sensor chips. LM80 sensor chips.
...@@ -234,7 +227,6 @@ config SENSORS_LM80 ...@@ -234,7 +227,6 @@ config SENSORS_LM80
config SENSORS_LM83 config SENSORS_LM83
tristate "National Semiconductor LM83" tristate "National Semiconductor LM83"
depends on HWMON && I2C depends on HWMON && I2C
select I2C_SENSOR
help help
If you say yes here you get support for National Semiconductor If you say yes here you get support for National Semiconductor
LM83 sensor chips. LM83 sensor chips.
...@@ -245,7 +237,7 @@ config SENSORS_LM83 ...@@ -245,7 +237,7 @@ config SENSORS_LM83
config SENSORS_LM85 config SENSORS_LM85
tristate "National Semiconductor LM85 and compatibles" tristate "National Semiconductor LM85 and compatibles"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR select HWMON_VID
help help
If you say yes here you get support for National Semiconductor LM85 If you say yes here you get support for National Semiconductor LM85
sensor chips and clones: ADT7463, EMC6D100, EMC6D102 and ADM1027. sensor chips and clones: ADT7463, EMC6D100, EMC6D102 and ADM1027.
...@@ -256,7 +248,7 @@ config SENSORS_LM85 ...@@ -256,7 +248,7 @@ config SENSORS_LM85
config SENSORS_LM87 config SENSORS_LM87
tristate "National Semiconductor LM87" tristate "National Semiconductor LM87"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR select HWMON_VID
help help
If you say yes here you get support for National Semiconductor LM87 If you say yes here you get support for National Semiconductor LM87
sensor chips. sensor chips.
...@@ -267,7 +259,6 @@ config SENSORS_LM87 ...@@ -267,7 +259,6 @@ config SENSORS_LM87
config SENSORS_LM90 config SENSORS_LM90
tristate "National Semiconductor LM90 and compatibles" tristate "National Semiconductor LM90 and compatibles"
depends on HWMON && I2C depends on HWMON && I2C
select I2C_SENSOR
help help
If you say yes here you get support for National Semiconductor LM90, If you say yes here you get support for National Semiconductor LM90,
LM86, LM89 and LM99, Analog Devices ADM1032 and Maxim MAX6657 and LM86, LM89 and LM99, Analog Devices ADM1032 and Maxim MAX6657 and
...@@ -282,7 +273,6 @@ config SENSORS_LM90 ...@@ -282,7 +273,6 @@ config SENSORS_LM90
config SENSORS_LM92 config SENSORS_LM92
tristate "National Semiconductor LM92 and compatibles" tristate "National Semiconductor LM92 and compatibles"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for National Semiconductor LM92 If you say yes here you get support for National Semiconductor LM92
and Maxim MAX6635 sensor chips. and Maxim MAX6635 sensor chips.
...@@ -293,7 +283,6 @@ config SENSORS_LM92 ...@@ -293,7 +283,6 @@ config SENSORS_LM92
config SENSORS_MAX1619 config SENSORS_MAX1619
tristate "Maxim MAX1619 sensor chip" tristate "Maxim MAX1619 sensor chip"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for MAX1619 sensor chip. If you say yes here you get support for MAX1619 sensor chip.
...@@ -303,8 +292,8 @@ config SENSORS_MAX1619 ...@@ -303,8 +292,8 @@ config SENSORS_MAX1619
config SENSORS_PC87360 config SENSORS_PC87360
tristate "National Semiconductor PC87360 family" tristate "National Semiconductor PC87360 family"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
select I2C_ISA select I2C_ISA
select HWMON_VID
help help
If you say yes here you get access to the hardware monitoring If you say yes here you get access to the hardware monitoring
functions of the National Semiconductor PC8736x Super-I/O chips. functions of the National Semiconductor PC8736x Super-I/O chips.
...@@ -318,7 +307,6 @@ config SENSORS_PC87360 ...@@ -318,7 +307,6 @@ config SENSORS_PC87360
config SENSORS_SIS5595 config SENSORS_SIS5595
tristate "Silicon Integrated Systems Corp. SiS5595" tristate "Silicon Integrated Systems Corp. SiS5595"
depends on HWMON && I2C && PCI && EXPERIMENTAL depends on HWMON && I2C && PCI && EXPERIMENTAL
select I2C_SENSOR
select I2C_ISA select I2C_ISA
help help
If you say yes here you get support for the integrated sensors in If you say yes here you get support for the integrated sensors in
...@@ -330,7 +318,6 @@ config SENSORS_SIS5595 ...@@ -330,7 +318,6 @@ config SENSORS_SIS5595
config SENSORS_SMSC47M1 config SENSORS_SMSC47M1
tristate "SMSC LPC47M10x and compatibles" tristate "SMSC LPC47M10x and compatibles"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
select I2C_ISA select I2C_ISA
help help
If you say yes here you get support for the integrated fan If you say yes here you get support for the integrated fan
...@@ -343,7 +330,6 @@ config SENSORS_SMSC47M1 ...@@ -343,7 +330,6 @@ config SENSORS_SMSC47M1
config SENSORS_SMSC47B397 config SENSORS_SMSC47B397
tristate "SMSC LPC47B397-NC" tristate "SMSC LPC47B397-NC"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
select I2C_ISA select I2C_ISA
help help
If you say yes here you get support for the SMSC LPC47B397-NC If you say yes here you get support for the SMSC LPC47B397-NC
...@@ -355,7 +341,6 @@ config SENSORS_SMSC47B397 ...@@ -355,7 +341,6 @@ config SENSORS_SMSC47B397
config SENSORS_VIA686A config SENSORS_VIA686A
tristate "VIA686A" tristate "VIA686A"
depends on HWMON && I2C && PCI depends on HWMON && I2C && PCI
select I2C_SENSOR
select I2C_ISA select I2C_ISA
help help
If you say yes here you get support for the integrated sensors in If you say yes here you get support for the integrated sensors in
...@@ -367,8 +352,8 @@ config SENSORS_VIA686A ...@@ -367,8 +352,8 @@ config SENSORS_VIA686A
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_SENSOR
select I2C_ISA select I2C_ISA
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
of sensor chips: the W83781D, W83782D, W83783S and W83627HF, of sensor chips: the W83781D, W83782D, W83783S and W83627HF,
...@@ -380,7 +365,6 @@ config SENSORS_W83781D ...@@ -380,7 +365,6 @@ config SENSORS_W83781D
config SENSORS_W83792D config SENSORS_W83792D
tristate "Winbond W83792D" tristate "Winbond W83792D"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for the Winbond W83792D chip. If you say yes here you get support for the Winbond W83792D chip.
...@@ -390,7 +374,6 @@ config SENSORS_W83792D ...@@ -390,7 +374,6 @@ config SENSORS_W83792D
config SENSORS_W83L785TS config SENSORS_W83L785TS
tristate "Winbond W83L785TS-S" tristate "Winbond W83L785TS-S"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for the Winbond W83L785TS-S If you say yes here you get support for the Winbond W83L785TS-S
sensor chip, which is used on the Asus A7N8X, among other sensor chip, which is used on the Asus A7N8X, among other
...@@ -402,8 +385,8 @@ config SENSORS_W83L785TS ...@@ -402,8 +385,8 @@ config SENSORS_W83L785TS
config SENSORS_W83627HF config SENSORS_W83627HF
tristate "Winbond W83627HF, W83627THF, W83637HF, W83697HF" tristate "Winbond W83627HF, W83627THF, W83637HF, W83697HF"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
select I2C_ISA select I2C_ISA
select HWMON_VID
help help
If you say yes here you get support for the Winbond W836X7 series If you say yes here you get support for the Winbond W836X7 series
of sensor chips: the W83627HF, W83627THF, W83637HF, and the W83697HF of sensor chips: the W83627HF, W83627THF, W83637HF, and the W83697HF
...@@ -414,7 +397,6 @@ config SENSORS_W83627HF ...@@ -414,7 +397,6 @@ config SENSORS_W83627HF
config SENSORS_W83627EHF config SENSORS_W83627EHF
tristate "Winbond W83627EHF" tristate "Winbond W83627EHF"
depends on HWMON && I2C && EXPERIMENTAL depends on HWMON && I2C && EXPERIMENTAL
select I2C_SENSOR
select I2C_ISA select I2C_ISA
help help
If you say yes here you get preliminary support for the hardware If you say yes here you get preliminary support for the hardware
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
# #
obj-$(CONFIG_HWMON) += hwmon.o obj-$(CONFIG_HWMON) += hwmon.o
obj-$(CONFIG_HWMON_VID) += hwmon-vid.o
# asb100, then w83781d go first, as they can override other drivers' addresses. # asb100, then w83781d go first, as they can override other drivers' addresses.
obj-$(CONFIG_SENSORS_ASB100) += asb100.o obj-$(CONFIG_SENSORS_ASB100) += asb100.o
......
...@@ -50,8 +50,8 @@ ...@@ -50,8 +50,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-vid.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h> #include <linux/err.h>
/* /*
...@@ -473,7 +473,7 @@ static void adm1025_init_client(struct i2c_client *client) ...@@ -473,7 +473,7 @@ static void adm1025_init_client(struct i2c_client *client)
struct adm1025_data *data = i2c_get_clientdata(client); struct adm1025_data *data = i2c_get_clientdata(client);
int i; int i;
data->vrm = i2c_which_vrm(); data->vrm = vid_which_vrm();
/* /*
* Set high limits * Set high limits
......
...@@ -28,9 +28,9 @@ ...@@ -28,9 +28,9 @@
#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-vid.h>
#include <linux/hwmon-sysfs.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h> #include <linux/err.h>
/* Addresses to scan */ /* Addresses to scan */
...@@ -1552,7 +1552,7 @@ int adm1026_detect(struct i2c_adapter *adapter, int address, ...@@ -1552,7 +1552,7 @@ int adm1026_detect(struct i2c_adapter *adapter, int address,
goto exitfree; goto exitfree;
/* Set the VRM version */ /* Set the VRM version */
data->vrm = i2c_which_vrm(); data->vrm = vid_which_vrm();
/* Initialize the ADM1026 chip */ /* Initialize the ADM1026 chip */
adm1026_init_client(new_client); adm1026_init_client(new_client);
......
...@@ -45,8 +45,8 @@ ...@@ -45,8 +45,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-vid.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h> #include <linux/err.h>
/* Addresses to scan */ /* Addresses to scan */
...@@ -657,7 +657,7 @@ static void adm9240_init_client(struct i2c_client *client) ...@@ -657,7 +657,7 @@ static void adm9240_init_client(struct i2c_client *client)
u8 conf = adm9240_read_value(client, ADM9240_REG_CONFIG); u8 conf = adm9240_read_value(client, ADM9240_REG_CONFIG);
u8 mode = adm9240_read_value(client, ADM9240_REG_TEMP_CONF) & 3; u8 mode = adm9240_read_value(client, ADM9240_REG_TEMP_CONF) & 3;
data->vrm = i2c_which_vrm(); /* need this to report vid as mV */ data->vrm = vid_which_vrm(); /* need this to report vid as mV */
dev_info(&client->dev, "Using VRM: %d.%d\n", data->vrm / 10, dev_info(&client->dev, "Using VRM: %d.%d\n", data->vrm / 10,
data->vrm % 10); data->vrm % 10);
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-vid.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
...@@ -973,7 +973,7 @@ static void asb100_init_client(struct i2c_client *client) ...@@ -973,7 +973,7 @@ static void asb100_init_client(struct i2c_client *client)
vid = asb100_read_value(client, ASB100_REG_VID_FANDIV) & 0x0f; vid = asb100_read_value(client, ASB100_REG_VID_FANDIV) & 0x0f;
vid |= (asb100_read_value(client, ASB100_REG_CHIPID) & 0x01) << 4; vid |= (asb100_read_value(client, ASB100_REG_CHIPID) & 0x01) << 4;
data->vrm = i2c_which_vrm(); data->vrm = vid_which_vrm();
vid = vid_from_reg(vid, data->vrm); vid = vid_from_reg(vid, data->vrm);
/* Start monitoring */ /* Start monitoring */
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-vid.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h> #include <linux/err.h>
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -296,7 +296,7 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -296,7 +296,7 @@ static int atxp1_detect(struct i2c_adapter *adapter, int address, int kind)
} }
/* Get VRM */ /* Get VRM */
data->vrm = i2c_which_vrm(); data->vrm = vid_which_vrm();
if ((data->vrm != 90) && (data->vrm != 91)) { if ((data->vrm != 90) && (data->vrm != 91)) {
dev_err(&new_client->dev, "Not supporting VRM %d.%d\n", dev_err(&new_client->dev, "Not supporting VRM %d.%d\n",
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,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-vid.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h> #include <linux/err.h>
/* Type of the extra sensor */ /* Type of the extra sensor */
...@@ -617,7 +617,7 @@ static void gl520_init_client(struct i2c_client *client) ...@@ -617,7 +617,7 @@ static void gl520_init_client(struct i2c_client *client)
conf = oldconf = gl520_read_value(client, GL520_REG_CONF); conf = oldconf = gl520_read_value(client, GL520_REG_CONF);
data->alarm_mask = 0xff; data->alarm_mask = 0xff;
data->vrm = i2c_which_vrm(); data->vrm = vid_which_vrm();
if (extra_sensor_type == 1) if (extra_sensor_type == 1)
conf &= ~0x10; conf &= ~0x10;
......
/* /*
i2c-sensor-vid.c - Part of lm_sensors, Linux kernel modules for hardware hwmon-vid.c - VID/VRM/VRD voltage conversions
monitoring
Copyright (c) 2004 Rudolf Marek <r.marek@sh.cvut.cz> Copyright (c) 2004 Rudolf Marek <r.marek@sh.cvut.cz>
...@@ -22,6 +21,7 @@ ...@@ -22,6 +21,7 @@
#include <linux/config.h> #include <linux/config.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/hwmon-vid.h>
struct vrm_model { struct vrm_model {
u8 vendor; u8 vendor;
...@@ -63,7 +63,7 @@ static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor) ...@@ -63,7 +63,7 @@ static int find_vrm(u8 eff_family, u8 eff_model, u8 vendor)
return 0; return 0;
} }
int i2c_which_vrm(void) int vid_which_vrm(void)
{ {
struct cpuinfo_x86 *c = cpu_data; struct cpuinfo_x86 *c = cpu_data;
u32 eax; u32 eax;
...@@ -81,23 +81,23 @@ int i2c_which_vrm(void) ...@@ -81,23 +81,23 @@ int i2c_which_vrm(void)
} }
vrm_ret = find_vrm(eff_family,eff_model,c->x86_vendor); vrm_ret = find_vrm(eff_family,eff_model,c->x86_vendor);
if (vrm_ret == 0) if (vrm_ret == 0)
printk(KERN_INFO "i2c-sensor.o: Unknown VRM version of your" printk(KERN_INFO "hwmon-vid: Unknown VRM version of your"
" x86 CPU\n"); " x86 CPU\n");
return vrm_ret; return vrm_ret;
} }
/* and now for something completely different for Non-x86 world*/ /* and now for something completely different for Non-x86 world*/
#else #else
int i2c_which_vrm(void) int vid_which_vrm(void)
{ {
printk(KERN_INFO "i2c-sensor.o: Unknown VRM version of your CPU\n"); printk(KERN_INFO "hwmon-vid: Unknown VRM version of your CPU\n");
return 0; return 0;
} }
#endif #endif
EXPORT_SYMBOL(i2c_which_vrm); EXPORT_SYMBOL(vid_which_vrm);
MODULE_AUTHOR("Rudolf Marek <r.marek@sh.cvut.cz>"); MODULE_AUTHOR("Rudolf Marek <r.marek@sh.cvut.cz>");
MODULE_DESCRIPTION("i2c-sensor driver"); MODULE_DESCRIPTION("hwmon-vid driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
...@@ -37,9 +37,9 @@ ...@@ -37,9 +37,9 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-isa.h> #include <linux/i2c-isa.h>
#include <linux/i2c-vid.h>
#include <linux/hwmon-sysfs.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-sysfs.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h> #include <linux/err.h>
#include <asm/io.h> #include <asm/io.h>
...@@ -919,7 +919,7 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind) ...@@ -919,7 +919,7 @@ int it87_detect(struct i2c_adapter *adapter, int address, int kind)
} }
if (data->type == it8712) { if (data->type == it8712) {
data->vrm = i2c_which_vrm(); data->vrm = vid_which_vrm();
device_create_file_vrm(new_client); device_create_file_vrm(new_client);
device_create_file_vid(new_client); device_create_file_vid(new_client);
} }
......
...@@ -28,8 +28,8 @@ ...@@ -28,8 +28,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-vid.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h> #include <linux/err.h>
/* Addresses to scan */ /* Addresses to scan */
...@@ -1147,7 +1147,7 @@ int lm85_detect(struct i2c_adapter *adapter, int address, ...@@ -1147,7 +1147,7 @@ int lm85_detect(struct i2c_adapter *adapter, int address,
goto ERROR1; goto ERROR1;
/* Set the VRM version */ /* Set the VRM version */
data->vrm = i2c_which_vrm(); data->vrm = vid_which_vrm();
/* Initialize the LM85 chip */ /* Initialize the LM85 chip */
lm85_init_client(new_client); lm85_init_client(new_client);
......
...@@ -57,8 +57,8 @@ ...@@ -57,8 +57,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-vid.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h> #include <linux/err.h>
/* /*
...@@ -694,7 +694,7 @@ static void lm87_init_client(struct i2c_client *client) ...@@ -694,7 +694,7 @@ static void lm87_init_client(struct i2c_client *client)
u8 config; u8 config;
data->channel = lm87_read_value(client, LM87_REG_CHANNEL_MODE); data->channel = lm87_read_value(client, LM87_REG_CHANNEL_MODE);
data->vrm = i2c_which_vrm(); data->vrm = vid_which_vrm();
config = lm87_read_value(client, LM87_REG_CONFIG); config = lm87_read_value(client, LM87_REG_CONFIG);
if (!(config & 0x01)) { if (!(config & 0x01)) {
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-isa.h> #include <linux/i2c-isa.h>
#include <linux/i2c-vid.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h> #include <linux/err.h>
#include <asm/io.h> #include <asm/io.h>
......
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-isa.h> #include <linux/i2c-isa.h>
#include <linux/i2c-vid.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h> #include <linux/err.h>
#include <asm/io.h> #include <asm/io.h>
#include "lm75.h" #include "lm75.h"
...@@ -1316,7 +1316,7 @@ static void w83627hf_init_client(struct i2c_client *client) ...@@ -1316,7 +1316,7 @@ static void w83627hf_init_client(struct i2c_client *client)
data->vrm = (data->vrm_ovt & 0x01) ? 90 : 82; data->vrm = (data->vrm_ovt & 0x01) ? 90 : 82;
} else { } else {
/* Convert VID to voltage based on default VRM */ /* Convert VID to voltage based on default VRM */
data->vrm = i2c_which_vrm(); data->vrm = vid_which_vrm();
} }
tmp = w83627hf_read_value(client, W83781D_REG_SCFG1); tmp = w83627hf_read_value(client, W83781D_REG_SCFG1);
......
...@@ -39,8 +39,8 @@ ...@@ -39,8 +39,8 @@
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-isa.h> #include <linux/i2c-isa.h>
#include <linux/i2c-vid.h>
#include <linux/hwmon.h> #include <linux/hwmon.h>
#include <linux/hwmon-vid.h>
#include <linux/err.h> #include <linux/err.h>
#include <asm/io.h> #include <asm/io.h>
#include "lm75.h" #include "lm75.h"
...@@ -1478,7 +1478,7 @@ w83781d_init_client(struct i2c_client *client) ...@@ -1478,7 +1478,7 @@ w83781d_init_client(struct i2c_client *client)
w83781d_write_value(client, W83781D_REG_BEEP_INTS2, 0); w83781d_write_value(client, W83781D_REG_BEEP_INTS2, 0);
} }
data->vrm = i2c_which_vrm(); data->vrm = vid_which_vrm();
if ((type != w83781d) && (type != as99127f)) { if ((type != w83781d) && (type != as99127f)) {
tmp = w83781d_read_value(client, W83781D_REG_SCFG1); tmp = w83781d_read_value(client, W83781D_REG_SCFG1);
......
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/i2c-vid.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>
......
...@@ -4,12 +4,8 @@ ...@@ -4,12 +4,8 @@
obj-$(CONFIG_I2C) += i2c-core.o obj-$(CONFIG_I2C) += i2c-core.o
obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o obj-$(CONFIG_I2C_CHARDEV) += i2c-dev.o
obj-$(CONFIG_I2C_SENSOR) += i2c-sensor.o
obj-y += busses/ chips/ algos/ obj-y += busses/ chips/ algos/
i2c-sensor-objs := i2c-sensor-vid.o
ifeq ($(CONFIG_I2C_DEBUG_CORE),y) ifeq ($(CONFIG_I2C_DEBUG_CORE),y)
EXTRA_CFLAGS += -DDEBUG EXTRA_CFLAGS += -DDEBUG
endif endif
...@@ -2,17 +2,12 @@ ...@@ -2,17 +2,12 @@
# Miscellaneous I2C chip drivers configuration # Miscellaneous I2C chip drivers configuration
# #
config I2C_SENSOR
tristate
default n
menu "Miscellaneous I2C Chip support" menu "Miscellaneous I2C Chip support"
depends on I2C depends on I2C
config SENSORS_DS1337 config SENSORS_DS1337
tristate "Dallas Semiconductor DS1337 and DS1339 Real Time Clock" tristate "Dallas Semiconductor DS1337 and DS1339 Real Time Clock"
depends on I2C && EXPERIMENTAL depends on I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for Dallas Semiconductor If you say yes here you get support for Dallas Semiconductor
DS1337 and DS1339 real-time clock chips. DS1337 and DS1339 real-time clock chips.
...@@ -23,7 +18,6 @@ config SENSORS_DS1337 ...@@ -23,7 +18,6 @@ config SENSORS_DS1337
config SENSORS_DS1374 config SENSORS_DS1374
tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock" tristate "Maxim/Dallas Semiconductor DS1374 Real Time Clock"
depends on I2C && EXPERIMENTAL depends on I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for Dallas Semiconductor If you say yes here you get support for Dallas Semiconductor
DS1374 real-time clock chips. DS1374 real-time clock chips.
...@@ -34,7 +28,6 @@ config SENSORS_DS1374 ...@@ -34,7 +28,6 @@ config SENSORS_DS1374
config SENSORS_EEPROM config SENSORS_EEPROM
tristate "EEPROM reader" tristate "EEPROM reader"
depends on I2C && EXPERIMENTAL depends on I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get read-only access to the EEPROM data If you say yes here you get read-only access to the EEPROM data
available on modern memory DIMMs and Sony Vaio laptops. Such available on modern memory DIMMs and Sony Vaio laptops. Such
...@@ -46,7 +39,6 @@ config SENSORS_EEPROM ...@@ -46,7 +39,6 @@ config SENSORS_EEPROM
config SENSORS_PCF8574 config SENSORS_PCF8574
tristate "Philips PCF8574 and PCF8574A" tristate "Philips PCF8574 and PCF8574A"
depends on I2C && EXPERIMENTAL depends on I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for Philips PCF8574 and If you say yes here you get support for Philips PCF8574 and
PCF8574A chips. PCF8574A chips.
...@@ -67,7 +59,6 @@ config SENSORS_PCA9539 ...@@ -67,7 +59,6 @@ config SENSORS_PCA9539
config SENSORS_PCF8591 config SENSORS_PCF8591
tristate "Philips PCF8591" tristate "Philips PCF8591"
depends on I2C && EXPERIMENTAL depends on I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for Philips PCF8591 chips. If you say yes here you get support for Philips PCF8591 chips.
...@@ -77,7 +68,6 @@ config SENSORS_PCF8591 ...@@ -77,7 +68,6 @@ config SENSORS_PCF8591
config SENSORS_RTC8564 config SENSORS_RTC8564
tristate "Epson 8564 RTC chip" tristate "Epson 8564 RTC chip"
depends on I2C && EXPERIMENTAL depends on I2C && EXPERIMENTAL
select I2C_SENSOR
help help
If you say yes here you get support for the Epson 8564 RTC chip. If you say yes here you get support for the Epson 8564 RTC chip.
......
/* /*
i2c-vid.h - Part of lm_sensors, Linux kernel modules for hardware hwmon-vid.h - VID/VRM/VRD voltage conversions
monitoring
Originally part of lm_sensors
Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com> Copyright (c) 2002 Mark D. Studebaker <mdsxyz123@yahoo.com>
With assistance from Trent Piepho <xyzzy@speakeasy.org> With assistance from Trent Piepho <xyzzy@speakeasy.org>
...@@ -50,7 +51,7 @@ ...@@ -50,7 +51,7 @@
to avoid floating point in the kernel. to avoid floating point in the kernel.
*/ */
int i2c_which_vrm(void); int vid_which_vrm(void);
#define DEFAULT_VRM 82 #define DEFAULT_VRM 82
......
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