summaryrefslogtreecommitdiff
path: root/board/cm-bf537e
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2010-07-24 03:54:19 -0400
committerMike Frysinger <vapier@gentoo.org>2010-10-02 16:00:37 -0400
commit71dcc2c2b1bc20b63c52561792813ad941a8b80c (patch)
tree83088ed1359933f004cfe3c7142a3077258f8bb1 /board/cm-bf537e
parent6815f540db61b4c038e3ffb98b52009d11d3c1c1 (diff)
downloadu-boot-imx-71dcc2c2b1bc20b63c52561792813ad941a8b80c.zip
u-boot-imx-71dcc2c2b1bc20b63c52561792813ad941a8b80c.tar.gz
u-boot-imx-71dcc2c2b1bc20b63c52561792813ad941a8b80c.tar.bz2
Blackfin: unify gpio cfi implementations
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'board/cm-bf537e')
-rw-r--r--board/cm-bf537e/gpio_cfi_flash.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/board/cm-bf537e/gpio_cfi_flash.c b/board/cm-bf537e/gpio_cfi_flash.c
index 79ee844..ab6af81 100644
--- a/board/cm-bf537e/gpio_cfi_flash.c
+++ b/board/cm-bf537e/gpio_cfi_flash.c
@@ -1,7 +1,7 @@
/*
* gpio_cfi_flash.c - GPIO-assisted Flash Chip Support
*
- * Copyright (c) 2009 Analog Devices Inc.
+ * Copyright (c) 2009-2010 Analog Devices Inc.
*
* Licensed under the GPL-2 or later.
*/
@@ -12,9 +12,17 @@
#include <asm/io.h>
#include "gpio_cfi_flash.h"
+/* Allow this driver to be shared among boards */
+#ifndef GPIO_PIN_1
#define GPIO_PIN_1 GPIO_PF4
+#endif
#define GPIO_MASK_1 (1 << 21)
-#define GPIO_MASK (GPIO_MASK_1)
+#ifndef GPIO_PIN_2
+#define GPIO_MASK_2 (0)
+#else
+#define GPIO_MASK_2 (1 << 22)
+#endif
+#define GPIO_MASK (GPIO_MASK_1 | GPIO_MASK_2)
void *gpio_cfi_flash_swizzle(void *vaddr)
{
@@ -22,11 +30,12 @@ void *gpio_cfi_flash_swizzle(void *vaddr)
gpio_set_value(GPIO_PIN_1, addr & GPIO_MASK_1);
-#ifdef GPIO_MASK_2
+#ifdef GPIO_PIN_2
gpio_set_value(GPIO_PIN_2, addr & GPIO_MASK_2);
#endif
SSYNC();
+ udelay(1);
return (void *)(addr & ~GPIO_MASK);
}
@@ -51,8 +60,9 @@ MAKE_FLASH(64, q) /* flash_write64() flash_read64() */
void gpio_cfi_flash_init(void)
{
gpio_request(GPIO_PIN_1, "gpio_cfi_flash");
-#ifdef GPIO_MASK_2
+ gpio_direction_output(GPIO_PIN_1, 0);
+#ifdef GPIO_PIN_2
gpio_request(GPIO_PIN_2, "gpio_cfi_flash");
+ gpio_direction_output(GPIO_PIN_2, 0);
#endif
- gpio_cfi_flash_swizzle((void *)CONFIG_SYS_FLASH_BASE);
}