fix ucb initialization on collie

PATCH New Pavel Machek 1 participant 1 message Jul 10, 2006

Subsystems (3)

Arm (32-bit) Arm sub-architectures Multifunction devices (MFD)

lore

Share & tools

lore

Pavel Machek

author

2006-07-10 19:50 UTC #0 lore raw

PATCH 1/1 fix ucb initialization on collie

From: Dirk Opfer <[email protected]>

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 <[email protected]>

PATCH FOLLOWS
KernelVersion: 2.6.18-rc1-git

drivers/mfd/ucb1x00.h +1 -0

index 9c9a647..ca8df80 100644
@@ -94,6 +94,7 @@
 #define UCB_ID		0x0c
 #define UCB_ID_1200		0x1004
 #define UCB_ID_1300		0x1005
+#define UCB_ID_TC35143          0x9712
 
 #define UCB_MODE	0x0d
 #define UCB_MODE_DYN_VFLAG_ENA	(1 << 12)

arch/arm/mach-sa1100/collie.c +2 -2

index a6bab50..5e2a84e 100644
@@ -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

drivers/mfd/ucb1x00-core.c +1 -1

index 632bc21..8a93563 100644
@@ -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;
 	}

Signature · 2 lines

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