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

Commit 23fa648f authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre
Browse files

ARM: at91: pit add DT support 



Retreive registers address and IRQ from device tree entry.
Called from at91_dt_init_irq() so that timers are up-n-running
when timers initialization will occur.

Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
[nicolas.ferre@atmel.com: change error path and interrupts property handling]
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 8014d6f4

Documentation/devicetree/bindings/arm/atmel-at91.txt

0 → 100644
+8 −0
Original line number Diff line number Diff line 
Atmel AT91 device tree bindings.

================================



PIT Timer required properties:

- compatible: Should be "atmel,at91sam9260-pit"

- reg: Should contain registers location and length

- interrupts: Should contain interrupt for the PIT which is the IRQ line

  shared across all System Controller members.

arch/arm/boot/dts/at91sam9g20.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -57,6 +57,12 @@ 
				reg = <0xfffff000 0x200>;

			};



			pit: timer@fffffd30 {

				compatible = "atmel,at91sam9260-pit";

				reg = <0xfffffd30 0xf>;

				interrupts = <1 4>;

			};



			pioA: gpio@fffff400 {

				compatible = "atmel,at91rm9200-gpio";

				reg = <0xfffff400 0x100>;

arch/arm/boot/dts/at91sam9g45.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -58,6 +58,12 @@ 
				reg = <0xfffff000 0x200>;

			};



			pit: timer@fffffd30 {

				compatible = "atmel,at91sam9260-pit";

				reg = <0xfffffd30 0xf>;

				interrupts = <1 4>;

			};



			dma: dma-controller@ffffec00 {

				compatible = "atmel,at91sam9g45-dma";

				reg = <0xffffec00 0x200>;

arch/arm/mach-at91/at91sam926x_time.c

+61 −2
Original line number Diff line number Diff line
@@ -14,6 +14,9 @@ 
#include <linux/kernel.h>

#include <linux/clk.h>

#include <linux/clockchips.h>

#include <linux/of.h>

#include <linux/of_address.h>

#include <linux/of_irq.h>



#include <asm/mach/time.h>
@@ -133,7 +136,8 @@ static irqreturn_t at91sam926x_pit_interrupt(int irq, void *dev_id) 
static struct irqaction at91sam926x_pit_irq = {

	.name		= "at91_tick",

	.flags		= IRQF_SHARED | IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,

	.handler	= at91sam926x_pit_interrupt

	.handler	= at91sam926x_pit_interrupt,

	.irq		= AT91_ID_SYS,

};



static void at91sam926x_pit_reset(void)
@@ -149,6 +153,49 @@ static void at91sam926x_pit_reset(void) 
	pit_write(AT91_PIT_MR, (pit_cycle - 1) | AT91_PIT_PITEN);

}



#ifdef CONFIG_OF

static struct of_device_id pit_timer_ids[] = {

	{ .compatible = "atmel,at91sam9260-pit" },

	{ /* sentinel */ }

};



static int __init of_at91sam926x_pit_init(void)

{

	struct device_node	*np;

	int			ret;



	np = of_find_matching_node(NULL, pit_timer_ids);

	if (!np)

		goto err;



	pit_base_addr = of_iomap(np, 0);

	if (!pit_base_addr)

		goto node_err;



	/* Get the interrupts property */

	ret = irq_of_parse_and_map(np, 0);

	if (!ret)

		goto ioremap_err;

	at91sam926x_pit_irq.irq = ret;



	of_node_put(np);



	return 0;



ioremap_err:

	iounmap(pit_base_addr);

node_err:

	of_node_put(np);

err:

	return -EINVAL;

}

#else

static int __init of_at91sam926x_pit_init(void)

{

	return -EINVAL;

}

#endif



/*

 * Set up both clocksource and clockevent support.

 */
@@ -157,6 +204,9 @@ static void __init at91sam926x_pit_init(void) 
	unsigned long	pit_rate;

	unsigned	bits;



	/* For device tree enabled device: initialize here */

	of_at91sam926x_pit_init();



	/*

	 * Use our actual MCK to figure out how many MCK/16 ticks per

	 * 1/HZ period (instead of a compile-time constant LATCH).
@@ -177,7 +227,7 @@ static void __init at91sam926x_pit_init(void) 
	clocksource_register_hz(&pit_clk, pit_rate);



	/* Set up irq handler */

	setup_irq(AT91_ID_SYS, &at91sam926x_pit_irq);

	setup_irq(at91sam926x_pit_irq.irq, &at91sam926x_pit_irq);



	/* Set up and register clockevents */

	pit_clkevt.mult = div_sc(pit_rate, NSEC_PER_SEC, pit_clkevt.shift);
@@ -193,6 +243,15 @@ static void at91sam926x_pit_suspend(void) 


void __init at91sam926x_ioremap_pit(u32 addr)

{

#if defined(CONFIG_OF)

	struct device_node *np =

		of_find_matching_node(NULL, pit_timer_ids);



	if (np) {

		of_node_put(np);

		return;

	}

#endif

	pit_base_addr = ioremap(addr, 16);



	if (!pit_base_addr)

arch/arm/mach-at91/at91sam9x5.c

+0 −2
Original line number Diff line number Diff line
@@ -301,8 +301,6 @@ static void __init at91sam9x5_map_io(void) 


static void __init at91sam9x5_ioremap_registers(void)

{

	if (of_at91sam926x_pit_init() < 0)

		panic("Impossible to find PIT\n");

	at91_ioremap_ramc(0, AT91SAM9X5_BASE_DDRSDRC0, 512);

}