diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-13 11:48:07 (GMT) |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-15 02:02:19 (GMT) |
| commit | 3995eb82050a81e11217a0b88b2a5eddd53eb4d6 (patch) | |
| tree | b1c04b25317c9dade08d911e8077c8745df8a954 /arch/arm/plat-mxc/cpu.c | |
| parent | e0557c0d1a3a9c38af6777d308f98da12c94e137 (diff) | |
| download | linux-3995eb82050a81e11217a0b88b2a5eddd53eb4d6.tar.xz | |
ARM: imx: merge plat-mxc into mach-imx
It's really unnecessary to have plat-mxc, and let's merge it into
mach-imx. It's pretty much just a bunch of file renaming and
Kconfig/Makefile merge.
To make the change less invasive, we keep using Kconfig symbol
CONFIG_ARCH_MXC for mach-imx sub-architecture.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/plat-mxc/cpu.c')
| -rw-r--r-- | arch/arm/plat-mxc/cpu.c | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/arch/arm/plat-mxc/cpu.c b/arch/arm/plat-mxc/cpu.c deleted file mode 100644 index 220dd6f..0000000 --- a/arch/arm/plat-mxc/cpu.c +++ /dev/null @@ -1,44 +0,0 @@ - -#include <linux/module.h> -#include <linux/io.h> -#include <mach/hardware.h> - -unsigned int __mxc_cpu_type; -EXPORT_SYMBOL(__mxc_cpu_type); - -void mxc_set_cpu_type(unsigned int type) -{ - __mxc_cpu_type = type; -} - -void imx_print_silicon_rev(const char *cpu, int srev) -{ - if (srev == IMX_CHIP_REVISION_UNKNOWN) - pr_info("CPU identified as %s, unknown revision\n", cpu); - else - pr_info("CPU identified as %s, silicon rev %d.%d\n", - cpu, (srev >> 4) & 0xf, srev & 0xf); -} - -void __init imx_set_aips(void __iomem *base) -{ - unsigned int reg; -/* - * Set all MPROTx to be non-bufferable, trusted for R/W, - * not forced to user-mode. - */ - __raw_writel(0x77777777, base + 0x0); - __raw_writel(0x77777777, base + 0x4); - -/* - * Set all OPACRx to be non-bufferable, to not require - * supervisor privilege level for access, allow for - * write access and untrusted master access. - */ - __raw_writel(0x0, base + 0x40); - __raw_writel(0x0, base + 0x44); - __raw_writel(0x0, base + 0x48); - __raw_writel(0x0, base + 0x4C); - reg = __raw_readl(base + 0x50) & 0x00FFFFFF; - __raw_writel(reg, base + 0x50); -} |