Commit fd2d5b6a authored by Colin Leroy's avatar Colin Leroy Committed by Linus Torvalds

[PATCH] Make therm_adt746x handle latest powerbooks

This patch lets therm_adt746x handle the latest powerbooks.  In these ones,
Apple doesn't put the i2c bus number in the "reg" property of the fan node.
 Instead, we can get the bus number from the fan node path, which looks
like "/proc/device-tree/.../i2c-bus@1/.../fan".  Here's a patch that
handles both old and new form.
Signed-off-by: default avatarColin Leroy <colin@colino.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8cd21364
......@@ -548,7 +548,15 @@ thermostat_init(void)
prop = (u32 *)get_property(np, "reg", NULL);
if (!prop)
return -ENODEV;
/* look for bus either by path or using "reg" */
if (strstr(np->full_name, "/i2c-bus@") != NULL) {
const char *tmp_bus = (strstr(np->full_name, "/i2c-bus@") + 9);
therm_bus = tmp_bus[0]-'0';
} else {
therm_bus = ((*prop) >> 8) & 0x0f;
}
therm_address = ((*prop) & 0xff) >> 1;
printk(KERN_INFO "adt746x: Thermostat bus: %d, address: 0x%02x, "
......
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