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>
This commit is contained in:
44
arch/arm/mach-imx/cpu.c
Normal file
44
arch/arm/mach-imx/cpu.c
Normal file
@@ -0,0 +1,44 @@
|
||||
|
||||
#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);
|
||||
}
|
Reference in New Issue
Block a user