Patchwork [U-Boot,v2,1/3] Fix at91 includes in soft_i2c driver

login
register
mail settings
Submitter Ryan Mallon
Date Jan. 25, 2011, 10:52 p.m.
Message ID <7bc3ea96fb41d5e41ac53281d77d3158bffd3b21.1295995460.git.ryan@bluewatersys.com>
Download mbox | patch
Permalink /patch/80423/
State Superseded
Delegated to: Reinhard Meyer
Headers show

Comments

Ryan Mallon - Jan. 25, 2011, 10:52 p.m.
Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
---
 drivers/i2c/soft_i2c.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
Wolfgang Denk - Jan. 26, 2011, 7:19 a.m.
Dear Heiko & Reinhard,

In message <7bc3ea96fb41d5e41ac53281d77d3158bffd3b21.1295995460.git.ryan@bluewatersys.com> Ryan Mallon  wrote:
> 
> Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
> ---
>  drivers/i2c/soft_i2c.c |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)

I think this one goes through as a bug fix, i. e. for the upcoming
release.

The other patches of this series go into next.

Best regards,

Wolfgang Denk
Heiko Schocher - Jan. 26, 2011, 7:30 a.m.
Hello Wolfgang and Reinhard,

Wolfgang Denk wrote:
> Dear Heiko & Reinhard,
> 
> In message <7bc3ea96fb41d5e41ac53281d77d3158bffd3b21.1295995460.git.ryan@bluewatersys.com> Ryan Mallon  wrote:
>> Signed-off-by: Ryan Mallon <ryan@bluewatersys.com>
>> ---
>>  drivers/i2c/soft_i2c.c |    4 +---
>>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> I think this one goes through as a bug fix, i. e. for the upcoming
> release.
> 
> The other patches of this series go into next.

Ok. Reinhard? Do you pick up this patch? If so, I give my:

Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
Reinhard Meyer - Jan. 26, 2011, 7:37 a.m.
Dear Heiko Schocher,
> Hello Wolfgang and Reinhard,
>
> Wolfgang Denk wrote:
>> Dear Heiko&  Reinhard,
>>
>> In message<7bc3ea96fb41d5e41ac53281d77d3158bffd3b21.1295995460.git.ryan@bluewatersys.com>  Ryan Mallon  wrote:
>>> Signed-off-by: Ryan Mallon<ryan@bluewatersys.com>
>>> ---
>>>   drivers/i2c/soft_i2c.c |    4 +---
>>>   1 files changed, 1 insertions(+), 3 deletions(-)
>>
>> I think this one goes through as a bug fix, i. e. for the upcoming
>> release.
>>
>> The other patches of this series go into next.
>
> Ok. Reinhard? Do you pick up this patch? If so, I give my:
>
> Acked-by: Heiko Schocher<hs@denx.de>

I was going to complain that it was not alphabetically sorted as I suggested to him,
however I am now considering to remove the AT91RM9200 case altogether.
That one has to be forced into AT91FAMILY.

Once corrected, I will pickup this patch then.

Best Regards,
Reinhard
Heiko Schocher - Jan. 26, 2011, 7:49 a.m.
Hello Reinhard,

Reinhard Meyer wrote:
> Dear Heiko Schocher,
>> Hello Wolfgang and Reinhard,
>>
>> Wolfgang Denk wrote:
>>> Dear Heiko&  Reinhard,
>>>
>>> In
>>> message<7bc3ea96fb41d5e41ac53281d77d3158bffd3b21.1295995460.git.ryan@bluewatersys.com> 
>>> Ryan Mallon  wrote:
>>>> Signed-off-by: Ryan Mallon<ryan@bluewatersys.com>
>>>> ---
>>>>   drivers/i2c/soft_i2c.c |    4 +---
>>>>   1 files changed, 1 insertions(+), 3 deletions(-)
>>>
>>> I think this one goes through as a bug fix, i. e. for the upcoming
>>> release.
>>>
>>> The other patches of this series go into next.
>>
>> Ok. Reinhard? Do you pick up this patch? If so, I give my:
>>
>> Acked-by: Heiko Schocher<hs@denx.de>
> 
> I was going to complain that it was not alphabetically sorted as I
> suggested to him,
> however I am now considering to remove the AT91RM9200 case altogether.
> That one has to be forced into AT91FAMILY.
> 
> Once corrected, I will pickup this patch then.

