aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c/busses
diff options
context:
space:
mode:
authorAlexander Aring <a.aring@phytec.de>2011-12-08 15:43:53 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2012-01-25 16:13:52 -0800
commita92ad2dcdcb74c7813e2dd88d2635a1831894808 (patch)
tree43d061693a7715732ad4bc1cfa671530d369611d /drivers/i2c/busses
parent8962e9fcab14954ac4489089827e24e8c29f7038 (diff)
downloadkernel_samsung_smdk4412-a92ad2dcdcb74c7813e2dd88d2635a1831894808.zip
kernel_samsung_smdk4412-a92ad2dcdcb74c7813e2dd88d2635a1831894808.tar.gz
kernel_samsung_smdk4412-a92ad2dcdcb74c7813e2dd88d2635a1831894808.tar.bz2
I2C: OMAP: correct SYSC register offset for OMAP4
commit 2727b1753934e154931d6b3bdf20c9b2398457a2 upstream. Correct OMAP_I2C_SYSC_REG offset in omap4 register map. Offset 0x20 is reserved and OMAP_I2C_SYSC_REG has 0x10 as offset. Signed-off-by: Alexander Aring <a.aring@phytec.de> [khilman@ti.com: minor changelog edits] Signed-off-by: Kevin Hilman <khilman@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c/busses')
-rw-r--r--drivers/i2c/busses/i2c-omap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index fa23faa..257c1a5 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -235,7 +235,7 @@ static const u8 reg_map_ip_v2[] = {
[OMAP_I2C_BUF_REG] = 0x94,
[OMAP_I2C_CNT_REG] = 0x98,
[OMAP_I2C_DATA_REG] = 0x9c,
- [OMAP_I2C_SYSC_REG] = 0x20,
+ [OMAP_I2C_SYSC_REG] = 0x10,
[OMAP_I2C_CON_REG] = 0xa4,
[OMAP_I2C_OA_REG] = 0xa8,
[OMAP_I2C_SA_REG] = 0xac,