lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

picoxcell: remove custom ioremap implementation

Browse Source 
Nicolas Pitre's generic ioremap() patch set means that we don't need
this any more.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
This commit is contained in:
Jamie Iles
2011-09-16 14:26:18 +01:00
parent a14bf143b3
commit 6190303b4e
3 changed files with 0 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/mach-picoxcell/include/mach/io.h
View File

@@ -19,11 +19,4 @@
/* No PCI possible on picoxcell. */ /* No PCI possible on picoxcell. */
#define __mem_pci(a) (a) #define __mem_pci(a) (a)
#define __arch_ioremap picoxcell_ioremap
#define __arch_iounmap picoxcell_iounmap
extern void __iomem *picoxcell_ioremap(unsigned long phys, size_t size,
unsigned int type);
extern void picoxcell_iounmap(volatile void __iomem *addr);
#endif /* __ASM_ARM_ARCH_IO_H */ #endif /* __ASM_ARM_ARCH_IO_H */

18
arch/arm/mach-picoxcell/include/mach/vmalloc.h
View File

@@ -1,18 +0,0 @@
/*
* Copyright (c) 2011 Picochip Ltd., Jamie Iles
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#define VMALLOC_END 0xFE000000UL

24
arch/arm/mach-picoxcell/io.c
View File

@@ -30,27 +30,3 @@ void __init picoxcell_map_io(void)
iotable_init(&io_map, 1); iotable_init(&io_map, 1);
} }
void __iomem *picoxcell_ioremap(unsigned long p, size_t size,
unsigned int type)
{
if (unlikely(size == 0))
return NULL;
if (p >= PICOXCELL_PERIPH_BASE &&
p < PICOXCELL_PERIPH_BASE + PICOXCELL_PERIPH_LENGTH)
return IO_ADDRESS(p);
return __arm_ioremap_caller(p, size, type,
__builtin_return_address(0));
}
EXPORT_SYMBOL_GPL(picoxcell_ioremap);
void picoxcell_iounmap(volatile void __iomem *addr)
{
unsigned long virt = (unsigned long)addr;
if (virt >= VMALLOC_START && virt < VMALLOC_END)
__iounmap(addr);
}
EXPORT_SYMBOL_GPL(picoxcell_iounmap);