summaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-04-27 21:48:09 +0200
committerWolfgang Denk <wd@denx.de>2011-04-27 21:48:09 +0200
commitf38536f9138c253b0c1f9c72093a7ec6808e638f (patch)
tree43bd82d4f1f96f549821d5fd941dfdc70712b501 /drivers/spi
parent34b5fc4d8bba594d53a15be970ca78b03db9d7f5 (diff)
parentd32a1a4caa2a2ca7c385f4489167e170bf7fb5c1 (diff)
downloadu-boot-imx-f38536f9138c253b0c1f9c72093a7ec6808e638f.zip
u-boot-imx-f38536f9138c253b0c1f9c72093a7ec6808e638f.tar.gz
u-boot-imx-f38536f9138c253b0c1f9c72093a7ec6808e638f.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-arm
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/mxc_spi.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/spi/mxc_spi.c b/drivers/spi/mxc_spi.c
index 6474eb8..f909e07 100644
--- a/drivers/spi/mxc_spi.c
+++ b/drivers/spi/mxc_spi.c
@@ -24,6 +24,8 @@
#include <asm/errno.h>
#include <asm/io.h>
#include <mxc_gpio.h>
+#include <asm/arch/imx-regs.h>
+#include <asm/arch/clock.h>
#ifdef CONFIG_MX27
/* i.MX27 has a completely wrong register layout and register definitions in the
@@ -34,8 +36,6 @@
#elif defined(CONFIG_MX31)
-#include <asm/arch/mx31.h>
-
#define MXC_CSPICTRL_EN (1 << 0)
#define MXC_CSPICTRL_MODE (1 << 1)
#define MXC_CSPICTRL_XCH (1 << 2)
@@ -63,8 +63,6 @@ static unsigned long spi_bases[] = {
#define mxc_get_clock(x) mx31_get_ipg_clk()
#elif defined(CONFIG_MX51)
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
#define MXC_CSPICTRL_EN (1 << 0)
#define MXC_CSPICTRL_MODE (1 << 1)
@@ -97,9 +95,6 @@ static unsigned long spi_bases[] = {
#elif defined(CONFIG_MX35)
-#include <asm/arch/imx-regs.h>
-#include <asm/arch/clock.h>
-
#define MXC_CSPICTRL_EN (1 << 0)
#define MXC_CSPICTRL_MODE (1 << 1)
#define MXC_CSPICTRL_XCH (1 << 2)