This patch allows for a more flexible ioremap() interception based on iotable contents. With this patch, the ioremap() interception code can properly translate addresses only after davinci_soc_info has been initialized. Consequently, in soc-specific init functions, davinci_common_init() has to happen before any ioremap() attempts. The da8xx init sequence has been suitably modified to meet this restriction. Signed-off-by: Cyril Chemparathy <cyril@ti.com> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
		
			
				
	
	
		
			48 lines
		
	
	
	
		
			1.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			48 lines
		
	
	
	
		
			1.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * DaVinci I/O mapping code
 | 
						|
 *
 | 
						|
 * Copyright (C) 2005-2006 Texas Instruments
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License version 2 as
 | 
						|
 * published by the Free Software Foundation.
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/module.h>
 | 
						|
#include <linux/io.h>
 | 
						|
 | 
						|
#include <asm/tlb.h>
 | 
						|
#include <asm/mach/map.h>
 | 
						|
 | 
						|
#include <mach/common.h>
 | 
						|
 | 
						|
/*
 | 
						|
 * Intercept ioremap() requests for addresses in our fixed mapping regions.
 | 
						|
 */
 | 
						|
void __iomem *davinci_ioremap(unsigned long p, size_t size, unsigned int type)
 | 
						|
{
 | 
						|
	struct map_desc *desc = davinci_soc_info.io_desc;
 | 
						|
	int desc_num = davinci_soc_info.io_desc_num;
 | 
						|
	int i;
 | 
						|
 | 
						|
	for (i = 0; i < desc_num; i++, desc++) {
 | 
						|
		unsigned long iophys = __pfn_to_phys(desc->pfn);
 | 
						|
		unsigned long iosize = desc->length;
 | 
						|
 | 
						|
		if (p >= iophys && (p + size) <= (iophys + iosize))
 | 
						|
			return __io(desc->virtual + p - iophys);
 | 
						|
	}
 | 
						|
 | 
						|
	return __arm_ioremap_caller(p, size, type,
 | 
						|
					__builtin_return_address(0));
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(davinci_ioremap);
 | 
						|
 | 
						|
void davinci_iounmap(volatile void __iomem *addr)
 | 
						|
{
 | 
						|
	unsigned long virt = (unsigned long)addr;
 | 
						|
 | 
						|
	if (virt >= VMALLOC_START && virt < VMALLOC_END)
 | 
						|
		__iounmap(addr);
 | 
						|
}
 | 
						|
EXPORT_SYMBOL(davinci_iounmap);
 |