diff options
author | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 16:18:18 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-11-28 16:18:18 +0100 |
commit | 00239d9da38419792494ce7d2bb69a4ee8b5b374 (patch) | |
tree | 58976abf01ffe581899ae48d879239c3dac17590 /arch/arm/mach-at91/setup.c | |
parent | e155aee2b279b099da5c5cfd6df5795e7388ece1 (diff) | |
parent | 4a109c50d1958a2783df01980b55508fe47bb79c (diff) | |
download | linux-00239d9da38419792494ce7d2bb69a4ee8b5b374.tar.bz2 |
Merge tag 'at91-cleanup4' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/cleanup
Pull "Fourth batch of cleanup/SoC for 3.19" from Nicolas Ferre:
- removal of legacy board support for the last SoC having board C files: at91rm9200
- removal or modification of some Kconfig options
- switch to USE_OF for all the AT91 SoCs
- removal of the old AT91-specific clocks and IRQ drivers
* tag 'at91-cleanup4' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91: remove unused IRQ function declarations
ARM: at91: remove legacy IRQ driver and related code
ARM: at91: remove old at91-specific clock driver
ARM: at91: remove clock data in at91sam9n12.c and at91sam9x5.c files
ARM: at91: remove all !DT related configuration options
ARM: at91/trivial: update Kconfig comment to mention SAMA5
ARM: at91: always USE_OF from now on
ARM: at91/Kconfig: remove ARCH_AT91RM9200 option for drivers
ARM: at91: switch configuration option to SOC_AT91RM9200
ARM: at91: remove at91rm9200 legacy board support
ARM: at91: remove at91rm9200 legacy boards files
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/setup.c')
-rw-r--r-- | arch/arm/mach-at91/setup.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/arm/mach-at91/setup.c b/arch/arm/mach-at91/setup.c index a78fbb7b13c9..6c3013e3309b 100644 --- a/arch/arm/mach-at91/setup.c +++ b/arch/arm/mach-at91/setup.c @@ -49,10 +49,6 @@ void __init at91_init_irq_default(void) void __init at91_init_interrupts(unsigned int *priority) { - /* Initialize the AIC interrupt controller */ - if (IS_ENABLED(CONFIG_OLD_IRQ_AT91)) - at91_aic_init(priority, at91_boot_soc.extern_irq); - /* Enable GPIO interrupts */ at91_gpio_irq_setup(); } @@ -460,9 +456,6 @@ void __init at91rm9200_dt_initialize(void) { at91_dt_ramc(); - /* Init clock subsystem */ - at91_dt_clock_init(); - /* Register the processor-specific clocks */ if (at91_boot_soc.register_clocks) at91_boot_soc.register_clocks(); @@ -474,9 +467,6 @@ void __init at91_dt_initialize(void) { at91_dt_ramc(); - /* Init clock subsystem */ - at91_dt_clock_init(); - /* Register the processor-specific clocks */ if (at91_boot_soc.register_clocks) at91_boot_soc.register_clocks(); @@ -490,9 +480,6 @@ void __init at91_initialize(unsigned long main_clock) { at91_boot_soc.ioremap_registers(); - /* Init clock subsystem */ - at91_clock_init(main_clock); - /* Register the processor-specific clocks */ at91_boot_soc.register_clocks(); |