Patchwork [U-Boot,2/6] i2c: switch from AT91 legacy to ATMEL legacy

login
register
mail settings
Submitter Andreas Bießmann
Date Oct. 30, 2013, 2:18 p.m.
Message ID <1383142702-9782-3-git-send-email-andreas.devel@googlemail.com>
Download mbox | patch
Permalink /patch/287222/
State Accepted
Delegated to: Andreas Bießmann
Headers show

Comments

Andreas Bießmann - Oct. 30, 2013, 2:18 p.m.
Since the required API is gpio which is enclosed with CONFIG_ATMEL_LEGACY use
that switch here.

Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
---
 drivers/i2c/soft_i2c.c |    2 +-
 include/i2c.h          |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Heiko Schocher - Oct. 31, 2013, 5:08 a.m.
Hello Andreas,

Am 30.10.2013 15:18, schrieb Andreas Bießmann:
> Since the required API is gpio which is enclosed with CONFIG_ATMEL_LEGACY use
> that switch here.
>
> Signed-off-by: Andreas Bießmann<andreas.devel@googlemail.com>
> ---
>   drivers/i2c/soft_i2c.c |    2 +-
>   include/i2c.h          |    2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)

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

bye,
Heiko
Andreas Bießmann - Nov. 13, 2013, 9:21 p.m.
Dear Andreas Devel,

Andreas Devel <andreas.devel@googlemail.com> writes:
>Since the required API is gpio which is enclosed with CONFIG_ATMEL_LEGACY use
>that switch here.
>
>Signed-off-by: Andreas Bießmann <andreas.devel@googlemail.com>
>Acked-by: Heiko Schocher <hs@denx.de>
>
>---
>drivers/i2c/soft_i2c.c |    2 +-
> include/i2c.h          |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bießmann

Patch

diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index 396fea8..dfea54a 100644
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -25,7 +25,7 @@ 
 #include <asm/io.h>
 #include <asm/arch/hardware.h>
 #include <asm/arch/at91_pio.h>
-#ifdef CONFIG_AT91_LEGACY
+#ifdef CONFIG_ATMEL_LEGACY
 #include <asm/arch/gpio.h>
 #endif
 #endif
diff --git a/include/i2c.h b/include/i2c.h
index c1be533..f93a183 100644
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -147,7 +147,7 @@  extern struct i2c_bus_hose	i2c_bus[];
 
 # elif (defined(CONFIG_AT91RM9200) || \
 	defined(CONFIG_AT91SAM9260) ||  defined(CONFIG_AT91SAM9261) || \
-	defined(CONFIG_AT91SAM9263)) && !defined(CONFIG_AT91_LEGACY)
+	defined(CONFIG_AT91SAM9263))
 #  define I2C_SOFT_DECLARATIONS	at91_pio_t *pio	= (at91_pio_t *) ATMEL_BASE_PIOA;
 # else
 #  define I2C_SOFT_DECLARATIONS