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

Commit 5c2e8852 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP: Remove plat-omap/common.h 



Most of the prototypes in plat-omap/common.h are not
common to omap1 and omap2+, they are local to omap2+
and should not be in plat-omap/common.h.

The only shared function prototype in this file is
omap_init_clocksource_32k(), let's put that into
counter-32k.h.

Note that the new plat/counter-32k.h must not be
included from drivers, that will break omap2+ build
for CONFIG_MULTIPLATFORM.

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

arch/arm/mach-omap1/common.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#ifndef __ARCH_ARM_MACH_OMAP1_COMMON_H

#define __ARCH_ARM_MACH_OMAP1_COMMON_H



#include "../plat-omap/common.h"

#include <linux/mtd/mtd.h>

#include <linux/i2c-omap.h>

arch/arm/mach-omap1/timer32k.c

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
#include <asm/mach/irq.h>

#include <asm/mach/time.h>



#include <plat/counter-32k.h>

#include <plat/dmtimer.h>



#include <mach/hardware.h>

arch/arm/mach-omap2/cm33xx.c

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ 
#include <linux/err.h>

#include <linux/io.h>



#include "../plat-omap/common.h"



#include "cm.h"

#include "cm33xx.h"

#include "cm-regbits-34xx.h"

arch/arm/mach-omap2/common.h

+3 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 


#include <asm/proc-fns.h>



#include "../plat-omap/common.h"



#include "i2c.h"

#include "serial.h"
@@ -345,5 +343,8 @@ struct omap2_hsmmc_info; 
extern int omap4_twl6030_hsmmc_init(struct omap2_hsmmc_info *controllers);

extern void omap_reserve(void);



struct omap_hwmod;

extern int omap_dss_reset(struct omap_hwmod *);



#endif /* __ASSEMBLER__ */

#endif /* __ARCH_ARM_MACH_OMAP2PLUS_COMMON_H */

arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c

+0 −2
Original line number Diff line number Diff line
@@ -12,8 +12,6 @@ 


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



#include "../plat-omap/common.h"



#include "omap_hwmod.h"

#include "hdq1w.h"