aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorVasily Khoruzhick <anarsoul@gmail.com>2011-03-13 15:53:28 +0200
committerBen Dooks <ben-linux@fluff.org>2011-03-21 09:24:08 +0000
commit23e74a86ab43e5cccbf90edb76fc396e36acc998 (patch)
tree50df03c41e29b7f9cf496b5ef29b3680e9c326b7 /drivers/i2c
parentbaa8cab012ff07d6835580b19c2fd93a20627823 (diff)
downloadkernel_samsung_smdk4412-23e74a86ab43e5cccbf90edb76fc396e36acc998.zip
kernel_samsung_smdk4412-23e74a86ab43e5cccbf90edb76fc396e36acc998.tar.gz
kernel_samsung_smdk4412-23e74a86ab43e5cccbf90edb76fc396e36acc998.tar.bz2
i2c-pxa2xx: Fix register offsets
Fix regression that was introduced by dynamic register layout. Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-pxa.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/i2c/busses/i2c-pxa.c b/drivers/i2c/busses/i2c-pxa.c
index 27b28e7..b914184 100644
--- a/drivers/i2c/busses/i2c-pxa.c
+++ b/drivers/i2c/busses/i2c-pxa.c
@@ -66,18 +66,18 @@ enum pxa_i2c_types {
static struct pxa_reg_layout pxa_reg_layout[] = {
[REGS_PXA2XX] = {
.ibmr = 0x00,
- .idbr = 0x10,
- .icr = 0x20,
- .isr = 0x30,
- .isar = 0x40,
- },
- [REGS_PXA3XX] = {
- .ibmr = 0x00,
.idbr = 0x08,
.icr = 0x10,
.isr = 0x18,
.isar = 0x20,
},
+ [REGS_PXA3XX] = {
+ .ibmr = 0x00,
+ .idbr = 0x04,
+ .icr = 0x08,
+ .isr = 0x0c,
+ .isar = 0x10,
+ },
[REGS_CE4100] = {
.ibmr = 0x14,
.idbr = 0x0c,