diff options
| author | Olof Johansson <olof@lixom.net> | 2015-04-03 20:44:28 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-04-03 20:44:28 +0300 |
| commit | aabab880c5441cd39aef75fc1ecaa3125efb7a89 (patch) | |
| tree | fa16a997164b3445bb3db233e229c56f9919ac49 /arch/arm/mach-at91/generic.h | |
| parent | 4580cb8a9812c3acc7a1663064d2a2800b3541bd (diff) | |
| parent | 8590ca655a19f9e124b52bfbf28f14eb16a05bec (diff) | |
| download | linux-aabab880c5441cd39aef75fc1ecaa3125efb7a89.tar.xz | |
Merge tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/drivers
Merge "at91: cleanup for 4.1 #3" from Nicolas Ferre:
Third batch of cleanup for 4.1:
- System Timer (ST) for at91rm9200 re-work (syscon/regmap):
- watchdog
- restart handler
- timer as a proper clocksource
=> remove mach dependency + cleanup
* tag 'at91-cleanup3' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91: (54 commits)
ARM: at91: remove useless include
clocksource: atmel-st: remove mach/hardware dependency
clocksource: atmel-st: use syscon/regmap
ARM: at91: time: move the system timer driver to drivers/clocksource
ARM: at91: properly initialize timer
ARM: at91: at91rm9200: remove deprecated arm_pm_restart
watchdog: at91rm9200: implement restart handler
watchdog: at91rm9200: use the system timer syscon
mfd: syscon: Add atmel system timer registers definition
ARM: at91/dt: declare atmel,at91rm9200-st as a syscon
ARM: at91: remove old setup
ARM: at91: sama5d4: remove useless map_io
ARM: at91: sama5 use SoC detection infrastructure
ARM: at91: at91sam9: use SoC detection infrastructure
ARM: at91: at91rm9200 use SoC detection infrastructure
ARM: at91: add soc detection infrastructure
ARM: at91/dt: introduce atmel,<chip>-dbgu
ARM: at91: remove unused _matrix.h headers
ARM: at91: remove unused at91_ioremap_matrix and header
ARM: at91: remove NEED_MACH_IO_H
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-at91/generic.h')
| -rw-r--r-- | arch/arm/mach-at91/generic.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h index 583369ffc284..b0fa7dc7286d 100644 --- a/arch/arm/mach-at91/generic.h +++ b/arch/arm/mach-at91/generic.h @@ -18,17 +18,10 @@ extern void __init at91_map_io(void); extern void __init at91_alt_map_io(void); - /* Timer */ -extern void at91rm9200_timer_init(void); - /* idle */ extern void at91rm9200_idle(void); extern void at91sam9_idle(void); -/* Matrix */ -extern void at91_ioremap_matrix(u32 base_addr); - - #ifdef CONFIG_PM extern void __init at91rm9200_pm_init(void); extern void __init at91sam9260_pm_init(void); |