openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Tony Lindgren 2012-10-29 16:45:47 -07:00
parent 6e740f9a85
commit 5c2e88525b
13 changed files with 6 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-omap1/common.h
View File

@ -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>

1
arch/arm/mach-omap1/timer32k.c
View File

@ -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>

2
arch/arm/mach-omap2/cm33xx.c
View File

@ -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"

5
arch/arm/mach-omap2/common.h
View File

@ -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 */

2
arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
View File

@ -12,8 +12,6 @@
#include <plat-omap/dma-omap.h>
#include "../plat-omap/common.h"
#include "omap_hwmod.h"
#include "hdq1w.h"

2
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
View File

@ -30,8 +30,6 @@
#include <plat/dmtimer.h>
#include <plat/iommu.h>
#include "../plat-omap/common.h"
#include "omap_hwmod.h"
#include "omap_hwmod_common_data.h"
#include "cm1_44xx.h"

2
arch/arm/mach-omap2/prm33xx.c
View File

@ -19,8 +19,6 @@
#include <linux/err.h>
#include <linux/io.h>
#include "../plat-omap/common.h"
#include "common.h"
#include "prm33xx.h"
#include "prm-regbits-33xx.h"

1
arch/arm/mach-omap2/prm_common.c
View File

@ -24,7 +24,6 @@
#include <linux/interrupt.h>
#include <linux/slab.h>
#include "../plat-omap/common.h"
#include <plat/prcm.h>
#include "prm2xxx_3xxx.h"

1
arch/arm/mach-omap2/timer.c
View File

@ -45,6 +45,7 @@
#include <asm/arch_timer.h>
#include "omap_hwmod.h"
#include "omap_device.h"
#include <plat/counter-32k.h>
#include <plat/dmtimer.h>
#include "omap-pm.h"

1
arch/arm/plat-omap/common.c
View File

@ -16,7 +16,6 @@
#include <linux/io.h>
#include <linux/dma-mapping.h>
#include "common.h"
#include <plat-omap/dma-omap.h>
void __init omap_init_consistent_dma_size(void)

36
arch/arm/plat-omap/common.h
View File

@ -1,36 +0,0 @@
/*
* Header for shared OMAP code in plat-omap.
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
* NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 675 Mass Ave, Cambridge, MA 02139, USA.
*/
#ifndef __ARCH_ARM_MACH_OMAP_COMMON_H
#define __ARCH_ARM_MACH_OMAP_COMMON_H
extern int __init omap_init_clocksource_32k(void __iomem *vbase);
extern void __init omap_check_revision(void);
extern void omap_reserve(void);
struct omap_hwmod;
extern int omap_dss_reset(struct omap_hwmod *);
#endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */

2
arch/arm/plat-omap/counter_32k.c
View File

@ -22,8 +22,6 @@
#include <asm/mach/time.h>
#include <asm/sched_clock.h>
#include "common.h"
/* OMAP2_32KSYNCNT_CR_OFF: offset of 32ksync counter register */
#define OMAP2_32KSYNCNT_REV_OFF 0x0
#define OMAP2_32KSYNCNT_REV_SCHEME (0x3 << 30)

1
arch/arm/plat-omap/include/plat/counter-32k.h Normal file
View File

@ -0,0 +1 @@
int omap_init_clocksource_32k(void __iomem *vbase);