I2C cleanups

The omap_i2c_remove function may not be needed after device exit so the memory could be freed.

Signed-off-by Shubhrajyoti D <[email protected]>

Quoted 4 lines · Shubhrajyoti D

The omap_i2c_remove function may not be needed after device exit so the memory could be freed.

Signed-off-by Shubhrajyoti D <[email protected]>

Changed the title from "optimise" to "annotate" and pushed to next.

Use SET_RUNTIME_PM_OPS macro to set runtime functions.

Acked-by Felipe Balbi <[email protected]>

Signed-off-by Shubhrajyoti D <[email protected]>

Use INIT_COMPLETION instead of init_completion in transfer.

Reviewed-by Felipe Balbi <[email protected]>

Signed-off-by Shubhrajyoti D <[email protected]>

---
- Add Felipe's reviewed-by tag

?drivers/i2c/busses/i2c-omap.c | ? ?3 ++-
?1 files changed, 2 insertions(+), 1 deletions(-)

drivers/i2c/busses/i2c-omap.c +1 -1

index b9915bb..6d05f18 100644
@@ -490,7 +490,7 @@ static int omap_i2c_xfer_msg(struct i2c_adapter *adap,
 ? ? ? ?w |= OMAP_I2C_BUF_RXFIF_CLR | OMAP_I2C_BUF_TXFIF_CLR;
 ? ? ? ?omap_i2c_write_reg(dev, OMAP_I2C_BUF_REG, w);
 
- ? ? ? init_completion(&dev->cmd_complete);
+ ? ? ? INIT_COMPLETION(dev->cmd_complete);
 ? ? ? ?dev->cmd_err = 0;
 
 ? ? ? ?w = OMAP_I2C_CON_EN | OMAP_I2C_CON_MST | OMAP_I2C_CON_STT;

Use INIT_COMPLETION instead of init_completion in transfer.

Reviewed-by Felipe Balbi <[email protected]>

Signed-off-by Shubhrajyoti D <[email protected]>

---
- Add Felipe's reviewed-by tag

?drivers/i2c/busses/i2c-omap.c | ? ?3 ++-
?1 files changed, 2 insertions(+), 1 deletions(-)

(quoted diff) +0 -0

b/drivers/i2c/busses/i2c-omap.c index b9915bb..6d05f18 100644

drivers/i2c/busses/i2c-omap.c +1 -1

@@ -490,7 +490,7 @@ static int omap_i2c_xfer_msg(struct i2c_adapter 
 *adap,
 ? ? ? ?w |= OMAP_I2C_BUF_RXFIF_CLR | OMAP_I2C_BUF_TXFIF_CLR;
 ? ? ? ?omap_i2c_write_reg(dev, OMAP_I2C_BUF_REG, w);
 
- ? ? ? init_completion(&dev->cmd_complete);
+ ? ? ? INIT_COMPLETION(dev->cmd_complete);
 ? ? ? ?dev->cmd_err = 0;
 

? ? ? ?w = OMAP_I2C_CON_EN | OMAP_I2C_CON_MST | OMAP_I2C_CON_STT; @@ -999,6 +999,7 @@ omap_i2c_probe(struct platform_device *pdev) ? ? ? ?}

? ? ? ?platform_set_drvdata(pdev, dev);
+ ? ? ? init_completion(&dev->cmd_complete);

Use INIT_COMPLETION instead of init_completion in transfer.

Reviewed-by Felipe Balbi <[email protected]>

Signed-off-by Shubhrajyoti D <[email protected]>

Quoted 2 lines

Reviewed-by Felipe Balbi <[email protected]>

Quoted 1 line

Signed-off-by Shubhrajyoti D <[email protected]>

Applied to next, thanks.

Remove the definition of SYSS_RESETDONE_MASK and use the one in omap_hwmod.h.

Reviewed-by Felipe Balbi <[email protected]>

Signed-off-by Shubhrajyoti D <[email protected]>

---
- Add Felipe's reviewed by tag

 drivers/i2c/busses/i2c-omap.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

drivers/i2c/busses/i2c-omap.c +0 -0

index 6d05f18..4bbf288 100644

Quoted 1 line

+#include <plat/omap_hwmod.h>

Hmmm, so far the driver has no plat/mach dependencies and now this gets added. Need to think about it a bit more...

From: Jon Hunter <[email protected]>

The OMAP3530 is based upon the same silicon as the OMAP3430 and so the I2C revision is the same for 3430 and 3530. However, the OMAP3630 device has the same I2C revision as OMAP4. Correct the revision definition to reflect this.

This patch is based on work done by Jon Hunter <[email protected]> Changes from his patch
- Update OMAP_I2C_REV_ON_3430 also to reflect that it is same as 3530

Reviewed-by Felipe Balbi <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

Signed-off-by Shubhrajyoti D <[email protected]>

Quoted 5 lines

- Update OMAP_I2C_REV_ON_3430 also to reflect that it is same as 3530

Quoted 4 lines

Reviewed-by Felipe Balbi <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

Signed-off-by Shubhrajyoti D <[email protected]>

Applied to next, thanks.

From: Vikram Pandita <[email protected]>

In case a peripheral is driving SDA bus low (ie. a start condition), provide a constant clock output using the test mode of the OMAP I2C controller to try and clear the bus. Soft reset I2C controller after attempting the bus clear to ensure that controller is in a good state.

Based upon Vikram Pandita's patch from TI Android 3.0. I acknowledge the contributions and suggestions of Jon and Hemant.

A couple differences from the original patch ...
1. Add a new function for bus clear
2. Ensure that the CON.I2C_EN bit is set when using the SYSTEST feature to output a permanent clock. This bit needs to be set and typically it would be set by the unidle function but this is not the case for all OMAP generations.
3. Program the SYSTEST setting only the bits we care about. However, restore SYSTEST registers to there original state as some OMAP generations do not implement perform a soft-reset.
4. Clear the CON register after performing the bus clear, so when we call the init function the controller is disabled and the init function will re-enable later.

Original patch can be found here:
http://git.omapzoom.org/?p=kernel/omap.git;a=commit;h=a2ab04192ba25e60f95ba1ff3af5601a2d7b5bd1

Signed-off-by Vikram Pandita <[email protected]>

Signed-off-by Jon Hunter <[email protected]>

Signed-off-by Shubhrajyoti D <[email protected]>

Quoted 3 lines

Signed-off-by Vikram Pandita <[email protected]>

Quoted 2 lines

Signed-off-by Jon Hunter <[email protected]>

Signed-off-by Shubhrajyoti D <[email protected]>

This has to wait a little bit until I can spend time on the recovery framework (which is still in the queue, sadly :( ). There might be some consolidation.

This is a minimal cleanup series.

The patch series does the following

- Bus busy recovery mechanism.
- Make the i2c use SET_RUNTIME_PM_OPS
- Use INIT_COMPLETION instead of init_completion
- the reset patch is dropped will try to rework it as per the review comments recieved.

This applies on Wolfram's i2c-embedded/for-next branch.

Functional testing on omap4430 , 4460 panda and omap3sdp.

The following changes since commit 0f009a914b40be8786fa67b1f4345cacc263b48c:

i2c: tegra: make all resource allocation through devm_* (2012-06-13 16:01:38 +0200)

are available in the git repository at:
git://gitorious.org/linus-tree/linus-tree.git for_next/omap/minimal_cleanup

Jon Hunter (1):
i2c: omap: Correct I2C revision for OMAP3

Shubhrajyoti D (4):
i2c: omap: Optimise the remove code
i2c: omap: Use SET_RUNTIME_PM_OPS
i2c: omap: Do not initialise the completion everytime
i2c: omap: Remove the definition of SYSS_RESETDONE_MASK

Vikram Pandita (1):
i2c: omap: Recover from Bus Busy condition

 drivers/i2c/busses/i2c-omap.c |   60 ++++++++++++++++++++++++++++------------
 1 files changed, 42 insertions(+), 18 deletions(-)

--
1.7.5.4

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 1 line · Shubhrajyoti D

This is a minimal cleanup series.

If there are no further comments can this series be queued?

Quoted 3 lines · Shubhrajyoti Datta

Quoted 1 line · Shubhrajyoti D

This is a minimal cleanup series.

If there are no further comments can this series be queued?

I just applied a few of them. BTW I get a build warning when compiling the kernel, maybe someone is interested. It is not related to the patches, though.

===

WARNING: arch/arm/mach-omap2/built-in.o(.data+0x2b5c0): Section mismatch in reference from the variable rx51_si4713_dev to the (unknown reference) .init.data:(unknown) The variable rx51_si4713_dev references
the (unknown reference) __initdata (unknown)
If the reference is valid then annotate the
variable with __init* or __refdata (see linux/init.h) or name the variable:
*_template, *_timer, *_sht, *_ops, *_probe, *_probe_one, *_console

===

I think this is what I'll pull in for the next merge window. The big OMAP cleanup (latest version from 3. July) would then go in early into -next for 3.7. Is that OK with the omap-people?

Also, thanks to Shubhrajyoti Datta for reviewing other patches on the i2c-list, much appreciated.

Thanks,

Wolfram