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

Commit 7146182c authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Nicolas Pitre
Browse files

ARM: plat-omap: remove arch specific special handling for ioremap 



A generic version should replace this later.

As io.c has become nearly empty, omap_init_consistent_dma_size() is moved
into common.c so that io.c can be removed entirely.

Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Tested-by: default avatarKevin Hilman <khilman@ti.com>
parent 3c4c342f

arch/arm/mach-omap1/io.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,6 @@ void __init omap16xx_map_io(void) 
void omap1_init_early(void)

void omap1_init_early(void)

{

{

	omap_check_revision();

	omap_check_revision();

	omap_ioremap_init();





	/* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort

	/* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort

	 * on a Posted Write in the TIPB Bridge".

	 * on a Posted Write in the TIPB Bridge".

arch/arm/mach-omap2/io.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -322,7 +322,6 @@ void __iomem *omap_irq_base; 
static void __init omap_common_init_early(void)

static void __init omap_common_init_early(void)

{

{

	omap2_check_revision();

	omap2_check_revision();

	omap_ioremap_init();

	omap_init_consistent_dma_size();

	omap_init_consistent_dma_size();

}

}

arch/arm/plat-omap/Makefile

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




# Common support

# Common support

obj-y := common.o sram.o clock.o devices.o dma.o mux.o \

obj-y := common.o sram.o clock.o devices.o dma.o mux.o \

	 usb.o fb.o io.o counter_32k.o

	 usb.o fb.o counter_32k.o

obj-m :=

obj-m :=

obj-n :=

obj-n :=

obj-  :=

obj-  :=

arch/arm/plat-omap/common.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -66,3 +66,10 @@ void __init omap_reserve(void) 
	omap_vram_reserve_sdram_memblock();

	omap_vram_reserve_sdram_memblock();

	omap_dsp_reserve_sdram_memblock();

	omap_dsp_reserve_sdram_memblock();

}

}



void __init omap_init_consistent_dma_size(void)

{

#ifdef CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE

	init_consistent_dma_size(CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE << 20);

#endif

}

arch/arm/plat-omap/include/plat/io.h

+0 −8
Original line number Original line Diff line number Diff line
@@ -247,8 +247,6 @@ 
 * NOTE: Please use ioremap + __raw_read/write where possible instead of these

 * NOTE: Please use ioremap + __raw_read/write where possible instead of these

 */

 */





void omap_ioremap_init(void);



extern u8 omap_readb(u32 pa);

extern u8 omap_readb(u32 pa);

extern u16 omap_readw(u32 pa);

extern u16 omap_readw(u32 pa);

extern u32 omap_readl(u32 pa);

extern u32 omap_readl(u32 pa);
@@ -328,12 +326,6 @@ extern void omap2_init_common_infrastructure(void); 
extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,

extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,

				      struct omap_sdrc_params *sdrc_cs1);

				      struct omap_sdrc_params *sdrc_cs1);





#define __arch_ioremap	omap_ioremap

#define __arch_iounmap	omap_iounmap



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

void omap_iounmap(volatile void __iomem *addr);



extern void __init omap_init_consistent_dma_size(void);

extern void __init omap_init_consistent_dma_size(void);





#endif

#endif