Skip to content

Commit 2ee04b8

Browse files
committed
ARM: OMAP2+: Drop old timer code for dmtimer and 32k counter
With dmtimer and 32k counter being initialized based on devicetree data, we can just drop the old timer code. This still leaves the omap5 and dra7 realtime_counter_init() that depend on the smc calls and control module platform code for the dra7 quirk init. Cc: Grygorii Strashko <[email protected]> Cc: Keerthy <[email protected]> Cc: Lokesh Vutla <[email protected]> Cc: Rob Herring <[email protected]> Cc: Tero Kristo <[email protected]> Signed-off-by: Tony Lindgren <[email protected]>
1 parent 64dbc3d commit 2ee04b8

File tree

3 files changed

+10
-552
lines changed

3 files changed

+10
-552
lines changed

arch/arm/mach-omap2/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ccflags-y := -I$(srctree)/$(src)/include \
77
-I$(srctree)/arch/arm/plat-omap/include
88

99
# Common support
10-
obj-y := id.o io.o control.o devices.o fb.o timer.o pm.o \
10+
obj-y := id.o io.o control.o devices.o fb.o pm.o \
1111
common.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \
1212
omap_device.o omap-headsmp.o sram.o
1313

@@ -16,6 +16,8 @@ hwmod-common = omap_hwmod.o omap_hwmod_reset.o \
1616
clock-common = clock.o
1717
secure-common = omap-smc.o omap-secure.o
1818

19+
obj-$(CONFIG_SOC_HAS_REALTIME_COUNTER) += timer.o
20+
1921
obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)
2022
obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common) $(secure-common)
2123
obj-$(CONFIG_ARCH_OMAP4) += $(hwmod-common) $(secure-common)

arch/arm/mach-omap2/common.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,14 @@ static inline int omap_l2_cache_init(void)
111111
#define OMAP_L2C_AUX_CTRL 0
112112
#define omap4_l2c310_write_sec NULL
113113
#endif
114+
115+
#ifdef CONFIG_SOC_HAS_REALTIME_COUNTER
114116
extern void omap5_realtime_timer_init(void);
117+
#else
118+
static inline void omap5_realtime_timer_init(void)
119+
{
120+
}
121+
#endif
115122

116123
void omap2420_init_early(void);
117124
void omap2430_init_early(void);

0 commit comments

Comments
 (0)