Ok, thanks!

bye,
Heiko
Reinhard Meyer - Jan. 26, 2011, 8:18 a.m.
Dear Ryan Mellon, dear Heiko Schocher:
>>>>> Signed-off-by: Ryan Mallon<ryan@bluewatersys.com>
>>>>> ---
>>>>>   drivers/i2c/soft_i2c.c |    4 +---
>>>>>   1 files changed, 1 insertions(+), 3 deletions(-)
>>>>
>>>> I think this one goes through as a bug fix, i. e. for the upcoming
>>>> release.
>>>>
>>>> The other patches of this series go into next.
>>>
>>> Ok. Reinhard? Do you pick up this patch? If so, I give my:
>>>
>>> Acked-by: Heiko Schocher<hs@denx.de>
>>
>> I was going to complain that it was not alphabetically sorted as I
>> suggested to him,
>> however I am now considering to remove the AT91RM9200 case altogether.
>> That one has to be forced into AT91FAMILY.
>>
>> Once corrected, I will pickup this patch then.

I made up my mind, it should only test for AT91FAMILY.

AT91RM9200 is supposed to join AT91FAMILY anyway, so lets do this correctly right now.

#if defined(CONFIG_AT91FAMILY)

If its done that way, here is my
Acked-by: Reinhard Meyer<u-boot@emk-elektronik.de>

Ryan, can you please change it as such, and preferably post it as a separate
patch (not with your new board)? So Heiko can pick it up and make it go as a
bug fix to mainline faster than I could do it right now through the "atmel" tree.

Best Regards,
Reinhard
Andreas Bießmann - Jan. 26, 2011, 6:27 p.m.
Dear Reinhard Meyer,

Am 26.01.2011 um 09:18 schrieb Reinhard Meyer:

> Dear Ryan Mellon, dear Heiko Schocher:
>>>>>> Signed-off-by: Ryan Mallon<ryan@bluewatersys.com>
>>>>>> ---
>>>>>>  drivers/i2c/soft_i2c.c |    4 +---
>>>>>>  1 files changed, 1 insertions(+), 3 deletions(-)
>>>>> 
>>>>> I think this one goes through as a bug fix, i. e. for the upcoming
>>>>> release.
>>>>> 
>>>>> The other patches of this series go into next.
>>>> 
>>>> Ok. Reinhard? Do you pick up this patch? If so, I give my:
>>>> 
>>>> Acked-by: Heiko Schocher<hs@denx.de>
>>> 
>>> I was going to complain that it was not alphabetically sorted as I
>>> suggested to him,
>>> however I am now considering to remove the AT91RM9200 case altogether.
>>> That one has to be forced into AT91FAMILY.
>>> 
>>> Once corrected, I will pickup this patch then.
> 
> I made up my mind, it should only test for AT91FAMILY.
> 
> AT91RM9200 is supposed to join AT91FAMILY anyway, so lets do this correctly right now.

that is the plan ...

> #if defined(CONFIG_AT91FAMILY)

regards

Andreas Bießmann

Patch

diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index 1a1809a..d3803a2 100644
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -30,9 +30,7 @@ 
 #include <ioports.h>
 #include <asm/io.h>
 #endif
-#if defined(CONFIG_AT91RM9200) || \
-	defined(CONFIG_AT91SAM9260) ||  defined(CONFIG_AT91SAM9261) || \
-	defined(CONFIG_AT91SAM9263)
+#if defined(CONFIG_AT91RM9200) || defined(CONFIG_AT91FAMILY)
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pio.h>