Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf48c02e authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Nicolas Pitre
Browse files

ARM: mach-at91: 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 df9528ad

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

+0 −8
Original line number Diff line number Diff line
@@ -30,14 +30,6 @@ 


#ifndef __ASSEMBLY__



#ifndef CONFIG_ARCH_AT91X40

#define __arch_ioremap	at91_ioremap

#define __arch_iounmap	at91_iounmap

#endif



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

void at91_iounmap(volatile void __iomem *addr);



static inline unsigned int at91_sys_read(unsigned int reg_offset)

{

	void __iomem *addr = (void __iomem *)AT91_VA_BASE_SYS;

arch/arm/mach-at91/setup.c

+0 −18
Original line number Diff line number Diff line
@@ -73,24 +73,6 @@ static struct map_desc at91_io_desc __initdata = { 
	.type		= MT_DEVICE,

};



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

{

	if (p >= AT91_BASE_SYS && p <= (AT91_BASE_SYS + SZ_16K - 1))

		return (void __iomem *)AT91_IO_P2V(p);



	return __arm_ioremap_caller(p, size, type, __builtin_return_address(0));

}

EXPORT_SYMBOL(at91_ioremap);



void at91_iounmap(volatile void __iomem *addr)

{

	unsigned long virt = (unsigned long)addr;



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

		__iounmap(addr);

}

EXPORT_SYMBOL(at91_iounmap);



#define AT91_DBGU0	0xfffff200

#define AT91_DBGU1	0xffffee00