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

Pull ARM SoC platform updates from Arnd Bergmann:
 "SoC platform changes (arch/arm/mach-*). This merge window, the bulk is
  for a few platforms:

   - Andres Färber adds initial support for the Actions Semi S500 (aka
     'owl') platform, a close relative of the S900 platform he adds for
     arm64.

   - in mach-omap2, we remove more legacy code

   - Rockchips gains support for the RV1108 SoC designed for camera
     applications.

   - For Atmel, we gain support for MMU-less SoCs (SAME70/V71/S70/V70)

   - Minor updates for other platforms, including davinci, s3c64xx,
     prima2, stm32, broadcom nsp, amlogic, pxa, imx and renesas"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (74 commits)
  ARM: owl: smp: Drop bogus holding pen
  ARM: owl: Drop custom machine
  ARM: owl: smp: Implement SPS power-gating for CPU2 and CPU3
  soc: actions: owl-sps: Factor out owl_sps_set_pg() for power-gating
  soc: actions: Add Owl SPS
  dt-bindings: power: Add Owl SPS power domains
  MAINTAINERS: Update Actions Semi section with SPS
  ARM: owl: Implement CPU enable-method for S500
  MAINTAINERS: Add Actions Semi Owl section
  ARM: Prepare Actions Semi S500
  ARM: socfpga: Increase max number of GPIOs
  ARM: stm32: Introduce MACH_STM32F469 flag
  ARM: prima2: remove redundant select CPU_V7
  ARM: davinci: fix const warnings
  ARM: shmobile: pm-rmobile: Use GENPD_FLAG_ALWAYS_ON
  ARM: OMAP4: hwmod_data: add SHAM crypto accelerator
  ARM: OMAP4: hwmod data: add des
  ARM: OMAP4: hwmod data: add aes2
  ARM: OMAP4: hwmod data: add aes1
  ARM: pxa: Delete an error message for a failed memory allocation in pxa3xx_u2d_probe()
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/mach-bcm/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/timer.c
Simple merge

diff --cc arch/arm/mach-rockchip/rockchip.c
Simple merge

diff --cc arch/arm/mach-s3c64xx/Kconfig
Simple merge

diff --cc include/linux/platform_data/atmel.h
index d36bc8d17e977684f5a1ecdaa5fcf6f0b5a3fbf5,70c5c766628e17957620651eb6822dcbcb8b7e6e..cdceb4d4ef9d21bf42e02c09f27eae4aca7c6b1d
--- 1/include/linux/platform_data/atmel.h
--- 2/include/linux/platform_data/atmel.h
+++ b/include/linux/platform_data/atmel.h
@@@ -7,9 -7,8 +7,6 @@@
  #ifndef __ATMEL_H__
  #define __ATMEL_H__
  
- #include <linux/mtd/nand.h>
- #include <linux/mtd/partitions.h>
 -#include <linux/serial.h>
--
   /* Compact Flash */
  struct at91_cf_data {
        int     irq_pin;                /* I/O IRQ */
@@@ -22,26 -21,23 +19,14 @@@
  #define AT91_IDE_SWAP_A0_A2   0x02
  };
  
-  /* NAND / SmartMedia */
- struct atmel_nand_data {
-       int             enable_pin;             /* chip enable */
-       int             det_pin;                /* card detect */
-       int             rdy_pin;                /* ready/busy */
-       u8              rdy_pin_active_low;     /* rdy_pin value is inverted */
-       u8              ale;                    /* address line number connected to ALE */
-       u8              cle;                    /* address line number connected to CLE */
-       u8              bus_width_16;           /* buswidth is 16 bit */
-       u8              ecc_mode;               /* ecc mode */
-       u8              on_flash_bbt;           /* bbt on flash */
-       struct mtd_partition *parts;
-       unsigned int    num_parts;
-       bool            has_dma;                /* support dma transfer */
- 
-       /* default is false, only for at32ap7000 chip is true */
-       bool            need_reset_workaround;
 - /* Serial */
 -struct atmel_uart_data {
 -      int                     num;            /* port num */
 -      short                   use_dma_tx;     /* use transmit DMA? */
 -      short                   use_dma_rx;     /* use receive DMA? */
 -      void __iomem            *regs;          /* virt. base address, if any */
 -      struct serial_rs485     rs485;          /* rs485 settings */
--};
--
  /* FIXME: this needs a better location, but gets stuff building again */
+ #ifdef CONFIG_ATMEL_PM
  extern int at91_suspend_entering_slow_clock(void);
+ #else
+ static inline int at91_suspend_entering_slow_clock(void)
+ {
+       return 0;
+ }
+ #endif
  
  #endif /* __ATMEL_H__ */