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

Commit f583f0f2 authored by Lokesh Vutla's avatar Lokesh Vutla Committed by Tony Lindgren
Browse files

ARM: OMAP2+: Move omap_reserve() locally to mach-omap2 



omap_reserve() callback is defned only for mach-omap2.
So, moving definition of omap_reserve() to mach-omap2.
This helps is moving plat/omap_secure.h local to
mach-omap2

Signed-off-by: default avatarLokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent f300af86

arch/arm/mach-omap2/common.c

+20 −0
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ 
#include <linux/init.h>

#include <linux/clk.h>

#include <linux/io.h>

#include <linux/platform_data/dsp-omap.h>



#include <plat/clock.h>

#include <plat/omap-secure.h>

#include <plat/vram.h>



#include "soc.h"

#include "iomap.h"
@@ -200,3 +203,20 @@ void __init omap5_map_io(void) 
	omap5_map_common_io();

}

#endif



/*

 * Stub function for OMAP2 so that common files

 * continue to build when custom builds are used

 */

int __weak omap_secure_ram_reserve_memblock(void)

{

	return 0;

}



void __init omap_reserve(void)

{

	omap_vram_reserve_sdram_memblock();

	omap_dsp_reserve_sdram_memblock();

	omap_secure_ram_reserve_memblock();

	omap_barrier_reserve_memblock();

}

arch/arm/mach-omap2/common.h

+1 −0
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ extern void omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0, 
				      struct omap_sdrc_params *sdrc_cs1);

struct omap2_hsmmc_info;

extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers);

extern void omap_reserve(void);



#endif /* __ASSEMBLER__ */

#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */

arch/arm/plat-omap/common.c

+0 −21
Original line number Diff line number Diff line
@@ -17,32 +17,11 @@ 
#include <linux/dma-mapping.h>



#include "common.h"

#include <plat/vram.h>

#include <linux/platform_data/dsp-omap.h>

#include <plat-omap/dma-omap.h>



#include <plat/omap-secure.h>



void __init omap_reserve(void)

{

	omap_vram_reserve_sdram_memblock();

	omap_dsp_reserve_sdram_memblock();

	omap_secure_ram_reserve_memblock();

	omap_barrier_reserve_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

}
 


/*

 * Stub function for OMAP2 so that common files

 * continue to build when custom builds are used

 */

int __weak omap_secure_ram_reserve_memblock(void)

{

	return 0;

}