diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-09-23 21:30:27 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-10-04 15:19:53 +0200 |
commit | 8b88e6dadb60d3aa4beb8c591a5be8b54f9f1fe8 (patch) | |
tree | 3c24995e810c7ae987abb448eb70a3e446534469 /arch/arm | |
parent | fcd2ece1c2421808e43b16d4e4ad270de68b9c0d (diff) | |
download | barebox-8b88e6dadb60d3aa4beb8c591a5be8b54f9f1fe8.tar.gz barebox-8b88e6dadb60d3aa4beb8c591a5be8b54f9f1fe8.tar.xz |
ARM i.MX: Add header file for WEIM cs setup
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c | 1 | ||||
-rw-r--r-- | arch/arm/boards/imx27ads/imx27ads.c | 1 | ||||
-rw-r--r-- | arch/arm/boards/pcm038/pcm038.c | 1 | ||||
-rw-r--r-- | arch/arm/boards/pcm038/pcm970.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/imx27.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/imx27-regs.h | 10 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/weim.h | 7 |
7 files changed, 20 insertions, 10 deletions
diff --git a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c index 0ffe43fd33..cff4f77985 100644 --- a/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c +++ b/arch/arm/boards/eukrea_cpuimx27/eukrea_cpuimx27.c @@ -37,6 +37,7 @@ #include <io.h> #include <mach/imx-nand.h> #include <mach/imx-pll.h> +#include <mach/weim.h> #include <mach/imxfb.h> #include <ns16550.h> #include <asm/mmu.h> diff --git a/arch/arm/boards/imx27ads/imx27ads.c b/arch/arm/boards/imx27ads/imx27ads.c index f9416e12cc..22c6e40f9f 100644 --- a/arch/arm/boards/imx27ads/imx27ads.c +++ b/arch/arm/boards/imx27ads/imx27ads.c @@ -23,6 +23,7 @@ #include <io.h> #include <fec.h> #include <mach/gpio.h> +#include <mach/weim.h> #include <partition.h> #include <fs.h> #include <fcntl.h> diff --git a/arch/arm/boards/pcm038/pcm038.c b/arch/arm/boards/pcm038/pcm038.c index a51825b795..58b1ec9ef4 100644 --- a/arch/arm/boards/pcm038/pcm038.c +++ b/arch/arm/boards/pcm038/pcm038.c @@ -31,6 +31,7 @@ #include <io.h> #include <mach/imx-nand.h> #include <mach/imx-pll.h> +#include <mach/weim.h> #include <mach/imxfb.h> #include <i2c/i2c.h> #include <mach/spi.h> diff --git a/arch/arm/boards/pcm038/pcm970.c b/arch/arm/boards/pcm038/pcm970.c index d392ea4119..b8fc65b9e3 100644 --- a/arch/arm/boards/pcm038/pcm970.c +++ b/arch/arm/boards/pcm038/pcm970.c @@ -18,6 +18,7 @@ #include <platform_ide.h> #include <mach/imx-regs.h> #include <mach/iomux-mx27.h> +#include <mach/weim.h> #include <mach/gpio.h> #include <mach/devices-imx27.h> #include <usb/ulpi.h> diff --git a/arch/arm/mach-imx/imx27.c b/arch/arm/mach-imx/imx27.c index 76bb910b6b..0c923859b4 100644 --- a/arch/arm/mach-imx/imx27.c +++ b/arch/arm/mach-imx/imx27.c @@ -13,6 +13,7 @@ #include <common.h> #include <mach/imx-regs.h> +#include <mach/weim.h> #include <sizes.h> #include <init.h> #include <io.h> @@ -22,6 +23,14 @@ int imx_silicon_revision(void) return CID >> 28; } +void imx27_setup_weimcs(size_t cs, unsigned upper, unsigned lower, + unsigned additional) +{ + writel(upper, MX27_WEIM_BASE_ADDR + (cs * 0x10) + 0x0); + writel(lower, MX27_WEIM_BASE_ADDR + (cs * 0x10) + 0x4); + writel(additional, MX27_WEIM_BASE_ADDR + (cs * 0x10) + 0x8); +} + /* * Initialize MAX on i.MX27. necessary to give the DMA engine * higher priority to the memory than the CPU. Needed for proper diff --git a/arch/arm/mach-imx/include/mach/imx27-regs.h b/arch/arm/mach-imx/include/mach/imx27-regs.h index 6e47b28f0c..5db1a3c3eb 100644 --- a/arch/arm/mach-imx/include/mach/imx27-regs.h +++ b/arch/arm/mach-imx/include/mach/imx27-regs.h @@ -278,14 +278,4 @@ #define ESDCFG_TWTR (1 << 20) #define ESDCFG_TXP(x) (((x) & 0x3) << 21) -#ifndef __ASSEMBLY__ -#include <io.h> -static inline void imx27_setup_weimcs(size_t cs, unsigned upper, unsigned lower, unsigned additional) -{ - writel(upper, MX27_WEIM_BASE_ADDR + (cs * 0x10) + 0x0); - writel(lower, MX27_WEIM_BASE_ADDR + (cs * 0x10) + 0x4); - writel(additional, MX27_WEIM_BASE_ADDR + (cs * 0x10) + 0x4); -} -#endif /* __ASSEMBLY__ */ - #endif /* _IMX27_REGS_H */ diff --git a/arch/arm/mach-imx/include/mach/weim.h b/arch/arm/mach-imx/include/mach/weim.h new file mode 100644 index 0000000000..bc9b51e329 --- /dev/null +++ b/arch/arm/mach-imx/include/mach/weim.h @@ -0,0 +1,7 @@ +#ifndef __MACH_WEIM_H +#define __MACH_WEIM_H + +void imx27_setup_weimcs(size_t cs, unsigned upper, unsigned lower, + unsigned additional); + +#endif /* __MACH_WEIM_H */ |