diff options
-rw-r--r-- | arch/arm/mach-sa1100/collie.c | 4 | ||||
-rw-r--r-- | drivers/mfd/ucb1x00-core.c | 2 | ||||
-rw-r--r-- | drivers/mfd/ucb1x00.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c index a6bab50dab61..a0dfa390e34b 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_pcmcia_config = { | |||
83 | 83 | ||
84 | 84 | ||
85 | static struct mcp_plat_data collie_mcp_data = { | 85 | static struct mcp_plat_data collie_mcp_data = { |
86 | .mccr0 = MCCR0_ADM, | 86 | .mccr0 = MCCR0_ADM | MCCR0_ExtClk, |
87 | .sclk_rate = 11981000, | 87 | .sclk_rate = 9216000, |
88 | }; | 88 | }; |
89 | 89 | ||
90 | #ifdef CONFIG_SHARP_LOCOMO | 90 | #ifdef CONFIG_SHARP_LOCOMO |
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 | } |
diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h index 9c9a647d8b7b..ca8df8072d43 100644 --- a/drivers/mfd/ucb1x00.h +++ b/drivers/mfd/ucb1x00.h | |||
@@ -94,6 +94,7 @@ | |||
94 | #define UCB_ID 0x0c | 94 | #define UCB_ID 0x0c |
95 | #define UCB_ID_1200 0x1004 | 95 | #define UCB_ID_1200 0x1004 |
96 | #define UCB_ID_1300 0x1005 | 96 | #define UCB_ID_1300 0x1005 |
97 | #define UCB_ID_TC35143 0x9712 | ||
97 | 98 | ||
98 | #define UCB_MODE 0x0d | 99 | #define UCB_MODE 0x0d |
99 | #define UCB_MODE_DYN_VFLAG_ENA (1 << 12) | 100 | #define UCB_MODE_DYN_VFLAG_ENA (1 << 12) |