OMAP2/3: I2C: Errata ID i207: Clear wrong RDR interrupt
Subsystems (6)
PATCH v7 1/1 OMAP2/3: I2C: Errata ID i207: Clear wrong RDR interrupt
Under certain rare conditions, I2C_STAT[13].RDR bit may be set and the corresponding interrupt fire, even there is no data in the receive FIFO, or the I2C data transfer is still ongoing. These spurious RDR events must be ignored by the software.
This patch handles and ignores RDR spurious interrupts.
The below sequence is required in interrupt handler for handling this errata:
1. If RDR is set to 1, clear RDR
2. Read I2C status register and check for BusBusy bit. If BusBusy bit is set, skip remaining steps.
3. If BusBusy bit is not set, perform read operation on I2C status register.
4. If RDR is set, clear the same. Check RDR again and clear if it sets RDR bit again.
5. Perform I2C Data Read operation N number of times(where N is value read from the register BUFSTAT-RXSTAT bit fields).
Note:
This errata is not applicable for omap2420 and omap4. It is applicable for:
1. omap2430
2. omap34xx(including omap3630).
--- drivers/i2c/busses/i2c-omap.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 40 insertions(+), 0 deletions(-)
drivers/i2c/busses/i2c-omap.c +40 -0
@@ -166,6 +166,8 @@ enum {#define SYSC_IDLEMODE_SMART 0x2#define SYSC_CLOCKACTIVITY_FCLK 0x2 +/* Errata definitions */ +#define I2C_OMAP_ERRATA_I207 (1 << 0)struct omap_i2c_dev {struct device *dev;
@@ -199,6 +201,7 @@ struct omap_i2c_dev {u16 bufstate;u16 syscstate;u16 westate; +u16 errata; };const static u8 reg_map[] = {
@@ -498,6 +501,11 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)/* Take the I2C module out of reset: */ omap_i2c_write_reg (dev,OMAP_I2C_CON_REG ,OMAP_I2C_CON_EN ); + dev->errata =0 ; + +if (cpu_is_omap2430 () ||cpu_is_omap34xx ()) + dev->errata |=I2C_OMAP_ERRATA_I207 ; +/* Enable interrupts */ dev->iestate = (OMAP_I2C_IE_XRDY | OMAP_I2C_IE_RRDY | OMAP_I2C_IE_ARDY | OMAP_I2C_IE_NACK |
@@ -695,6 +703,34 @@ omap_i2c_ack_stat(struct omap_i2c_dev *dev, u16 stat)omap_i2c_write_reg (dev,OMAP_I2C_STAT_REG , stat); } +static inline void i2c_omap_errata_i207 (struct omap_i2c_dev *dev,u16 stat) +{ +/* +* I2C Errata(Errata Nos. OMAP2: 1.67, OMAP3: 1.8) +* Not applicable for OMAP4. +* Under certain rare conditions, RDR could be set again +* when the bus is busy, then ignore the interrupt and +* clear the interrupt. +*/ +if (stat &OMAP_I2C_STAT_RDR ) { +/* Step 1: If RDR is set, clear it */ +omap_i2c_ack_stat (dev,OMAP_I2C_STAT_RDR ); + +/* Step 2: */ +if (!(omap_i2c_read_reg (dev,OMAP_I2C_STAT_REG ) + &OMAP_I2C_STAT_BB )) { + +/* Step 3: */ +if (omap_i2c_read_reg (dev,OMAP_I2C_STAT_REG ) + &OMAP_I2C_STAT_RDR ) { +omap_i2c_ack_stat (dev,OMAP_I2C_STAT_RDR ); +dev_dbg (dev->dev,"RDR when bus is busy.\n" ); + } + + } + } +} +/* rev1 devices are apparently only on some 15xx */ #ifdef CONFIG_ARCH_OMAP15XX
@@ -826,6 +862,10 @@ complete: }if (stat & (OMAP_I2C_STAT_RRDY |OMAP_I2C_STAT_RDR )) {u8 num_bytes =1 ; + +if (dev->errata &I2C_OMAP_ERRATA_I207 ) +i2c_omap_errata_i207 (dev, stat); +if (dev->fifo_size) {if (stat &OMAP_I2C_STAT_RRDY ) num_bytes = dev->fifo_size;
Signature · 1 line
1.6.0.4
PATCH v2 1/1 OMAP3: Registering sgx device and it's platform data
The SGX powervr_device is registered with it's platform specific data to provide information about setting constraint through omap_pm_set_min_bus_tput.
--- arch/arm/mach-omap2/devices.c | 26 ++++++++++++++++++++++- arch/arm/mach-omap2/include/mach/omap_sgxdef.h | 11 ++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 arch/arm/mach-omap2/include/mach/omap_sgxdef.h
arch/arm/mach-omap2/devices.c +24 -2
@@ -26,7 +26,7 @@#include <plat/mux.h> #include <mach/gpio.h> #include <plat/mmc.h> - +#include <mach/omap_sgxdef.h> #include "mux.h" #if defined(CONFIG_VIDEO_OMAP2 ) || defined(CONFIG_VIDEO_OMAP2_MODULE )
@@ -786,6 +786,28 @@ static inline void omap_hdq_init(void)static inline void omap_hdq_init (void ) {}#endif +struct sgx_platform_data omap_sgx_data = { +#ifdef CONFIG_PM + .set_min_bus_tput = omap_pm_set_min_bus_tput, +#else + .set_min_bus_tput = NULL; +#endif +}; + +static struct platform_device powervr_device = { + .name ="pvrsrvkm" , + .id =-1 , + .dev = { + .platform_data = &omap_sgx_data, + } +}; + +static void omap_init_sgx (void ) +{ + (void )platform_device_register (&powervr_device); +} + +/*-------------------------------------------------------------------------*/ static int __init omap2_init_devices (void )
@@ -800,7 +822,7 @@ static int __init omap2_init_devices(void)omap_hdq_init ();omap_init_sti ();omap_init_sha1_md5 (); - +omap_init_sgx ();return 0 ; }arch_initcall (omap2_init_devices);
arch/arm/mach-omap2/include/mach/omap_sgxdef.h new file +11 -0
@@ -0,0 +1,11 @@ +#ifndef OMAP_SGXDEF_H +#define OMAP_SGXDEF_H + +#include <plat/omap-pm.h> + +struct sgx_platform_data { +void (*set_min_bus_tput)(struct device *dev,u8 agent_id, +unsigned long r); +}; + +#endif
Signature · 1 line
1.6.0.4
RE: [PATCH v2] OMAP3: Registering sgx device and it's platform data
Quoted 45 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of G, Manjunath Kondaiah
Sent: Tuesday, May 04, 2010 9:30 PM
To: [email protected]
Cc: Agarwal, Preshit; Tony Lindgren; Kevin Hilman; Turquette, Mike; V, Hemanth
Subject: [PATCH v2] OMAP3: Registering sgx device and it's platform dataThe SGX
powervr_deviceis registered with it's platform specific data to provide information about setting constraint throughomap_pm_set_min_bus_tput.Signed-off-by Preshit Agarwal <[email protected]>Signed-off-by Manjunatha GK <[email protected]>Cc Tony Lindgren <[email protected]>Cc Kevin Hilman <[email protected]>Cc Mike Turquette <[email protected]>Cc Hemanth V <[email protected]>--- arch/arm/mach-omap2/devices.c | 26 ++++++++++++++++++++++- arch/arm/mach-omap2/include/mach/omap_sgxdef.h | 11 ++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) create mode 100644 arch/arm/mach-omap2/include/mach/omap_sgxdef.harch/arm/mach-omap2/devices.c +1
-1@@ -26,7 +26,7 @@#include <plat/mux.h> #include <mach/gpio.h> #include <plat/mmc.h> - +#include <mach/omap_sgxdef.h> #include "mux.h" #if defined(CONFIG_VIDEO_OMAP2 ) || defined(CONFIG_VIDEO_OMAP2_MODULE )
arch/arm/mach-omap2/devices.c static inline void omap_hdq_init(void) · line 793
Quoted 8 lines
arch/arm/mach-omap2/devices.c +5
-0@@ -786,6 +786,28 @@ static inline void omap_hdq_init(void)static inline void omap_hdq_init (void ) {}#endif +struct sgx_platform_data omap_sgx_data = { +#ifdef CONFIG_PM + .set_min_bus_tput = omap_pm_set_min_bus_tput, +#else + .set_min_bus_tput = NULL;
This seems to be breaking build if we disable the PM. I will fix it and post the next version.
-Manjunath
Tony Lindgren
maintainerPATCH v7 1/1 OMAP2/3: I2C: Errata ID i207: Clear wrong RDR interrupt
In reply to Manjunatha GKThis patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: i2c-omap-for-ben
Initial commit ID (Likely to change): c62d437a11ff76be3ba3997a1ded33848ba41ece
PatchWorks
http://patchwork.kernel.org/patch/96816/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=c62d437a11ff76be3ba3997a1ded33848ba41ece