Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b180d050 authored by Jean Delvare's avatar Jean Delvare
Browse files

hwmon: (adt7475) Add support for the ADT7473 



Add support for the ADT7473 to the adt7475 driver, and mark the
adt7473 driver for removal. The ADT7473 and ADT7475 chips are almost
the same chip and essentially compatible, so there's no point in
having separate drivers for them.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: "Mark M. Hoffman" <mhoffman@lightlink.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Jordan Crouse <jordan@cosmicpenguin.net>
Cc: "Darrick J. Wong" <djwong@us.ibm.com>
parent 7669896f

Documentation/feature-removal-schedule.txt

+7 −0
Original line number Original line Diff line number Diff line
@@ -483,3 +483,10 @@ Why: With the recent innovations in CPU hardware acceleration technologies 
Who:	Alok N Kataria <akataria@vmware.com>

Who:	Alok N Kataria <akataria@vmware.com>





----------------------------

----------------------------



What:	adt7473 hardware monitoring driver

When:	February 2010

Why:	Obsoleted by the adt7475 driver.

Who:	Jean Delvare <khali@linux-fr.org>



---------------------------

Documentation/hwmon/adt7473

+2 −0
Original line number Original line Diff line number Diff line
@@ -9,6 +9,8 @@ Supported chips: 




Author: Darrick J. Wong

Author: Darrick J. Wong





This driver is depreacted, please use the adt7475 driver instead.



Description

Description

-----------

-----------

drivers/hwmon/Kconfig

+7 −3
Original line number Original line Diff line number Diff line
@@ -191,21 +191,25 @@ config SENSORS_ADT7470 
	  will be called adt7470.

	  will be called adt7470.





config SENSORS_ADT7473

config SENSORS_ADT7473

	tristate "Analog Devices ADT7473"

	tristate "Analog Devices ADT7473 (DEPRECATED)"

	depends on I2C && EXPERIMENTAL

	depends on I2C && EXPERIMENTAL

	select SENSORS_ADT7475

	help

	help

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

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

	  ADT7473 temperature monitoring chips.

	  ADT7473 temperature monitoring chips.





	  This driver is deprecated, you should use the adt7475 driver

	  instead.



	  This driver can also be built as a module. If so, the module

	  This driver can also be built as a module. If so, the module

	  will be called adt7473.

	  will be called adt7473.





config SENSORS_ADT7475

config SENSORS_ADT7475

	tristate "Analog Devices ADT7475"

	tristate "Analog Devices ADT7473 and ADT7475"

	depends on I2C && EXPERIMENTAL

	depends on I2C && EXPERIMENTAL

	help

	help

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

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

	  ADT7475 hardware monitoring chips.

	  ADT7473 and ADT7475 hardware monitoring chips.





	  This driver can also be build as a module.  If so, the module

	  This driver can also be build as a module.  If so, the module

	  will be called adt7475.

	  will be called adt7475.

drivers/hwmon/adt7473.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -174,7 +174,6 @@ static const struct i2c_device_id adt7473_id[] = { 
	{ "adt7473", adt7473 },

	{ "adt7473", adt7473 },

	{ }

	{ }

};

};

MODULE_DEVICE_TABLE(i2c, adt7473_id);





static struct i2c_driver adt7473_driver = {

static struct i2c_driver adt7473_driver = {

	.class		= I2C_CLASS_HWMON,

	.class		= I2C_CLASS_HWMON,
@@ -1166,6 +1165,8 @@ static int adt7473_remove(struct i2c_client *client) 




static int __init adt7473_init(void)

static int __init adt7473_init(void)

{

{

	pr_notice("The adt7473 driver is deprecated, please use the adt7475 "

		  "driver instead\n");

	return i2c_add_driver(&adt7473_driver);

	return i2c_add_driver(&adt7473_driver);

}

}

drivers/hwmon/adt7475.c

+17 −8
Original line number Original line Diff line number Diff line
@@ -113,11 +113,12 @@ 
#define TEMP_OFFSET_REG(idx) (REG_TEMP_OFFSET_BASE + (idx))

#define TEMP_OFFSET_REG(idx) (REG_TEMP_OFFSET_BASE + (idx))

#define TEMP_TRANGE_REG(idx) (REG_TEMP_TRANGE_BASE + (idx))

#define TEMP_TRANGE_REG(idx) (REG_TEMP_TRANGE_BASE + (idx))





static unsigned short normal_i2c[] = { 0x2e, I2C_CLIENT_END };

static unsigned short normal_i2c[] = { 0x2c, 0x2d, 0x2e, I2C_CLIENT_END };





I2C_CLIENT_INSMOD_1(adt7475);

I2C_CLIENT_INSMOD_2(adt7473, adt7475);





static const struct i2c_device_id adt7475_id[] = {

static const struct i2c_device_id adt7475_id[] = {

	{ "adt7473", adt7473 },

	{ "adt7475", adt7475 },

	{ "adt7475", adt7475 },

	{ }

	{ }

};

};
@@ -970,19 +971,27 @@ static int adt7475_detect(struct i2c_client *client, int kind, 
			  struct i2c_board_info *info)

			  struct i2c_board_info *info)

{

{

	struct i2c_adapter *adapter = client->adapter;

	struct i2c_adapter *adapter = client->adapter;

	int vendid, devid;

	const char *name;





	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))

	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))

		return -ENODEV;

		return -ENODEV;





	if (adt7475_read(REG_VENDID) != 0x41 ||

	vendid = adt7475_read(REG_VENDID);

	    adt7475_read(REG_DEVID) != 0x75) {

	devid = adt7475_read(REG_DEVID);

		dev_err(&adapter->dev,



			"Couldn't detect a adt7475 part at 0x%02x\n",

	if (vendid == 0x41 && devid == 0x73)

			(unsigned int)client->addr);

		name = "adt7473";

	else if (vendid == 0x41 && devid == 0x75 && client->addr == 0x2e)

		name = "adt7475";

	else {

		dev_dbg(&adapter->dev,

			"Couldn't detect an ADT7473 or ADT7475 part at "

			"0x%02x\n", (unsigned int)client->addr);

		return -ENODEV;

		return -ENODEV;

	}

	}





	strlcpy(info->type, adt7475_id[0].name, I2C_NAME_SIZE);

	strlcpy(info->type, name, I2C_NAME_SIZE);





	return 0;

	return 0;

}

}