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

Commit bce9e90f authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'fixes-timer-build' of git://github.com/jonhunter/linux into... 

Merge branch 'fixes-timer-build' of git://github.com/jonhunter/linux into omap-for-v3.8/fixes-for-merge-window

Pull timer fixes from Jon Hunter <jon-hunter@ti.com>:

Fixes for a few timer warnings observed with different kernel
configurations for OMAP2+ devices.

I have dropped the patch to fix a build error for OMAP4 in the
timer code as Olof already has this fix merged.
parents 698d6012 bf85f205

arch/arm/mach-omap2/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ config SOC_HAS_OMAP2_SDRC 


config SOC_HAS_REALTIME_COUNTER

	bool "Real time free running counter"

	depends on SOC_OMAP5

	default y



config ARCH_OMAP2

	bool "TI OMAP2"
@@ -79,7 +81,6 @@ config SOC_OMAP5 
	select ARM_GIC

	select CPU_V7

	select HAVE_SMP

	select SOC_HAS_REALTIME_COUNTER

	select COMMON_CLK



comment "OMAP Core Type"

arch/arm/mach-omap2/timer.c

+3 −3
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static struct device_node * __init omap_get_timer_dt(struct of_device_id *match, 
 * kernel registering these devices remove them dynamically from the device

 * tree on boot.

 */

void __init omap_dmtimer_init(void)

static void __init omap_dmtimer_init(void)

{

	struct device_node *np;
@@ -210,7 +210,7 @@ void __init omap_dmtimer_init(void) 
 *

 * Get the timer errata flags that are specific to the OMAP device being used.

 */

u32 __init omap_dm_timer_get_errata(void)

static u32 __init omap_dm_timer_get_errata(void)

{

	if (cpu_is_omap24xx())

		return 0;
@@ -392,7 +392,7 @@ static struct of_device_id omap_counter_match[] __initdata = { 
};



/* Setup free-running counter for clocksource */

static int __init omap2_sync32k_clocksource_init(void)

static int __init __maybe_unused omap2_sync32k_clocksource_init(void)

{

	int ret;

	struct device_node *np = NULL;