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

Pull ARM SoC cleanups from Arnd Bergmann:
 "A few simple cleanups across multiple platforms, not much standing
  out:

   - lpc32xx removes its private implementation of the clk API, after
     generic code was merged in 4.5
   - all unused Makefile.boot files get removed
   - a number of simplifications for shmobile
   - asm/clkdev.h gets replaced with the asm-generic version after all
     mach/clkdev.h implementations are gone"

* tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: shmobile: Kconfig: Get rid of old comment
  ARM: shmobile: Consolidate SCU mapping code
  arm: lpc32xx: remove direct control of GPIOs from shared mach file
  arm: lpc32xx: remove selected HAVE_IDE
  arm: lpc32xx: switch to common clock framework
  ARM: Use generic clkdev.h header
  ARM: plat-versatile: Remove unused clock.c file
  ARM: netx: remove redundant "depends on ARCH_NETX"
  ARM: integrator: remove redundant select in Kconfig
  ARM: drop unused Makefile.boot of Multiplatform SoCs
  ARM: mvebu: add missing of_node_put()
  ARM: shmobile: r8a7779: Remove remainings of removed SCU boot setup code
  ARM: shmobile: Typo s/MIPDR/MPIDR/
  ARM: shmobile: Add includes providing forward declarations
  ARM: shmobile: rcar-gen2: Make rcar_gen2_dma_contiguous static
  ARM: mv78xx0: use "depends on" instead of "if" after prompt

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/include/asm/Kbuild
Simple merge

diff --cc arch/arm/mach-lpc32xx/phy3250.c
index e6f03783ad7385d7cb9b899650e7a62aa3f7ac3b,a19071a8d673df2e6ed0e57d4c063ae8672c2bbc..b2f9e226febeee970b0594c8be030a4838735e7c
--- 1/arch/arm/mach-lpc32xx/phy3250.c
--- 2/arch/arm/mach-lpc32xx/phy3250.c
+++ b/arch/arm/mach-lpc32xx/phy3250.c
@@@ -122,27 -101,10 +100,10 @@@ static int lpc32xx_clcd_mmap(struct clc
  
  static void lpc32xx_clcd_remove(struct clcd_fb *fb)
  {
 -      dma_free_writecombine(&fb->dev->dev, fb->fb.fix.smem_len,
 -              fb->fb.screen_base, fb->fb.fix.smem_start);
 +      dma_free_wc(&fb->dev->dev, fb->fb.fix.smem_len, fb->fb.screen_base,
 +                  fb->fb.fix.smem_start);
  }
  
- /*
-  * On some early LCD modules (1307.0), the backlight logic is inverted.
-  * For those board variants, swap the disable and enable states for
-  * BKL_POWER_GPIO.
- */
- static void clcd_disable(struct clcd_fb *fb)
- {
-       gpio_set_value(BKL_POWER_GPIO, 0);
-       gpio_set_value(LCD_POWER_GPIO, 0);
- }
- 
- static void clcd_enable(struct clcd_fb *fb)
- {
-       gpio_set_value(BKL_POWER_GPIO, 1);
-       gpio_set_value(LCD_POWER_GPIO, 1);
- }
- 
  static struct clcd_board lpc32xx_clcd_data = {
        .name           = "Phytec LCD",
        .check          = clcdfb_check,
@@@ -259,7 -208,7 +207,6 @@@ DT_MACHINE_START(LPC32XX_DT, "LPC32XX S
        .atag_offset    = 0x100,
        .map_io         = lpc32xx_map_io,
        .init_irq       = lpc32xx_init_irq,
-       .init_time      = lpc32xx_timer_init,
        .init_machine   = lpc3250_machine_init,
        .dt_compat      = lpc32xx_dt_compat,
 -      .restart        = lpc23xx_restart,
  MACHINE_END