It moves a bunch of header files included in hardware.h and itself from mach-imx/include/mach to mach-imx, and updates users to include hardware.h rather than mach/hardware.h. The files in mach-imx/devices will need to include "../hardware.h". Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Sascha Hauer <s.hauer@pengutronix.de> Acked-by: Arnd Bergmann <arnd@arndb.de>
		
			
				
	
	
		
			45 lines
		
	
	
	
		
			1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			45 lines
		
	
	
	
		
			1 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
 | 
						|
#include <linux/module.h>
 | 
						|
#include <linux/io.h>
 | 
						|
 | 
						|
#include "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);
 | 
						|
}
 |