Merge tag 'cleanup-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

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"
  ...

diff --combined arch/arm/mach-at91/board-dt-rm9200.c
index f4b6e91843e44565257982eb7297101bbdbcd4bb,61ea214456643ef1e505f15aebd525e53fc5227d..226563f850b85a9b7f9e884b2223f7a1b15eb6f1
--- 1/arch/arm/mach-at91/board-dt-rm9200.c
--- 2/arch/arm/mach-at91/board-dt-rm9200.c
+++ b/arch/arm/mach-at91/board-dt-rm9200.c
@@@ -14,7 -14,6 +14,7 @@@
  #include <linux/gpio.h>
  #include <linux/of.h>
  #include <linux/of_irq.h>
 +#include <linux/clk-provider.h>
  
  #include <asm/setup.h>
  #include <asm/irq.h>
@@@ -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

diff --combined arch/arm/mach-omap2/omap_hwmod.c
index 9e91a4e7519a63709ea38056373491f2665c8327,98f8ec097063b0422b12431fb56b864b30719fd2..faa65833a0d44c08197f0b699c51766dacb19745
--- 1/arch/arm/mach-omap2/omap_hwmod.c
--- 2/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@@ -769,8 -769,8 +769,8 @@@ static int _init_main_clk(struct omap_h
  
        oh->_clk = clk_get(NULL, oh->main_clk);
        if (IS_ERR(oh->_clk)) {
-               pr_warning("omap_hwmod: %s: cannot clk_get main_clk %s\n",
-                          oh->name, oh->main_clk);
+               pr_warn("omap_hwmod: %s: cannot clk_get main_clk %s\n",
+                       oh->name, oh->main_clk);
                return -EINVAL;
        }
        /*
@@@ -814,8 -814,8 +814,8 @@@ static int _init_interface_clks(struct 
  
                c = clk_get(NULL, os->clk);
                if (IS_ERR(c)) {
-                       pr_warning("omap_hwmod: %s: cannot clk_get interface_clk %s\n",
-                                  oh->name, os->clk);
+                       pr_warn("omap_hwmod: %s: cannot clk_get interface_clk %s\n",
+                               oh->name, os->clk);
                        ret = -EINVAL;
                        continue;
                }
@@@ -851,8 -851,8 +851,8 @@@ static int _init_opt_clks(struct omap_h
        for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++) {
                c = clk_get(NULL, oc->clk);
                if (IS_ERR(c)) {
-                       pr_warning("omap_hwmod: %s: cannot clk_get opt_clk %s\n",
-                                  oh->name, oc->clk);
+                       pr_warn("omap_hwmod: %s: cannot clk_get opt_clk %s\n",
+                               oh->name, oc->clk);
                        ret = -EINVAL;
                        continue;
                }
@@@ -1576,7 -1576,7 +1576,7 @@@ static int _init_clkdm(struct omap_hwmo
  
        oh->clkdm = clkdm_lookup(oh->clkdm_name);
        if (!oh->clkdm) {
-               pr_warning("omap_hwmod: %s: could not associate to clkdm %s\n",
+               pr_warn("omap_hwmod: %s: could not associate to clkdm %s\n",
                        oh->name, oh->clkdm_name);
                return 0;
        }
@@@ -1616,7 -1616,7 +1616,7 @@@ static int _init_clocks(struct omap_hwm
        if (!ret)
                oh->_state = _HWMOD_STATE_CLKS_INITED;
        else
-               pr_warning("omap_hwmod: %s: cannot _init_clocks\n", oh->name);
+               pr_warn("omap_hwmod: %s: cannot _init_clocks\n", oh->name);
  
        return ret;
  }
@@@ -1739,7 -1739,7 +1739,7 @@@ static int _deassert_hardreset(struct o
        _disable_clocks(oh);
  
        if (ret == -EBUSY)
-               pr_warning("omap_hwmod: %s: failed to hardreset\n", oh->name);
+               pr_warn("omap_hwmod: %s: failed to hardreset\n", oh->name);
  
        if (!ret) {
                /*
@@@ -1953,8 -1953,8 +1953,8 @@@ static int _ocp_softreset(struct omap_h
  
        c = _wait_softreset_complete(oh);
        if (c == MAX_MODULE_SOFTRESET_WAIT) {
-               pr_warning("omap_hwmod: %s: softreset failed (waited %d usec)\n",
-                          oh->name, MAX_MODULE_SOFTRESET_WAIT);
+               pr_warn("omap_hwmod: %s: softreset failed (waited %d usec)\n",
+                       oh->name, MAX_MODULE_SOFTRESET_WAIT);
                ret = -ETIMEDOUT;
                goto dis_opt_clks;
        } else {
@@@ -2065,7 -2065,7 +2065,7 @@@ static void _reconfigure_io_chain(void
  
        spin_lock_irqsave(&io_chain_lock, flags);
  
 -      if (cpu_is_omap34xx() && omap3_has_io_chain_ctrl())
 +      if (cpu_is_omap34xx())
                omap3xxx_prm_reconfigure_io_chain();
        else if (cpu_is_omap44xx())
                omap44xx_prm_reconfigure_io_chain();
@@@ -2618,8 -2618,8 +2618,8 @@@ static int __init _setup_reset(struct o
        if (oh->rst_lines_cnt == 0) {
                r = _enable(oh);
                if (r) {
-                       pr_warning("omap_hwmod: %s: cannot be enabled for reset (%d)\n",
-                                  oh->name, oh->_state);
+                       pr_warn("omap_hwmod: %s: cannot be enabled for reset (%d)\n",
+                               oh->name, oh->_state);
                        return -EINVAL;
                }
        }

diff --combined arch/arm/mach-omap2/pdata-quirks.c
index 05a8c8b0744985dafd3d224749f14473a018c8de,73b333f3516271de1fda4754e430f113c9b468c3..b3d3d30ffba0901b77b1cd027c8bc6b056edb93f
--- 1/arch/arm/mach-omap2/pdata-quirks.c
--- 2/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@@ -244,8 -244,8 +244,8 @@@ static void __init nokia_n900_legacy_in
                        /* set IBE to 1 */
                        rx51_secure_update_aux_cr(BIT(6), 0);
                } else {
-                       pr_warning("RX-51: Not enabling ARM errata 430973 workaround\n");
-                       pr_warning("Thumb binaries may crash randomly without this workaround\n");
+                       pr_warn("RX-51: Not enabling ARM errata 430973 workaround\n");
+                       pr_warn("Thumb binaries may crash randomly without this workaround\n");
                }
  
                pr_info("RX-51: Registring OMAP3 HWRNG device\n");
@@@ -405,7 -405,7 +405,7 @@@ static void pdata_quirks_check(struct p
        }
  }
  
 -void __init pdata_quirks_init(struct of_device_id *omap_dt_match_table)
 +void __init pdata_quirks_init(const struct of_device_id *omap_dt_match_table)
  {
        omap_sdrc_init(NULL, NULL);
        pdata_quirks_check(auxdata_quirks);