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

Commit 7f28427b authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Move omap_dsp_reserve_sdram_memblock() to mach-omap2 



This hardware exists only on 2430 and later omaps, so there's no
need to have it in plat-omap/devices.c.

Note that we don't have any users for exported omap_dsp_get_mempool_base(),
so we can make it static.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 49b1a616

arch/arm/mach-omap2/dsp.c

+25 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 


#include <plat/dsp.h>



extern phys_addr_t omap_dsp_get_mempool_base(void);



static struct platform_device *omap_dsp_pdev;



static struct omap_dsp_platform_data omap_dsp_pdata __initdata = {
@@ -47,6 +45,31 @@ static struct omap_dsp_platform_data omap_dsp_pdata __initdata = { 
	.dsp_cm_rmw_bits = omap2_cm_rmw_mod_reg_bits,

};



static phys_addr_t omap_dsp_phys_mempool_base;



void __init omap_dsp_reserve_sdram_memblock(void)

{

	phys_addr_t size = CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE;

	phys_addr_t paddr;



	if (!size)

		return;



	paddr = arm_memblock_steal(size, SZ_1M);

	if (!paddr) {

		pr_err("%s: failed to reserve %llx bytes\n",

				__func__, (unsigned long long)size);

		return;

	}



	omap_dsp_phys_mempool_base = paddr;

}



static phys_addr_t omap_dsp_get_mempool_base(void)

{

	return omap_dsp_phys_mempool_base;

}



static int __init omap_dsp_init(void)

{

	struct platform_device *pdev;

arch/arm/plat-omap/devices.c

+0 −29
Original line number Diff line number Diff line
@@ -109,35 +109,6 @@ static void omap_init_rng(void) 
static inline void omap_init_rng(void) {}

#endif



#if defined(CONFIG_TIDSPBRIDGE) || defined(CONFIG_TIDSPBRIDGE_MODULE)



static phys_addr_t omap_dsp_phys_mempool_base;



void __init omap_dsp_reserve_sdram_memblock(void)

{

	phys_addr_t size = CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE;

	phys_addr_t paddr;



	if (!size)

		return;



	paddr = arm_memblock_steal(size, SZ_1M);

	if (!paddr) {

		pr_err("%s: failed to reserve %llx bytes\n",

				__func__, (unsigned long long)size);

		return;

	}



	omap_dsp_phys_mempool_base = paddr;

}



phys_addr_t omap_dsp_get_mempool_base(void)

{

	return omap_dsp_phys_mempool_base;

}

EXPORT_SYMBOL(omap_dsp_get_mempool_base);

#endif



/*

 * This gets called after board-specific INIT_MACHINE, and initializes most

 * on-chip peripherals accessible on this board (except for few like USB):