diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 16:37:29 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-07-13 16:37:29 -0700 |
| commit | a23f4636c9ae7f1f15c448080f1552864b404136 (patch) | |
| tree | 775049f3486be9eed2261515c55abb14bdbc4d73 /drivers | |
| parent | fc818301a8a39fedd7f0a71f878f29130c72193d (diff) | |
| parent | 5cbc1b6f66313111f64e779bf1df3799bf5c2df8 (diff) | |
| download | kernel_samsung_espresso10-a23f4636c9ae7f1f15c448080f1552864b404136.zip kernel_samsung_espresso10-a23f4636c9ae7f1f15c448080f1552864b404136.tar.gz kernel_samsung_espresso10-a23f4636c9ae7f1f15c448080f1552864b404136.tar.bz2 | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] arch/arm/kernel/bios32.c: no need to set isa_bridge
[ARM] 3729/3: EABI padding rules necessitate the packed attribute of floatx80
[ARM] 3725/1: sharpsl_pm: warn about wrong temperature
[ARM] 3723/1: collie charging
[ARM] 3728/1: Restore missing CPU Hotplug irq helper
[ARM] 3727/1: fix ucb initialization on collie
[ARM] Allow Versatile to be built for AB and PB
[ARM] 3726/1: update {ep93xx,ixp2000,ixp23xx,lpd270,onearm} defconfigs to 2.6.18-rc1
[ARM] 3721/1: Small cleanup for locomo.c
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/mfd/ucb1x00-core.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/ucb1x00.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index 632bc21..2bf3272 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c @@ -479,7 +479,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; } diff --git a/drivers/mfd/ucb1x00.h b/drivers/mfd/ucb1x00.h index 9c9a647..ca8df80 100644 --- a/drivers/mfd/ucb1x00.h +++ b/drivers/mfd/ucb1x00.h @@ -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) |