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

Commit ac9c0cf1 authored by Lee Jones's avatar Lee Jones Committed by Linus Walleij
Browse files

ARM: ux500: Remove checking for DT during timer init 



Decomission the non-DT boot path as we are now DT only

Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent c96e4768

arch/arm/mach-ux500/timer.c

+8 −20
Original line number Original line Diff line number Diff line
@@ -27,18 +27,11 @@ static DEFINE_TWD_LOCAL_TIMER(u8500_twd_local_timer, 
static void __init ux500_twd_init(void)

static void __init ux500_twd_init(void)

{

{

	struct twd_local_timer *twd_local_timer;

	struct twd_local_timer *twd_local_timer;

	int err;





	/* Use this to switch local timer base if changed in new ASICs */

	/* Use this to switch local timer base if changed in new ASICs */

	twd_local_timer = &u8500_twd_local_timer;

	twd_local_timer = &u8500_twd_local_timer;





	if (of_have_populated_dt())

	clocksource_of_init();

	clocksource_of_init();

	else {

		err = twd_local_timer_register(twd_local_timer);

		if (err)

			pr_err("twd_local_timer_register failed %d\n", err);

	}

}

}

#else

#else

#define ux500_twd_init()	do { } while(0)

#define ux500_twd_init()	do { } while(0)
@@ -63,12 +56,8 @@ void __init ux500_timer_init(void) 
		ux500_unknown_soc();

		ux500_unknown_soc();

	}

	}





	/* TODO: Once MTU has been DT:ed place code above into else. */

	if (of_have_populated_dt()) {

#ifdef CONFIG_OF

	np = of_find_matching_node(NULL, prcmu_timer_of_match);

	np = of_find_matching_node(NULL, prcmu_timer_of_match);

	if (!np)

	if (!np)

#endif

		goto dt_fail;

		goto dt_fail;





	tmp_base = of_iomap(np, 0);

	tmp_base = of_iomap(np, 0);
@@ -76,7 +65,6 @@ void __init ux500_timer_init(void) 
		goto dt_fail;

		goto dt_fail;





	prcmu_timer_base = tmp_base;

	prcmu_timer_base = tmp_base;

	}





dt_fail:

dt_fail:

	/* Doing it the old fashioned way. */

	/* Doing it the old fashioned way. */