Commit 400eeee1 authored by Nicolas Pitre's avatar Nicolas Pitre
Browse files

ARM: mach-davinci: remove arch specific special handling for ioremap 



A generic version should replace this later.

Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
parent cf48c02e

arch/arm/mach-davinci/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
#



# Common objects

obj-y 			:= time.o clock.o serial.o io.o psc.o \

obj-y 			:= time.o clock.o serial.o psc.o \

			   dma.o usb.o common.o sram.o aemif.o



obj-$(CONFIG_DAVINCI_MUX)		+= mux.o

arch/arm/mach-davinci/include/mach/io.h

+0 −8
Original line number Diff line number Diff line
@@ -21,12 +21,4 @@ 
#define __mem_pci(a)		(a)

#define __mem_isa(a)		(a)



#ifndef __ASSEMBLER__

#define __arch_ioremap		davinci_ioremap

#define __arch_iounmap		davinci_iounmap



void __iomem *davinci_ioremap(unsigned long phys, size_t size,

			      unsigned int type);

void davinci_iounmap(volatile void __iomem *addr);

#endif

#endif /* __ASM_ARCH_IO_H */

arch/arm/mach-davinci/io.c

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
/*

 * 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);