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

Commit 8117bf17 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Nicolas Ferre
Browse files

ARM: at91: at91rm9200 ST initialization is now DT only 



As at91rm9200 is now DT only, there is no need to keep old entry point in this
at91rm9200 System Timer (ST) driver.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
[nicolas.ferre@atmel.com: split patch]
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 85c4b31e

arch/arm/mach-at91/at91rm9200_time.c

+0 −23
Original line number Diff line number Diff line
@@ -183,7 +183,6 @@ static struct clock_event_device clkevt = { 
void __iomem *at91_st_base;

EXPORT_SYMBOL_GPL(at91_st_base);



#ifdef CONFIG_OF

static struct of_device_id at91rm9200_st_timer_ids[] = {

	{ .compatible = "atmel,at91rm9200-st" },

	{ /* sentinel */ }
@@ -219,28 +218,6 @@ static int __init of_at91rm9200_st_init(void) 
err:

	return -EINVAL;

}

#else

static int __init of_at91rm9200_st_init(void)

{

	return -EINVAL;

}

#endif



void __init at91rm9200_ioremap_st(u32 addr)

{

#ifdef CONFIG_OF

	struct device_node *np;



	np = of_find_matching_node(NULL, at91rm9200_st_timer_ids);

	if (np) {

		of_node_put(np);

		return;

	}

#endif

	at91_st_base = ioremap(addr, 256);

	if (!at91_st_base)

		panic("Impossible to ioremap ST\n");

}



/*

 * ST (system timer) module supports both clockevents and clocksource.

arch/arm/mach-at91/board-dt-rm9200.c

+0 −2
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ 


static void __init at91rm9200_dt_timer_init(void)

{

#if defined(CONFIG_COMMON_CLK)

	of_clk_init(NULL);

#endif

	at91rm9200_timer_init();

}

arch/arm/mach-at91/generic.h

+0 −2
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ extern void __init at91_sysirq_mask_rtc(u32 rtc_base); 
extern void __init at91_sysirq_mask_rtt(u32 rtt_base);



 /* Timer */

extern void __init at91_init_time(void);

extern void at91rm9200_ioremap_st(u32 addr);

extern void at91rm9200_timer_init(void);

extern void at91sam926x_ioremap_pit(u32 addr);

extern void at91sam926x_pit_init(int irq);