Skip to contentSkip to conversation

OMAP3 I2C Fix the sampling clock.

PATCH New Tom Rix 1 participant 1 message Jun 6, 2009 I2C

lore
Share & tools
lore

Tom Rix

author
#0 lore raw

PATCH 1/1 OMAP3 I2C Fix the sampling clock.

This problem is seen on Zoom1 and Zoom2 in the startup and when i2c probe is used

Before :

In:    serial
Out:   serial
Err:   serial
timed out in wait_for_bb: I2C_STAT=1000
timed out in wait_for_bb: I2C_STAT=1000
timed out in wait_for_bb: I2C_STAT=1000
timed out in wait_for_pin: I2C_STAT=1000
I2C read: I/O error
timed out in wait_for_bb: I2C_STAT=1000
timed out in wait_for_bb: I2C_STAT=1000

Die ID #327c00020000000004013ddd05026013
Hit any key to stop autoboot: 0
OMAP3 Zoom1# i2c probe
Valid chip addresses:timed out in wait_for_bb: I2C_STAT=1000
02 03 04 05 06 07 08 09 0A 0B 0C 0D <snip>

After :

In:    serial
Out:   serial
Err:   serial

Die ID #327c00020000000004013ddd05026013
Hit any key to stop autoboot: 0
OMAP3 Zoom1# i2c probe
Valid chip addresses: 48 49 4A 4B

The addresses are for the twl4030.

The prescalar that converts the function clock to the sampling clock is hardcoded to 0. The reference manual recommends 7 if the function clock is 96MHz.

Instead of just changing the hardcoded values, the prescalar is calculated from the value I2C_IP_CLK.

The i2c #defines are in kHz. The speed passed into the i2c init routine is in Hz. To be consistent, change the defines to be in Hz.

This was runtime verified on Zoom1, Zoom2, Beagle and Overo. The 400kHz case was verifed on a test Zoom2 configuration.

---
 board/omap3/zoom1/zoom1.c        |    6 +++
 drivers/i2c/omap24xx_i2c.c       |   78 ++++++++++++++++++++++++++++++++++---
 include/asm-arm/arch-omap3/i2c.h |   16 ++++----
 3 files changed, 85 insertions(+), 15 deletions(-)
board/omap3/zoom1/zoom1.c +6 -0
index db4d087..ca91cfc 100644
@@ -76,3 +76,9 @@ void set_muxconf_regs(void)
 	/* platform specific muxes */
 	MUX_ZOOM1_MDK();
 }
+
+int omap_i2c_timing (int speed, int *psc, int *scll, int *sclh)
+{
+	return -1;
+}
+
drivers/i2c/omap24xx_i2c.c +71 -7

92 lines not on this page · raw message

include/asm-arm/arch-omap3/i2c.h +8 -8
index 3937f35..09afca0 100644
@@ -112,14 +112,14 @@
 #define I2C_SCLH_HSSCLH		8
 #define I2C_SCLH_HSSCLH_M	0xFF
 
-#define OMAP_I2C_STANDARD	100
-#define OMAP_I2C_FAST_MODE	400
-#define OMAP_I2C_HIGH_SPEED	3400
-
-#define SYSTEM_CLOCK_12		12000
-#define SYSTEM_CLOCK_13		13000
-#define SYSTEM_CLOCK_192	19200
-#define SYSTEM_CLOCK_96		96000
+#define OMAP_I2C_STANDARD	100000
+#define OMAP_I2C_FAST_MODE	400000
+#define OMAP_I2C_HIGH_SPEED	3400000
+
+#define SYSTEM_CLOCK_12		12000000
+#define SYSTEM_CLOCK_13		13000000
+#define SYSTEM_CLOCK_192	19200000
+#define SYSTEM_CLOCK_96		96000000
 
 #define I2C_IP_CLK		SYSTEM_CLOCK_96
 #define I2C_PSC_MAX		0x0f
Signature · 4 lines
1.6.0.5


--------------020405030502040603040607--