From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 8 Oct 2014 21:06:53 +0000 (-0400)
Subject: Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=212fe84a6f215c39795a76517c1c02114d428681;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'cleanup-for-linus' of git://git./linux/kernel/git/arm/arm-soc

Pull ARM SoC cleanups from Arnd Bergmann:
 "This time around, the cleanup branch contains mostly code removal.  A
  number of board files for at91, imx and msm have become obsolete
  because of the DT conversion and are now ready to be removed.  The
  OMAP platform has traditionally had its own DMA engine abstraction and
  as this is being phased out, a lot of the original code is now unused
  and can be removed as well.

  S3C24xx can be simplified now that the restart code is a proper device
  driver.

  Finally, a number of cleanups in shmobile are done to prepare for the
  addition of new code in other branches"

* tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (43 commits)
  ARM: at91: Remove the support for the RSI EWS board
  arm: mach-omap2: Convert pr_warning to pr_warn
  ARM: OMAP: Remove unused pieces of legacy DMA API
  ARM: at91: remove board file for Acme Systems Fox G20
  ARM: orion5x: Convert pr_warning to pr_warn
  ARM: S3C24XX: remove separate restart code
  ARM: EXYNOS: Do not calculate boot address twice
  ARM: sunxi: Remove sun4i reboot code from mach directory
  ARM: imx: Remove mach-mxt_td60 board file
  ARM: shmobile: armadillo800eva legacy: Use rmobile_add_devices_to_domains()
  ARM: shmobile: r8a7740: Clean up pm domain table
  ARM: shmobile: r8a7740: Use rmobile_add_devices_to_domains()
  ARM: shmobile: sh7372: Make domain_devices[] static __initdata
  ARM: shmobile: mackerel: Make domain_devices[] static __initdata
  clocksource: tcb_clksrc: sanitize IRQ request
  ARM: at91/tclib: mask interruptions at shutdown and probe
  ARM: at91/tclib: move initialization from alloc to probe
  ARM: at91/tclib: prefer using of devm_* functions
  ARM: clps711x: Switch CLPS711X subarch to use clk and clocksource driver
  ARM: shmobile: r8a7791 is now called "R-Car M2-W"
  ...
---

212fe84a6f215c39795a76517c1c02114d428681
diff --cc arch/arm/mach-at91/board-dt-rm9200.c
index f4b6e91843e4,61ea21445664..226563f850b8
--- a/arch/arm/mach-at91/board-dt-rm9200.c
+++ b/arch/arm/mach-at91/board-dt-rm9200.c
@@@ -25,35 -24,14 +25,22 @@@
  #include "at91_aic.h"
  #include "generic.h"
  
- 
- static const struct of_device_id irq_of_match[] __initconst = {
- 	{ .compatible = "atmel,at91rm9200-aic", .data = at91_aic_of_init },
- 	{ /*sentinel*/ }
- };
- 
- static void __init at91rm9200_dt_init_irq(void)
- {
- 	of_irq_init(irq_of_match);
- }
- 
 +static void __init at91rm9200_dt_timer_init(void)
 +{
 +#if defined(CONFIG_COMMON_CLK)
 +	of_clk_init(NULL);
 +#endif
 +	at91rm9200_timer_init();
 +}
 +
  static const char *at91rm9200_dt_board_compat[] __initdata = {
  	"atmel,at91rm9200",
  	NULL
  };
  
  DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)")
 -	.init_time      = at91rm9200_timer_init,
 +	.init_time      = at91rm9200_dt_timer_init,
  	.map_io		= at91_map_io,
- 	.handle_irq	= at91_aic_handle_irq,
  	.init_early	= at91rm9200_dt_initialize,
- 	.init_irq	= at91rm9200_dt_init_irq,
  	.dt_compat	= at91rm9200_dt_board_compat,
  MACHINE_END