diff options
author | Pavel Machek <pavel@ucw.cz> | 2006-07-11 17:54:15 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-07-11 17:54:15 -0400 |
commit | b94ea6c08d9f9ac5339b1c2025ce3ca87b007200 (patch) | |
tree | b41f199663f6053343b9e48b3624ec5238dae0c8 /drivers/mfd/ucb1x00-core.c | |
parent | dc5bc8f1e96c32f28bddf32a14ef9251fb3071d0 (diff) |
[ARM] 3727/1: fix ucb initialization on collie
Patch from Pavel Machek
From: Dirk Opfer <Dirk@Opfer-Online.de>
Fix ucb initialization on collie. Wrong frequency was used and that
led to things not working quite correctly. (I had to actually disable
checks in my tree to get it to boot). It now includes all the
neccessary parts to get it to compile :-).
Signed-off-by: Pavel Machek <pavel@suse.cz>
Acked-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/mfd/ucb1x00-core.c')
-rw-r--r-- | drivers/mfd/ucb1x00-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index 632bc218c86a..2bf32721eb53 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c | |||
@@ -479,7 +479,7 @@ static int ucb1x00_probe(struct mcp *mcp) | |||
479 | mcp_enable(mcp); | 479 | mcp_enable(mcp); |
480 | id = mcp_reg_read(mcp, UCB_ID); | 480 | id = mcp_reg_read(mcp, UCB_ID); |
481 | 481 | ||
482 | if (id != UCB_ID_1200 && id != UCB_ID_1300) { | 482 | if (id != UCB_ID_1200 && id != UCB_ID_1300 && id != UCB_ID_TC35143) { |
483 | printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id); | 483 | printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id); |
484 | goto err_disable; | 484 | goto err_disable; |
485 | } | 485 | } |