[PATCH] i2c_omap: correct OMAP_I2C_SYSC_REG offset

[PATCH] i2c_omap: correct OMAP_I2C_SYSC_REG offset

[Alexander Aring]

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-guT5V/WYfQezQB+pC5nmwQ@public.gmane.org>
---
 drivers/i2c/busses/i2c-omap.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
index a43d002..fc3bb37 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,
-- 
1.7.0.4

Re: [PATCH] i2c_omap: correct OMAP_I2C_SYSC_REG offset

[Kevin Hilman]

Alexander Aring <a.aring-guT5V/WYfQezQB+pC5nmwQ@public.gmane.org> writes:

> 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-guT5V/WYfQezQB+pC5nmwQ@public.gmane.org>

Thanks for the patch!

A different approach to fix this is being done by Shubhrajyoti[1] as
part of his reset series.

However, I think we should probably apply this patch for v3.2 and also
send to the stable kernel for v3.0 & v3.1.

Shubhrajyoti/Jon, any objections to me queuing this fix for v3.2 (and
stable.)  It would just mean rebasing your other fixes and cleanup
series on top of this.

Thanks,

Kevin

[1] http://marc.info/?l=linux-omap&m=132281779526640&w=2

> ---
>  drivers/i2c/busses/i2c-omap.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
> index a43d002..fc3bb37 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,

Re: [PATCH] i2c_omap: correct OMAP_I2C_SYSC_REG offset

[Jon Hunter]

Hi Kevin,

On 12/8/2011 12:12, Kevin Hilman wrote:
> Alexander Aring<a.aring-guT5V/WYfQezQB+pC5nmwQ@public.gmane.org>  writes:
>
>> 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-guT5V/WYfQezQB+pC5nmwQ@public.gmane.org>
>
> Thanks for the patch!
>
> A different approach to fix this is being done by Shubhrajyoti[1] as
> part of his reset series.
>
> However, I think we should probably apply this patch for v3.2 and also
> send to the stable kernel for v3.0&  v3.1.
>
> Shubhrajyoti/Jon, any objections to me queuing this fix for v3.2 (and
> stable.)  It would just mean rebasing your other fixes and cleanup
> series on top of this.

I have no issue with that and I am in favour of getting the fix in now.

Cheers
Jon

>
>> ---
>>   drivers/i2c/busses/i2c-omap.c |    2 +-
>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
>> index a43d002..fc3bb37 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,

Re: [PATCH] i2c_omap: correct OMAP_I2C_SYSC_REG offset

[Shubhrajyoti]

On Friday 09 December 2011 01:01 AM, Jon Hunter wrote:
> Hi Kevin,
>
> On 12/8/2011 12:12, Kevin Hilman wrote:
>> Alexander Aring<a.aring-guT5V/WYfQezQB+pC5nmwQ@public.gmane.org>  writes:
>>
>>> 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-guT5V/WYfQezQB+pC5nmwQ@public.gmane.org>
>>
>> Thanks for the patch!
>>
>> A different approach to fix this is being done by Shubhrajyoti[1] as
>> part of his reset series.
>>
>> However, I think we should probably apply this patch for v3.2 and also
>> send to the stable kernel for v3.0&  v3.1.
>>
>> Shubhrajyoti/Jon, any objections to me queuing this fix for v3.2 (and
>> stable.)  It would just mean rebasing your other fixes and cleanup
>> series on top of this.
>
> I have no issue with that and I am in favour of getting the fix in now.
I too have no issues.
>
> Cheers
> Jon
>
>>
>>> ---
>>>   drivers/i2c/busses/i2c-omap.c |    2 +-
>>>   1 files changed, 1 insertions(+), 1 deletions(-)
>>>
>>> diff --git a/drivers/i2c/busses/i2c-omap.c
>>> b/drivers/i2c/busses/i2c-omap.c
>>> index a43d002..fc3bb37 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,

Re: [PATCH] i2c_omap: correct OMAP_I2C_SYSC_REG offset

[Kevin Hilman]

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

> On Friday 09 December 2011 01:01 AM, Jon Hunter wrote:
>> Hi Kevin,
>>
>> On 12/8/2011 12:12, Kevin Hilman wrote:
>>> Alexander Aring<a.aring-guT5V/WYfQezQB+pC5nmwQ@public.gmane.org>  writes:
>>>
>>>> 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-guT5V/WYfQezQB+pC5nmwQ@public.gmane.org>
>>>
>>> Thanks for the patch!
>>>
>>> A different approach to fix this is being done by Shubhrajyoti[1] as
>>> part of his reset series.
>>>
>>> However, I think we should probably apply this patch for v3.2 and also
>>> send to the stable kernel for v3.0&  v3.1.
>>>
>>> Shubhrajyoti/Jon, any objections to me queuing this fix for v3.2 (and
>>> stable.)  It would just mean rebasing your other fixes and cleanup
>>> series on top of this.
>>
>> I have no issue with that and I am in favour of getting the fix in now.
> I too have no issues.

OK, I've added this to my for_3.2/fixes/i2c branch.

Thanks,

Kevin

Re: [PATCH] i2c_omap: correct OMAP_I2C_SYSC_REG offset

[Kevin Hilman]

Ben,

[...]

>>> Shubhrajyoti/Jon, any objections to me queuing this fix for v3.2 (and
>>> stable.)  It would just mean rebasing your other fixes and cleanup
>>> series on top of this.
>>
>> I have no issue with that and I am in favour of getting the fix in now.
> I too have no issues.

I've queued this fix in my i2c fixes branch[1], and added a 
Cc: stable@kernel.org so it makes it into stable as well.

Note, This branch also includes the other fix I sent a couple days
ago[2], so pulling this branch will get you all the OMAP I2C fixes for
v3.2.

Thanks,

Kevin

[1]
git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm.git for_3.2/fixes/i2c

[2] Subject: [PATCH] I2C: OMAP: fix FIFO usage for OMAP4.