Commit 6ba54ab4 authored by Tomi Valkeinen's avatar Tomi Valkeinen Committed by Tony Lindgren
Browse files

ARM: OMAP: Remove omap_init_consistent_dma_size() 



The only thing omap_init_consistent_dma_size() does is increase the
consistent DMA size if CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE is defined.
Increasing the consistent DMA size should no longer be needed with CMA
in place.

This patch removes omap_init_consistent_dma_size() and also
arch/arm/mach-omap2/io.c:omap_common_init_early() which becomes an empty
function.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarSantosh Shilimkar <santosh.shilimkar@ti.com>
[tony@atomide.com: updated for moved dma.h]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 873e6980

arch/arm/mach-omap1/io.c

+0 −1
Original line number Diff line number Diff line
@@ -134,7 +134,6 @@ void __init omap1_init_early(void) 
	 */

	omap1_clk_init();

	omap1_mux_init();

	omap_init_consistent_dma_size();

}



void __init omap1_init_late(void)

arch/arm/mach-omap2/io.c

+0 −12
Original line number Diff line number Diff line
@@ -353,11 +353,6 @@ static int _set_hwmod_postsetup_state(struct omap_hwmod *oh, void *data) 
	return omap_hwmod_set_postsetup_state(oh, *(u8 *)data);

}



static void __init omap_common_init_early(void)

{

	omap_init_consistent_dma_size();

}



static void __init omap_hwmod_init_postsetup(void)

{

	u8 postsetup_state;
@@ -378,7 +373,6 @@ void __init omap2420_init_early(void) 
{

	omap2_set_globals_242x();

	omap2xxx_check_revision();

	omap_common_init_early();

	omap2xxx_voltagedomains_init();

	omap242x_powerdomains_init();

	omap242x_clockdomains_init();
@@ -400,7 +394,6 @@ void __init omap2430_init_early(void) 
{

	omap2_set_globals_243x();

	omap2xxx_check_revision();

	omap_common_init_early();

	omap2xxx_voltagedomains_init();

	omap243x_powerdomains_init();

	omap243x_clockdomains_init();
@@ -427,7 +420,6 @@ void __init omap3_init_early(void) 
	omap2_set_globals_3xxx();

	omap3xxx_check_revision();

	omap3xxx_check_features();

	omap_common_init_early();

	omap3xxx_voltagedomains_init();

	omap3xxx_powerdomains_init();

	omap3xxx_clockdomains_init();
@@ -461,7 +453,6 @@ void __init ti81xx_init_early(void) 
	omap2_set_globals_ti81xx();

	omap3xxx_check_revision();

	ti81xx_check_features();

	omap_common_init_early();

	omap3xxx_voltagedomains_init();

	omap3xxx_powerdomains_init();

	omap3xxx_clockdomains_init();
@@ -519,7 +510,6 @@ void __init am33xx_init_early(void) 
	omap2_set_globals_am33xx();

	omap3xxx_check_revision();

	ti81xx_check_features();

	omap_common_init_early();

	am33xx_voltagedomains_init();

	am33xx_powerdomains_init();

	am33xx_clockdomains_init();
@@ -535,7 +525,6 @@ void __init omap4430_init_early(void) 
	omap2_set_globals_443x();

	omap4xxx_check_revision();

	omap4xxx_check_features();

	omap_common_init_early();

	omap44xx_voltagedomains_init();

	omap44xx_powerdomains_init();

	omap44xx_clockdomains_init();
@@ -557,7 +546,6 @@ void __init omap5_init_early(void) 
{

	omap2_set_globals_5xxx();

	omap5xxx_check_revision();

	omap_common_init_early();

}

#endif

arch/arm/plat-omap/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#



# Common support

obj-y := common.o sram.o dma.o fb.o counter_32k.o

obj-y := sram.o dma.o fb.o counter_32k.o

obj-m :=

obj-n :=

obj-  :=

arch/arm/plat-omap/common.c

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/plat-omap/common.c

 *

 * Code common to all OMAP machines.

 * The file is created by Tony Lindgren <tony@atomide.com>

 *

 * Copyright (C) 2009 Texas Instruments

 * Added OMAP4 support - Santosh Shilimkar <santosh.shilimkar@ti.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/dma-mapping.h>



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



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-omap/dma-omap.h

+0 −1
Original line number Diff line number Diff line
@@ -281,7 +281,6 @@ struct omap_system_dma_plat_info { 
#define dma_omap15xx()	((dma_omap1() && (d->dev_caps & ENABLE_1510_MODE)))

#define dma_omap16xx()	((dma_omap1() && (d->dev_caps & ENABLE_16XX_MODE)))



extern void __init omap_init_consistent_dma_size(void);

extern void omap_set_dma_priority(int lch, int dst_port, int priority);

extern int omap_request_dma(int dev_id, const char *dev_name,

			void (*callback)(int lch, u16 ch_status, void *data),

CRA Git | Maintained and supported by SUSTech CRA and CCSE