summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Bießmann <andreas.devel@googlemail.com>2013-10-30 15:18:18 +0100
committerAndreas Bießmann <andreas.devel@googlemail.com>2013-11-13 22:13:22 +0100
commitcb96a0a4c90e64b286d1b117374d16817b1c8521 (patch)
treea31868bb91ffcc82a4534adf41619d28f36a5ffe
parent0f1f041835d7f524fa9121b02000b0a398f01f20 (diff)
downloadu-boot-imx-cb96a0a4c90e64b286d1b117374d16817b1c8521.zip
u-boot-imx-cb96a0a4c90e64b286d1b117374d16817b1c8521.tar.gz
u-boot-imx-cb96a0a4c90e64b286d1b117374d16817b1c8521.tar.bz2
i2c: switch from AT91 legacy to ATMEL legacy
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>
-rw-r--r--drivers/i2c/soft_i2c.c2
-rw-r--r--include/i2c.h2
2 files changed, 2 insertions, 2 deletions
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