Skip to content

Commit

Permalink
ARM: OMAP: Remove plat-omap/common.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tony Lindgren committed Oct 31, 2012
1 parent 6e740f9 commit 5c2e885
Show file tree
Hide file tree
Showing 13 changed files with 6 additions and 51 deletions.
1 change: 0 additions & 1 deletion arch/arm/mach-omap1/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap1/timer32k.c
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/mach-omap2/cm33xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions arch/arm/mach-omap2/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@

#include <asm/proc-fns.h>

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

#include "i2c.h"
#include "serial.h"

Expand Down Expand Up @@ -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 changes: 0 additions & 2 deletions arch/arm/mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@

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

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

#include "omap_hwmod.h"
#include "hdq1w.h"

Expand Down
2 changes: 0 additions & 2 deletions arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 0 additions & 2 deletions arch/arm/mach-omap2/prm33xx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 0 additions & 1 deletion arch/arm/mach-omap2/prm_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/timer.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 0 additions & 1 deletion arch/arm/plat-omap/common.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
36 changes: 0 additions & 36 deletions arch/arm/plat-omap/common.h

This file was deleted.

2 changes: 0 additions & 2 deletions arch/arm/plat-omap/counter_32k.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 1 addition & 0 deletions arch/arm/plat-omap/include/plat/counter-32k.h
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
int omap_init_clocksource_32k(void __iomem *vbase);

0 comments on commit 5c2e885

Please sign in to comment.