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

Commit 4693c723 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'at91-drivers2' of git://github.com/at91linux/linux-at91 into next/drivers 

Merge " Second drivers series for AT91/3.18" from Nicolas Ferre:

- move of the PIT (basic timer) from mach-at91 to its proper location:
  drivers/clocksource
- big cleanup of this driver along the way

* tag 'at91-drivers2' of git://github.com/at91linux/linux-at91

:
  ARM: at91: PIT: Move the driver to drivers/clocksource
  ARM: at91: Give the PIT irq as an argument of at91sam926x_pit_init
  ARM: at91: Convert the boards to the init_time callback
  ARM: at91: soc: Add init_time callback
  ARM: at91: PIT: (Almost) remove the global variables
  ARM: at91: PIT: use request_irq instead of setup_irq
  ARM: at91: PIT: Use pr_fmt
  ARM: at91: PIT: Use consistent exit path in probe
  ARM: at91: dt: Remove init_time definitions
  ARM: at91: PIT: Rework probe functions
  ARM: at91: PIT: Use of_have_populated_dt instead of CONFIG_OF
  ARM: at91: PIT: Use DIV_ROUND_CLOSEST to compute the cycles
  ARM: at91: generic.h: Add include safe guards
  ARM: at91: PIT: Follow the general coding rules

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2f83c3da b052ff30

arch/arm/mach-at91/Kconfig

+0 −5
Original line number Original line Diff line number Diff line
@@ -33,15 +33,11 @@ config OLD_IRQ_AT91 
	select MULTI_IRQ_HANDLER

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select SPARSE_IRQ





config AT91_SAM9_TIME

	bool



config HAVE_AT91_SMD

config HAVE_AT91_SMD

	bool

	bool





config SOC_AT91SAM9

config SOC_AT91SAM9

	bool

	bool

	select AT91_SAM9_TIME

	select ATMEL_AIC_IRQ if !OLD_IRQ_AT91

	select ATMEL_AIC_IRQ if !OLD_IRQ_AT91

	select CPU_ARM926T

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS
@@ -50,7 +46,6 @@ config SOC_AT91SAM9 




config SOC_SAMA5

config SOC_SAMA5

	bool

	bool

	select AT91_SAM9_TIME

	select ATMEL_AIC5_IRQ

	select ATMEL_AIC5_IRQ

	select CPU_V7

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

arch/arm/mach-at91/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,6 @@ obj- := 




obj-$(CONFIG_OLD_IRQ_AT91)	+= irq.o

obj-$(CONFIG_OLD_IRQ_AT91)	+= irq.o

obj-$(CONFIG_OLD_CLK_AT91)	+= clock.o

obj-$(CONFIG_OLD_CLK_AT91)	+= clock.o

obj-$(CONFIG_AT91_SAM9_TIME)	+= at91sam926x_time.o

obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o

obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o





# CPU-specific support

# CPU-specific support

arch/arm/mach-at91/at91sam9260.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -440,6 +440,11 @@ static unsigned int at91sam9260_default_irq_priority[NR_AIC_IRQS] __initdata = { 
	0,	/* Advanced Interrupt Controller */

	0,	/* Advanced Interrupt Controller */

};

};





static void __init at91sam9260_init_time(void)

{

	at91sam926x_pit_init(NR_IRQS_LEGACY + AT91_ID_SYS);

}



AT91_SOC_START(at91sam9260)

AT91_SOC_START(at91sam9260)

	.map_io = at91sam9260_map_io,

	.map_io = at91sam9260_map_io,

	.default_irq_priority = at91sam9260_default_irq_priority,

	.default_irq_priority = at91sam9260_default_irq_priority,
@@ -449,4 +454,5 @@ AT91_SOC_START(at91sam9260) 
	.register_clocks = at91sam9260_register_clocks,

	.register_clocks = at91sam9260_register_clocks,

	.register_devices = at91sam9260_register_devices,

	.register_devices = at91sam9260_register_devices,

	.init = at91sam9260_initialize,

	.init = at91sam9260_initialize,

	.init_time = at91sam9260_init_time,

AT91_SOC_END
 
AT91_SOC_END

arch/arm/mach-at91/at91sam9261.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -399,6 +399,11 @@ static unsigned int at91sam9261_default_irq_priority[NR_AIC_IRQS] __initdata = { 
	0,	/* Advanced Interrupt Controller */

	0,	/* Advanced Interrupt Controller */

};

};





static void __init at91sam9261_init_time(void)

{

	at91sam926x_pit_init(NR_IRQS_LEGACY + AT91_ID_SYS);

}



AT91_SOC_START(at91sam9261)

AT91_SOC_START(at91sam9261)

	.map_io = at91sam9261_map_io,

	.map_io = at91sam9261_map_io,

	.default_irq_priority = at91sam9261_default_irq_priority,

	.default_irq_priority = at91sam9261_default_irq_priority,
@@ -408,4 +413,5 @@ AT91_SOC_START(at91sam9261) 
	.register_clocks = at91sam9261_register_clocks,

	.register_clocks = at91sam9261_register_clocks,

	.register_devices = at91sam9261_register_devices,

	.register_devices = at91sam9261_register_devices,

	.init = at91sam9261_initialize,

	.init = at91sam9261_initialize,

	.init_time = at91sam9261_init_time,

AT91_SOC_END
 
AT91_SOC_END

arch/arm/mach-at91/at91sam9263.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -422,6 +422,11 @@ static unsigned int at91sam9263_default_irq_priority[NR_AIC_IRQS] __initdata = { 
	0,	/* Advanced Interrupt Controller (IRQ1) */

	0,	/* Advanced Interrupt Controller (IRQ1) */

};

};





static void __init at91sam9263_init_time(void)

{

	at91sam926x_pit_init(NR_IRQS_LEGACY + AT91_ID_SYS);

}



AT91_SOC_START(at91sam9263)

AT91_SOC_START(at91sam9263)

	.map_io = at91sam9263_map_io,

	.map_io = at91sam9263_map_io,

	.default_irq_priority = at91sam9263_default_irq_priority,

	.default_irq_priority = at91sam9263_default_irq_priority,
@@ -430,4 +435,5 @@ AT91_SOC_START(at91sam9263) 
	.register_clocks = at91sam9263_register_clocks,

	.register_clocks = at91sam9263_register_clocks,

	.register_devices = at91sam9263_register_devices,

	.register_devices = at91sam9263_register_devices,

	.init = at91sam9263_initialize,

	.init = at91sam9263_initialize,

	.init_time = at91sam9263_init_time,

AT91_SOC_END
 
AT91_SOC_END