Commit 3c4c342f authored by Nicolas Pitre's avatar Nicolas Pitre
Browse files

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



A generic version should replace this later.

Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Tested-by: default avatarStephen Warren <swarren@nvidia.com>
parent 400eeee1

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

+0 −6
Original line number Diff line number Diff line
@@ -71,12 +71,6 @@ 


#ifndef __ASSEMBLER__



#define __arch_ioremap		tegra_ioremap

#define __arch_iounmap		tegra_iounmap



void __iomem *tegra_ioremap(unsigned long phys, size_t size, unsigned int type);

void tegra_iounmap(volatile void __iomem *addr);



#define IO_ADDRESS(n) (IO_TO_VIRT(n))



#ifdef CONFIG_TEGRA_PCI

arch/arm/mach-tegra/io.c

+0 −21
Original line number Diff line number Diff line
@@ -60,24 +60,3 @@ void __init tegra_map_common_io(void) 
{

	iotable_init(tegra_io_desc, ARRAY_SIZE(tegra_io_desc));

}
 


/*

 * Intercept ioremap() requests for addresses in our fixed mapping regions.

 */

void __iomem *tegra_ioremap(unsigned long p, size_t size, unsigned int type)

{

	void __iomem *v = IO_ADDRESS(p);

	if (v == NULL)

		v = __arm_ioremap(p, size, type);

	return v;

}

EXPORT_SYMBOL(tegra_ioremap);



void tegra_iounmap(volatile void __iomem *addr)

{

	unsigned long virt = (unsigned long)addr;



	if (virt >= VMALLOC_START && virt < VMALLOC_END)

		__iounmap(addr);

}

EXPORT_SYMBOL(tegra_iounmap);