public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* [patch] fix ucb initialization on collie
@ 2006-07-07 11:41 Pavel Machek
  2006-07-07 15:35 ` Richard Purdie
  2006-10-26 16:37 ` UCB1400 driver problem in pxa270 saravanan_sprt
  0 siblings, 2 replies; 5+ messages in thread
From: Pavel Machek @ 2006-07-07 11:41 UTC (permalink / raw)
  To: rpurdie, lenz, kernel list, patches; +Cc: Dirk


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).

Signed-off-by: Pavel Machek <pavel@suse.cz>

PATCH FOLLOWS
KernelVersion: 2.6.18-rc1-git

diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index a6bab50..5e2a84e 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -83,8 +83,8 @@ static struct scoop_pcmcia_config collie
 
 
 static struct mcp_plat_data collie_mcp_data = {
-	.mccr0          = MCCR0_ADM,
-	.sclk_rate      = 11981000,
+	.mccr0          = MCCR0_ADM | MCCR0_ExtClk,
+	.sclk_rate      = 9216000,
 };
 
 #ifdef CONFIG_SHARP_LOCOMO
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c
index 632bc21..8a93563 100644
--- a/drivers/mfd/ucb1x00-core.c
+++ b/drivers/mfd/ucb1x00-core.c
@@ -479,7 +481,7 @@ static int ucb1x00_probe(struct mcp *mcp
 	mcp_enable(mcp);
 	id = mcp_reg_read(mcp, UCB_ID);
 
-	if (id != UCB_ID_1200 && id != UCB_ID_1300) {
+	if (id != UCB_ID_1200 && id != UCB_ID_1300 && id != UCB_ID_TC35143) {
 		printk(KERN_WARNING "UCB1x00 ID not found: %04x\n", id);
 		goto err_disable;
 	}

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

^ permalink raw reply related	[flat|nested] 5+ messages in thread
[parent not found: <200509111700.j8BH0Oo0023903@hera.kernel.org>]

end of thread, other threads:[~2006-10-26 17:14 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-07-07 11:41 [patch] fix ucb initialization on collie Pavel Machek
2006-07-07 15:35 ` Richard Purdie
2006-10-26 16:37 ` UCB1400 driver problem in pxa270 saravanan_sprt
2006-10-26 17:14   ` Nicolas Pitre
     [not found] <200509111700.j8BH0Oo0023903@hera.kernel.org>
2006-10-26 16:34 ` saravanan_sprt

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox