[PATCHv2] OMAP4: I2C: Enable the wakeup in I2C_WE

[PATCHv2] OMAP4: I2C: Enable the wakeup in I2C_WE

[Shubhrajyoti D]

Currently for OMAP4 the I2C_WE is not programmed.
This patch enables the programming for OMAP4.

This patch fixes a bad conflict resolution.
This effectively restores the following commit

Commit 120bdaa47[i2c-omap: Program I2C_WE on OMAP4 to enable i2c wakeup] 

which got changed by

Commit a3a7acbc[I2C: OMAP2+: address confused probed version naming] 

Reviewed-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
Reported-by: Santosh Shilimkar <santosh.shilimkar-l0cyMroinI0@public.gmane.org>
Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>
---
TODO:
Currently all the wakeup sources are enabled.
There is scope of optimising the same. Will revisit it.
Rebased on Kevin's wip/i2c branch
Tested on OMAP4430.

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

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index d05efe7..18cc0af 100644
--- a/drivers/i2c/busses/i2c-omap.c
+++ b/drivers/i2c/busses/i2c-omap.c
@@ -313,9 +313,8 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
 		 * REVISIT: Some wakeup sources might not be needed.
 		 */
 		dev->westate = OMAP_I2C_WE_ALL;
-		if (dev->rev < OMAP_I2C_REV_ON_3530_4430)
-			omap_i2c_write_reg(dev, OMAP_I2C_WE_REG,
-							dev->westate);
+		omap_i2c_write_reg(dev, OMAP_I2C_WE_REG,
+						dev->westate);
 	}
 	omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);
 
-- 
1.7.1

Re: [PATCHv2] OMAP4: I2C: Enable the wakeup in I2C_WE

[Kevin Hilman]

Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org> writes:

> Currently for OMAP4 the I2C_WE is not programmed.
> This patch enables the programming for OMAP4.
>
> This patch fixes a bad conflict resolution.

...by me I guess, sorry about that.

> This effectively restores the following commit
>
> Commit 120bdaa47[i2c-omap: Program I2C_WE on OMAP4 to enable i2c wakeup] 
>
> which got changed by
>
> Commit a3a7acbc[I2C: OMAP2+: address confused probed version naming] 
>
> Reviewed-by: Felipe Balbi <balbi-l0cyMroinI0@public.gmane.org>
> Reported-by: Santosh Shilimkar <santosh.shilimkar-l0cyMroinI0@public.gmane.org>
> Signed-off-by: Shubhrajyoti D <shubhrajyoti-l0cyMroinI0@public.gmane.org>

Thanks, adding to my wip/i2c branch.  I'll shortly be breaking that
branch up into fixes for v3.1 (like this one) and stuff proposed for
3.2.  The branch names will be something like for_3.1/i2c-fixes and
for_3.2/i2c

Kevin




> ---
> TODO:
> Currently all the wakeup sources are enabled.
> There is scope of optimising the same. Will revisit it.
> Rebased on Kevin's wip/i2c branch
> Tested on OMAP4430.
>
>  drivers/i2c/busses/i2c-omap.c |    5 ++---
>  1 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index d05efe7..18cc0af 100644
> --- a/drivers/i2c/busses/i2c-omap.c
> +++ b/drivers/i2c/busses/i2c-omap.c
> @@ -313,9 +313,8 @@ static int omap_i2c_init(struct omap_i2c_dev *dev)
>  		 * REVISIT: Some wakeup sources might not be needed.
>  		 */
>  		dev->westate = OMAP_I2C_WE_ALL;
> -		if (dev->rev < OMAP_I2C_REV_ON_3530_4430)
> -			omap_i2c_write_reg(dev, OMAP_I2C_WE_REG,
> -							dev->westate);
> +		omap_i2c_write_reg(dev, OMAP_I2C_WE_REG,
> +						dev->westate);
>  	}
>  	omap_i2c_write_reg(dev, OMAP_I2C_CON_REG, 0);

Re: [PATCHv2] OMAP4: I2C: Enable the wakeup in I2C_WE

[Kevin Hilman]

Shubhrajyoti D <shubhrajyoti@ti.com> writes:

> Currently for OMAP4 the I2C_WE is not programmed.
> This patch enables the programming for OMAP4.
>
> This patch fixes a bad conflict resolution.
> This effectively restores the following commit
>
> Commit 120bdaa47[i2c-omap: Program I2C_WE on OMAP4 to enable i2c wakeup] 
>
> which got changed by
>
> Commit a3a7acbc[I2C: OMAP2+: address confused probed version naming] 
>
> Reviewed-by: Felipe Balbi <balbi@ti.com>
> Reported-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Signed-off-by: Shubhrajyoti D <shubhrajyoti@ti.com>
> ---
> TODO:
> Currently all the wakeup sources are enabled.
> There is scope of optimising the same. Will revisit it.
> Rebased on Kevin's wip/i2c branch

Actually, this is based on top of your I2C reset series.

Please rebase this onto my for_3.1/i2c-andy branch, and I'll queue it as
a fix for v3.1.

Thanks,

Kevin

Re: [PATCHv2] OMAP4: I2C: Enable the wakeup in I2C_WE

[Shubhrajyoti]

On Wednesday 03 August 2011 04:46 AM, Kevin Hilman wrote:
> Shubhrajyoti D<shubhrajyoti@ti.com>  writes:
>
>> Currently for OMAP4 the I2C_WE is not programmed.
>> This patch enables the programming for OMAP4.
>>
>> This patch fixes a bad conflict resolution.
>> This effectively restores the following commit
>>
>> Commit 120bdaa47[i2c-omap: Program I2C_WE on OMAP4 to enable i2c wakeup]
>>
>> which got changed by
>>
>> Commit a3a7acbc[I2C: OMAP2+: address confused probed version naming]
>>
>> Reviewed-by: Felipe Balbi<balbi@ti.com>
>> Reported-by: Santosh Shilimkar<santosh.shilimkar@ti.com>
>> Signed-off-by: Shubhrajyoti D<shubhrajyoti@ti.com>
>> ---
>> TODO:
>> Currently all the wakeup sources are enabled.
>> There is scope of optimising the same. Will revisit it.
>> Rebased on Kevin's wip/i2c branch
> Actually, this is based on top of your I2C reset series.
>
> Please rebase this onto my for_3.1/i2c-andy branch, and I'll queue it as
> a fix for v3.1.
yes will rebase and send.
> Thanks,
>
> Kevin