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

[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

Documentation/i2c/porting-clients

+3 −1
Original line number Diff line number Diff line
@@ -23,7 +23,9 @@ Technical changes: 
  #include <linux/init.h>

  #include <linux/slab.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 */

  Please respect this inclusion order. Some extra headers may be

  required for a given driver (e.g. "lm75.h").

drivers/hwmon/Kconfig

+16 −34
Original line number Diff line number Diff line
@@ -19,10 +19,13 @@ config HWMON 
	  This support can also be built as a module.  If so, the module

	  will be called hwmon.



config HWMON_VID

	tristate

	default n



config SENSORS_ADM1021

	tristate "Analog Devices ADM1021 and compatibles"

	depends on HWMON && I2C

	select I2C_SENSOR

	help

	  If you say yes here you get support for Analog Devices ADM1021

	  and ADM1023 sensor chips and clones: Maxim MAX1617 and MAX1617A,
@@ -35,7 +38,7 @@ config SENSORS_ADM1021 
config SENSORS_ADM1025

	tristate "Analog Devices ADM1025 and compatibles"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select HWMON_VID

	help

	  If you say yes here you get support for Analog Devices ADM1025

	  and Philips NE1619 sensor chips.
@@ -46,7 +49,7 @@ config SENSORS_ADM1025 
config SENSORS_ADM1026

	tristate "Analog Devices ADM1026 and compatibles"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select HWMON_VID

	help

	  If you say yes here you get support for Analog Devices ADM1026

	  sensor chip.
@@ -57,7 +60,6 @@ config SENSORS_ADM1026 
config SENSORS_ADM1031

	tristate "Analog Devices ADM1031 and compatibles"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	help

	  If you say yes here you get support for Analog Devices ADM1031

	  and ADM1030 sensor chips.
@@ -68,7 +70,7 @@ config SENSORS_ADM1031 
config SENSORS_ADM9240

	tristate "Analog Devices ADM9240 and compatibles"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select HWMON_VID

	help

	  If you say yes here you get support for Analog Devices ADM9240,

	  Dallas DS1780, National Semiconductor LM81 sensor chips.
@@ -79,7 +81,7 @@ config SENSORS_ADM9240 
config SENSORS_ASB100

	tristate "Asus ASB100 Bach"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select HWMON_VID

	help

	  If you say yes here you get support for the ASB100 Bach sensor

	  chip found on some Asus mainboards.
@@ -90,7 +92,7 @@ config SENSORS_ASB100 
config SENSORS_ATXP1

	tristate "Attansic ATXP1 VID controller"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select HWMON_VID

	help

	  If you say yes here you get support for the Attansic ATXP1 VID

	  controller.
@@ -104,7 +106,6 @@ config SENSORS_ATXP1 
config SENSORS_DS1621

	tristate "Dallas Semiconductor DS1621 and DS1625"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	help

	  If you say yes here you get support for Dallas Semiconductor

	  DS1621 and DS1625 sensor chips.
@@ -115,7 +116,6 @@ config SENSORS_DS1621 
config SENSORS_FSCHER

	tristate "FSC Hermes"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	help

	  If you say yes here you get support for Fujitsu Siemens

	  Computers Hermes sensor chips.
@@ -126,7 +126,6 @@ config SENSORS_FSCHER 
config SENSORS_FSCPOS

	tristate "FSC Poseidon"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	help

	  If you say yes here you get support for Fujitsu Siemens

	  Computers Poseidon sensor chips.
@@ -137,7 +136,6 @@ config SENSORS_FSCPOS 
config SENSORS_GL518SM

	tristate "Genesys Logic GL518SM"

	depends on HWMON && I2C

	select I2C_SENSOR

	help

	  If you say yes here you get support for Genesys Logic GL518SM

	  sensor chips.
@@ -148,7 +146,7 @@ config SENSORS_GL518SM 
config SENSORS_GL520SM

	tristate "Genesys Logic GL520SM"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select HWMON_VID

	help

	  If you say yes here you get support for Genesys Logic GL520SM

	  sensor chips.
@@ -159,8 +157,8 @@ config SENSORS_GL520SM 
config SENSORS_IT87

	tristate "ITE IT87xx and compatibles"

	depends on HWMON && I2C

	select I2C_SENSOR

	select I2C_ISA

	select HWMON_VID

	help

	  If you say yes here you get support for ITE IT87xx sensor chips

	  and clones: SiS960.
@@ -171,7 +169,6 @@ config SENSORS_IT87 
config SENSORS_LM63

	tristate "National Semiconductor LM63"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	help

	  If you say yes here you get support for the National Semiconductor

	  LM63 remote diode digital temperature sensor with integrated fan
@@ -184,7 +181,6 @@ config SENSORS_LM63 
config SENSORS_LM75

	tristate "National Semiconductor LM75 and compatibles"

	depends on HWMON && I2C

	select I2C_SENSOR

	help

	  If you say yes here you get support for National Semiconductor LM75

	  sensor chips and clones: Dallas Semiconductor DS75 and DS1775 (in
@@ -200,7 +196,6 @@ config SENSORS_LM75 
config SENSORS_LM77

	tristate "National Semiconductor LM77"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	help

	  If you say yes here you get support for National Semiconductor LM77

	  sensor chips.
@@ -211,7 +206,6 @@ config SENSORS_LM77 
config SENSORS_LM78

	tristate "National Semiconductor LM78 and compatibles"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select I2C_ISA

	help

	  If you say yes here you get support for National Semiconductor LM78,
@@ -223,7 +217,6 @@ config SENSORS_LM78 
config SENSORS_LM80

	tristate "National Semiconductor LM80"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	help

	  If you say yes here you get support for National Semiconductor

	  LM80 sensor chips.
@@ -234,7 +227,6 @@ config SENSORS_LM80 
config SENSORS_LM83

	tristate "National Semiconductor LM83"

	depends on HWMON && I2C

	select I2C_SENSOR

	help

	  If you say yes here you get support for National Semiconductor

	  LM83 sensor chips.
@@ -245,7 +237,7 @@ config SENSORS_LM83 
config SENSORS_LM85

	tristate "National Semiconductor LM85 and compatibles"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select HWMON_VID

	help

	  If you say yes here you get support for National Semiconductor LM85

	  sensor chips and clones: ADT7463, EMC6D100, EMC6D102 and ADM1027.
@@ -256,7 +248,7 @@ config SENSORS_LM85 
config SENSORS_LM87

	tristate "National Semiconductor LM87"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select HWMON_VID

	help

	  If you say yes here you get support for National Semiconductor LM87

	  sensor chips.
@@ -267,7 +259,6 @@ config SENSORS_LM87 
config SENSORS_LM90

	tristate "National Semiconductor LM90 and compatibles"

	depends on HWMON && I2C

	select I2C_SENSOR

	help

	  If you say yes here you get support for National Semiconductor LM90,

	  LM86, LM89 and LM99, Analog Devices ADM1032 and Maxim MAX6657 and
@@ -282,7 +273,6 @@ config SENSORS_LM90 
config SENSORS_LM92

	tristate "National Semiconductor LM92 and compatibles"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	help

	  If you say yes here you get support for National Semiconductor LM92

	  and Maxim MAX6635 sensor chips.
@@ -293,7 +283,6 @@ config SENSORS_LM92 
config SENSORS_MAX1619

	tristate "Maxim MAX1619 sensor chip"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	help

	  If you say yes here you get support for MAX1619 sensor chip.
@@ -303,8 +292,8 @@ config SENSORS_MAX1619 
config SENSORS_PC87360

	tristate "National Semiconductor PC87360 family"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select I2C_ISA

	select HWMON_VID

	help

	  If you say yes here you get access to the hardware monitoring

	  functions of the National Semiconductor PC8736x Super-I/O chips.
@@ -318,7 +307,6 @@ config SENSORS_PC87360 
config SENSORS_SIS5595

	tristate "Silicon Integrated Systems Corp. SiS5595"

	depends on HWMON && I2C && PCI && EXPERIMENTAL

	select I2C_SENSOR

	select I2C_ISA

	help

	  If you say yes here you get support for the integrated sensors in
@@ -330,7 +318,6 @@ config SENSORS_SIS5595 
config SENSORS_SMSC47M1

	tristate "SMSC LPC47M10x and compatibles"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select I2C_ISA

	help

	  If you say yes here you get support for the integrated fan
@@ -343,7 +330,6 @@ config SENSORS_SMSC47M1 
config SENSORS_SMSC47B397

	tristate "SMSC LPC47B397-NC"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select I2C_ISA

	help

	  If you say yes here you get support for the SMSC LPC47B397-NC
@@ -355,7 +341,6 @@ config SENSORS_SMSC47B397 
config SENSORS_VIA686A

	tristate "VIA686A"

	depends on HWMON && I2C && PCI

	select I2C_SENSOR

	select I2C_ISA

	help

	  If you say yes here you get support for the integrated sensors in
@@ -367,8 +352,8 @@ config SENSORS_VIA686A 
config SENSORS_W83781D

	tristate "Winbond W83781D, W83782D, W83783S, W83627HF, Asus AS99127F"

	depends on HWMON && I2C

	select I2C_SENSOR

	select I2C_ISA

	select HWMON_VID

	help

	  If you say yes here you get support for the Winbond W8378x series

	  of sensor chips: the W83781D, W83782D, W83783S and W83627HF,
@@ -380,7 +365,6 @@ config SENSORS_W83781D 
config SENSORS_W83792D

	tristate "Winbond W83792D"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	help

	  If you say yes here you get support for the Winbond W83792D chip.
@@ -390,7 +374,6 @@ config SENSORS_W83792D 
config SENSORS_W83L785TS

	tristate "Winbond W83L785TS-S"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	help

	  If you say yes here you get support for the Winbond W83L785TS-S

	  sensor chip, which is used on the Asus A7N8X, among other
@@ -402,8 +385,8 @@ config SENSORS_W83L785TS 
config SENSORS_W83627HF

	tristate "Winbond W83627HF, W83627THF, W83637HF, W83697HF"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select I2C_ISA

	select HWMON_VID

	help

	  If you say yes here you get support for the Winbond W836X7 series

	  of sensor chips: the W83627HF, W83627THF, W83637HF, and the W83697HF
@@ -414,7 +397,6 @@ config SENSORS_W83627HF 
config SENSORS_W83627EHF

	tristate "Winbond W83627EHF"

	depends on HWMON && I2C && EXPERIMENTAL

	select I2C_SENSOR

	select I2C_ISA

	help

	  If you say yes here you get preliminary support for the hardware

drivers/hwmon/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#



obj-$(CONFIG_HWMON)		+= hwmon.o

obj-$(CONFIG_HWMON_VID)		+= hwmon-vid.o



# asb100, then w83781d go first, as they can override other drivers' addresses.

obj-$(CONFIG_SENSORS_ASB100)	+= asb100.o

drivers/hwmon/adm1025.c

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ 
#include <linux/slab.h>

#include <linux/jiffies.h>

#include <linux/i2c.h>

#include <linux/i2c-vid.h>

#include <linux/hwmon.h>

#include <linux/hwmon-vid.h>

#include <linux/err.h>



/*
@@ -473,7 +473,7 @@ static void adm1025_init_client(struct i2c_client *client) 
	struct adm1025_data *data = i2c_get_clientdata(client);

	int i;



	data->vrm = i2c_which_vrm();

	data->vrm = vid_which_vrm();



	/*

	 * Set high limits

drivers/hwmon/adm1026.c

+3 −3
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 
#include <linux/slab.h>

#include <linux/jiffies.h>

#include <linux/i2c.h>

#include <linux/i2c-vid.h>

#include <linux/hwmon-sysfs.h>

#include <linux/hwmon.h>

#include <linux/hwmon-sysfs.h>

#include <linux/hwmon-vid.h>

#include <linux/err.h>



/* Addresses to scan */
@@ -1552,7 +1552,7 @@ int adm1026_detect(struct i2c_adapter *adapter, int address, 
		goto exitfree;



	/* Set the VRM version */

	data->vrm = i2c_which_vrm();

	data->vrm = vid_which_vrm();



	/* Initialize the ADM1026 chip */

	adm1026_init_client(new_client);

CRA Git | Maintained and supported by SUSTech CRA and CCSE