summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-12-02 16:00:10 +0100
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2013-12-02 16:00:10 +0100
commit77524d2c9d81e97c54e704b65c8a02e4bec0f441 (patch)
tree59a4ec271a84c57b4b5127d81ac97ea176ebff85 /drivers
parentd44a5f51288aec60c6bdb4ac939d75c24e5bf9c2 (diff)
parentd07e2b598a690d6eb75019b379fc4933affe3d2c (diff)
downloadu-boot-imx-77524d2c9d81e97c54e704b65c8a02e4bec0f441.zip
u-boot-imx-77524d2c9d81e97c54e704b65c8a02e4bec0f441.tar.gz
u-boot-imx-77524d2c9d81e97c54e704b65c8a02e4bec0f441.tar.bz2
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers')
-rw-r--r--drivers/i2c/soft_i2c.c2
-rw-r--r--drivers/net/at91_emac.c9
-rw-r--r--drivers/video/bus_vcxk.c15
3 files changed, 1 insertions, 25 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/drivers/net/at91_emac.c b/drivers/net/at91_emac.c
index 73612ea..64d4c56 100644
--- a/drivers/net/at91_emac.c
+++ b/drivers/net/at91_emac.c
@@ -10,19 +10,10 @@
#include <common.h>
#include <asm/io.h>
-#ifndef CONFIG_AT91_LEGACY
#include <asm/arch/hardware.h>
#include <asm/arch/at91_emac.h>
#include <asm/arch/at91_pmc.h>
#include <asm/arch/at91_pio.h>
-#else
-/* remove next 5 lines, if all RM9200 boards convert to at91 arch */
-#include <asm/arch-at91/at91rm9200.h>
-#include <asm/arch-at91/hardware.h>
-#include <asm/arch-at91/at91_emac.h>
-#include <asm/arch-at91/at91_pmc.h>
-#include <asm/arch-at91/at91_pio.h>
-#endif
#include <net.h>
#include <netdev.h>
#include <malloc.h>
diff --git a/drivers/video/bus_vcxk.c b/drivers/video/bus_vcxk.c
index 0138bca..60a5cc5 100644
--- a/drivers/video/bus_vcxk.c
+++ b/drivers/video/bus_vcxk.c
@@ -20,7 +20,6 @@ vu_long *vcxk_bws_long = ((vu_long *) (CONFIG_SYS_VCXK_BASE));
#ifndef VCBITMASK
#define VCBITMASK(bitno) (0x0001 << (bitno % 16))
#endif
-#ifndef CONFIG_AT91_LEGACY
at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE;
#define VCXK_INIT_PIN(PORT, PIN, DDR, I0O1) \
do { \
@@ -37,20 +36,6 @@ at91_pio_t *pio = (at91_pio_t *) AT91_PIO_BASE;
#define VCXK_ACKNOWLEDGE \
(!(readl(&pio->CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT.pdsr) & \
CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN))
-#else
- #define VCXK_INIT_PIN(PORT, PIN, DDR, I0O1) \
- ((AT91PS_PIO) PORT)->PIO_PER = PIN; \
- ((AT91PS_PIO) PORT)->DDR = PIN; \
- ((AT91PS_PIO) PORT)->PIO_MDDR = PIN; \
- if (!I0O1) ((AT91PS_PIO) PORT)->PIO_PPUER = PIN;
-
- #define VCXK_SET_PIN(PORT, PIN) ((AT91PS_PIO) PORT)->PIO_SODR = PIN;
- #define VCXK_CLR_PIN(PORT, PIN) ((AT91PS_PIO) PORT)->PIO_CODR = PIN;
-
- #define VCXK_ACKNOWLEDGE \
- (!(((AT91PS_PIO) CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT)->\
- PIO_PDSR & CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN))
-#endif
#elif defined(CONFIG_MCF52x2)
#include <asm/m5282.h>
#ifndef VCBITMASK