summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-01-16 13:50:16 -0500
committerTom Rini <trini@ti.com>2014-01-16 13:50:16 -0500
commit4913fc23f0b19a82e2e9cc56f7ee0087839855c4 (patch)
treeb3229e94d952021236a6ec29e6bfe1d6fd050dee /drivers
parentb5c068f3f8be5c2f73fc6699885aec0d342099bb (diff)
parentc71b4dd2da0dcddabd7c29e6c3dc8a495d4bd928 (diff)
downloadu-boot-imx-4913fc23f0b19a82e2e9cc56f7ee0087839855c4.zip
u-boot-imx-4913fc23f0b19a82e2e9cc56f7ee0087839855c4.tar.gz
u-boot-imx-4913fc23f0b19a82e2e9cc56f7ee0087839855c4.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers')
-rw-r--r--drivers/spi/sh_qspi.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c
index edeb42d..77ede6b 100644
--- a/drivers/spi/sh_qspi.c
+++ b/drivers/spi/sh_qspi.c
@@ -10,6 +10,7 @@
#include <common.h>
#include <malloc.h>
#include <spi.h>
+#include <asm/arch/rmobile.h>
#include <asm/io.h>
/* SH QSPI register bit masks <REG>_<BIT> */
@@ -170,7 +171,7 @@ struct spi_slave *spi_setup_slave(unsigned int bus, unsigned int cs,
return NULL;
}
- ss->regs = (struct sh_qspi_regs *)CONFIG_SH_QSPI_BASE;
+ ss->regs = (struct sh_qspi_regs *)SH_QSPI_BASE;
/* Init SH QSPI */
sh_qspi_init(ss);