From: "Andreas Bießmann" <andreas.devel@googlemail.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/6] i2c: switch from AT91 legacy to ATMEL legacy
Date: Wed, 30 Oct 2013 15:18:18 +0100 [thread overview]
Message-ID: <1383142702-9782-3-git-send-email-andreas.devel@googlemail.com> (raw)
In-Reply-To: <1383142702-9782-1-git-send-email-andreas.devel@googlemail.com>
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(-)
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
--
1.7.10.4
next prev parent reply other threads:[~2013-10-30 14:18 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-10-30 14:18 [U-Boot] [PATCH 0/6] at91: get rid of long standing work around CONFIG_AT91_LEGACY Andreas Bießmann
2013-10-30 14:18 ` [U-Boot] [PATCH 1/6] video: remove AT91 legacy API from bus_vcxk Andreas Bießmann
2013-11-04 15:12 ` Jens Scharsig
2013-11-04 15:21 ` Anatolij Gustschin
2013-11-13 21:21 ` [U-Boot] [U-Boot,1/6] " Andreas Bießmann
2013-10-30 14:18 ` Andreas Bießmann [this message]
2013-10-31 5:08 ` [U-Boot] [PATCH 2/6] i2c: switch from AT91 legacy to ATMEL legacy Heiko Schocher
2013-11-13 21:21 ` [U-Boot] [U-Boot,2/6] " Andreas Bießmann
2013-10-30 14:18 ` [U-Boot] [PATCH 3/6] at91sam9m10g45ek: remove unused CONFIG_AT91_LEGACY Andreas Bießmann
2013-10-31 3:18 ` Bo Shen
2013-11-13 21:22 ` [U-Boot] [U-Boot,3/6] " Andreas Bießmann
2013-10-30 14:18 ` [U-Boot] [PATCH 4/6] snapper9260: remove unused AT91_LEGACY Andreas Bießmann
2013-11-13 21:22 ` [U-Boot] [U-Boot,4/6] " Andreas Bießmann
2013-10-30 14:18 ` [U-Boot] [PATCH 5/6] net: remove unused CONFIG_AT91_LEGACY Andreas Bießmann
2013-11-13 21:22 ` [U-Boot] [U-Boot,5/6] " Andreas Bießmann
2013-10-30 14:18 ` [U-Boot] [PATCH 6/6] at91: remove all occourances of CONFIG_AT91_LEGACY Andreas Bießmann
2013-11-13 21:22 ` [U-Boot] [U-Boot,6/6] " Andreas Bießmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1383142702-9782-3-git-send-email-andreas.devel@googlemail.com \
--to=andreas.devel@googlemail.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox