Commit 3a86d964 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] therm_adt7467 update

From: "Colin Leroy" <colin@colino.net>

The fan driver I wrote for adt746x looks like it only handles the adt7467
chip found in iBooks G4; but it also handles the adt7460 chip found in the
Powerbook G4 Alu.  Here's a patch that updates therm_adt7467.c, Kconfig and
Makefile.
parent 72a3b209
...@@ -1864,6 +1864,13 @@ S: Am Muehlenweg 38 ...@@ -1864,6 +1864,13 @@ S: Am Muehlenweg 38
S: D53424 Remagen S: D53424 Remagen
S: Germany S: Germany
N: Colin Leroy
E: colin@colino.net
W: http://www.geekounet.org/
D: PowerMac adt7467 fan driver
S: Toulouse
S: France
N: Achim Leubner N: Achim Leubner
E: achim_leubner@adaptec.com E: achim_leubner@adaptec.com
D: GDT Disk Array Controller/Storage RAID controller driver D: GDT Disk Array Controller/Storage RAID controller driver
......
...@@ -175,8 +175,8 @@ config THERM_WINDTUNNEL ...@@ -175,8 +175,8 @@ config THERM_WINDTUNNEL
This driver provides some thermostat and fan control for the desktop This driver provides some thermostat and fan control for the desktop
G4 "Windtunnel" G4 "Windtunnel"
config THERM_ADT7467 config THERM_ADT746X
tristate "Support for thermal mgmnt on laptops with ADT 7467 chipset" tristate "Support for thermal mgmnt on laptops with ADT 746x chipset"
depends on I2C && I2C_KEYWEST && PPC_PMAC && !PPC_PMAC64 depends on I2C && I2C_KEYWEST && PPC_PMAC && !PPC_PMAC64
help help
This driver provides some thermostat and fan control for the This driver provides some thermostat and fan control for the
......
...@@ -25,4 +25,4 @@ obj-$(CONFIG_ADB_MACIO) += macio-adb.o ...@@ -25,4 +25,4 @@ obj-$(CONFIG_ADB_MACIO) += macio-adb.o
obj-$(CONFIG_THERM_PM72) += therm_pm72.o obj-$(CONFIG_THERM_PM72) += therm_pm72.o
obj-$(CONFIG_THERM_WINDTUNNEL) += therm_windtunnel.o obj-$(CONFIG_THERM_WINDTUNNEL) += therm_windtunnel.o
obj-$(CONFIG_THERM_ADT7467) += therm_adt7467.o obj-$(CONFIG_THERM_ADT746X) += therm_adt746x.o
...@@ -49,7 +49,7 @@ static int limit_adjust = 0; ...@@ -49,7 +49,7 @@ static int limit_adjust = 0;
static int fan_speed = -1; static int fan_speed = -1;
MODULE_AUTHOR("Colin Leroy <colin@colino.net>"); MODULE_AUTHOR("Colin Leroy <colin@colino.net>");
MODULE_DESCRIPTION("Driver for ADT7467 thermostat in iBook G4"); MODULE_DESCRIPTION("Driver for ADT746x thermostat in iBook G4 and Powerbook G4 Alu");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_PARM(limit_adjust,"i"); MODULE_PARM(limit_adjust,"i");
...@@ -161,7 +161,7 @@ detach_thermostat(struct i2c_adapter *adapter) ...@@ -161,7 +161,7 @@ detach_thermostat(struct i2c_adapter *adapter)
} }
static struct i2c_driver thermostat_driver = { static struct i2c_driver thermostat_driver = {
.name ="Apple Thermostat ADT7467", .name ="Apple Thermostat ADT746x",
.id =0xDEAD7467, .id =0xDEAD7467,
.flags =I2C_DF_NOTIFY, .flags =I2C_DF_NOTIFY,
.attach_adapter =&attach_thermostat, .attach_adapter =&attach_thermostat,
...@@ -494,9 +494,6 @@ thermostat_init(void) ...@@ -494,9 +494,6 @@ thermostat_init(void)
struct device_node* np; struct device_node* np;
u32 *prop; u32 *prop;
/* Currently, we only deal with the iBook G4, we will support
* all "2003" powerbooks later on
*/
np = of_find_node_by_name(NULL, "fan"); np = of_find_node_by_name(NULL, "fan");
if (!np) if (!np)
return -ENODEV; return -ENODEV;
......
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