summaryrefslogtreecommitdiffstats
path: root/board/blackstamp
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-07-15 22:48:46 +0200
committerWolfgang Denk <wd@denx.de>2010-07-15 22:48:46 +0200
commit93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658 (patch)
tree85bf8677d8e8095ef18453199a99c5e4131d217d /board/blackstamp
parentdce6538f5d21a0def8a4df5328d536abed3e136a (diff)
parentd6f324d03d7829a1da1dee8b60f91b173a3976f0 (diff)
downloadu-boot-93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658.tar.gz
u-boot-93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658.tar.xz
u-boot-93502a5e0adcfc0ce6cf8e3daa7eb9a4f4e53658.zip
Merge branch 'master' of ../master
Diffstat (limited to 'board/blackstamp')
-rw-r--r--board/blackstamp/blackstamp.c12
1 files changed, 3 insertions, 9 deletions
diff --git a/board/blackstamp/blackstamp.c b/board/blackstamp/blackstamp.c
index 6355c10959..06d004a39e 100644
--- a/board/blackstamp/blackstamp.c
+++ b/board/blackstamp/blackstamp.c
@@ -13,7 +13,7 @@
#include <common.h>
#include <netdev.h>
-#include <asm/io.h>
+#include <asm/gpio.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -27,14 +27,8 @@ int checkboard(void)
#ifdef SHARED_RESOURCES
void swap_to(int device_id)
{
- bfin_write_FIO_DIR(bfin_read_FIO_DIR() | PF0);
- SSYNC();
- if (device_id == ETHERNET)
- bfin_write_FIO_FLAG_S(PF0);
- else if (device_id == FLASH)
- bfin_write_FIO_FLAG_C(PF0);
- else
- printf("Unknown device to switch\n");
+ gpio_request(GPIO_PF0, "eth_flash_swap");
+ gpio_direction_output(GPIO_PF0, device_id == ETHERNET);
SSYNC();
}
#endif