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

Pull ARM SoC platform changes from Arnd Bergmann:
 "New and updated SoC support.  Among the things new for this release
  are:

   - at91: Added support for the new SAMA5D4 SoC, following the earlier
     SAMA5D3
   - bcm: Added support for BCM63XX family of DSL SoCs
   - hisi: Added support for HiP04 server-class SoC
   - meson: Initial support for the Amlogic Meson6 (aka 8726MX) platform
   - shmobile: added support for new r8a7794 (R-Car E2) automotive SoC

  Noteworthy changes to existing SoC support are:

   - imx: convert i.MX1 to device tree
   - omap: lots of power management work
   - omap: base support to enable moving to standard UART driver
   - shmobile: lots of progress for multiplatform support, still
     ongoing"

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (171 commits)
  ARM: hisi: depend on ARCH_MULTI_V7
  CNS3xxx: Fix debug UART.
  ARM: at91: fix nommu build regression
  ARM: meson: add basic support for MesonX SoCs
  ARM: meson: debug: add debug UART for earlyprintk support
  irq: Export handle_fasteoi_irq
  ARM: mediatek: Add earlyprintk support for mt6589
  ARM: hisi: Fix platmcpm compilation when ARMv6 is selected
  ARM: debug: fix alphanumerical order on debug uarts
  ARM: at91: document Atmel SMART compatibles
  ARM: at91: add sama5d4 support to sama5_defconfig
  ARM: at91: dt: add device tree file for SAMA5D4ek board
  ARM: at91: dt: add device tree file for SAMA5D4 SoC
  ARM: at91: SAMA5D4 SoC detection code and low level routines
  ARM: at91: introduce basic SAMA5D4 support
  clk: at91: add a driver for the h32mx clock
  ARM: pxa3xx: provide specific platform_devices for all ssp ports
  ARM: pxa: ssp: provide platform_device_id for PXA3xx
  ARM: OMAP4+: Remove static iotable mappings for SRAM
  ARM: OMAP4+: Move SRAM data to DT
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
index 6a5b4968b46e169a232fc36056cdd1802d2316d0,295428de5d03aa99b43ab3e2d452bf31fd7a057b..03dc4c1a8736e78e5878298b9ff0c797e67f57fb
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1093,8 -1132,8 +1132,9 @@@ config DEBUG_UART_PHY
                                DEBUG_S3C2410_UART1)
        default 0x50008000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART2 || \
                                DEBUG_S3C2410_UART2)
+       default 0x78000000 if DEBUG_CNS3XXX
        default 0x7c0003f8 if FOOTBRIDGE
 +      default 0x78000000 if DEBUG_CNS3XXX
        default 0x80070000 if DEBUG_IMX23_UART
        default 0x80074000 if DEBUG_IMX28_UART
        default 0x80230000 if DEBUG_PICOXCELL_UART

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/boot/dts/Makefile
Simple merge

diff --cc arch/arm/boot/dts/am4372.dtsi
Simple merge

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

diff --cc arch/arm/mach-at91/Makefile
Simple merge

diff --cc arch/arm/mach-at91/board-dt-sama5.c
Simple merge

diff --cc arch/arm/mach-at91/setup.c
Simple merge

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

diff --cc arch/arm/mach-omap2/common.h
Simple merge

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

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

diff --cc arch/arm/mach-omap2/prm3xxx.c
index 372de3edf4a582f24957beceb5764e6b1247b527,e0088e0508f8a3681dca223710e9f4bc4175c6de..ff08da385a2dd2facc58784957a55e09571fd33b
--- 1/arch/arm/mach-omap2/prm3xxx.c
--- 2/arch/arm/mach-omap2/prm3xxx.c
+++ b/arch/arm/mach-omap2/prm3xxx.c
@@@ -680,13 -662,18 +686,25 @@@ static int omap3xxx_prm_late_init(void
        if (!(prm_features & PRM_HAS_IO_WAKEUP))
                return 0;
  
 +      if (omap3_has_io_chain_ctrl())
 +              omap3_prcm_irq_setup.reconfigure_io_chain =
 +                      omap3_prm_reconfigure_io_chain;
 +      else
 +              omap3_prcm_irq_setup.reconfigure_io_chain =
 +                      omap3430_pre_es3_1_reconfigure_io_chain;
 +
+       if (of_have_populated_dt()) {
+               struct device_node *np;
+               int irq_num;
+ 
+               np = of_find_matching_node(NULL, omap3_prm_dt_match_table);
+               if (np) {
+                       irq_num = of_irq_get(np, 0);
+                       if (irq_num >= 0)
+                               omap3_prcm_irq_setup.irq = irq_num;
+               }
+       }
+ 
        omap3xxx_prm_enable_io_wakeup();
        ret = omap_prcm_register_chain_handler(&omap3_prcm_irq_setup);
        if (!ret)

diff --cc arch/arm/mach-shmobile/Kconfig
index efc49dabbf2fc7f4d4da053fd0121363c13e2cc2,8bd5bf289e645fe772ec1a6d872f41a0542c1e9f..21f457b56c016a7c67b4a2e73b42048af197e9ca
--- 1/arch/arm/mach-shmobile/Kconfig
--- 2/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@@ -50,23 -26,31 +50,28 @@@ config ARCH_R7S7210
        bool "RZ/A1H (R7S72100)"
        select SYS_SUPPORTS_SH_MTU2
  
+ config ARCH_R8A7740
+       bool "R-Mobile A1 (R8A77400)"
+       select ARCH_RMOBILE
+       select RENESAS_INTC_IRQPIN
+ 
  config ARCH_R8A7779
        bool "R-Car H1 (R8A77790)"
 -      select RENESAS_INTC_IRQPIN
 -      select SYS_SUPPORTS_SH_TMU
 +      select ARCH_RCAR_GEN1
  
  config ARCH_R8A7790
        bool "R-Car H2 (R8A77900)"
 -      select RENESAS_IRQC
 -      select SYS_SUPPORTS_SH_CMT
 +      select ARCH_RCAR_GEN2
  
  config ARCH_R8A7791
 -      bool "R-Car M2 (R8A77910)"
 -      select RENESAS_IRQC
 -      select SYS_SUPPORTS_SH_CMT
 +      bool "R-Car M2-W (R8A77910)"
 +      select ARCH_RCAR_GEN2
  
- comment "Renesas ARM SoCs Board Type"
+ config ARCH_R8A7794
+       bool "R-Car E2 (R8A77940)"
+       select ARCH_RCAR_GEN2
  
- config MACH_GENMAI
-       bool "Genmai board"
-       depends on ARCH_R7S72100
+ comment "Renesas ARM SoCs Board Type"
  
  config MACH_KOELSCH
        bool "Koelsch board"
@@@ -141,21 -143,19 +146,13 @@@ config ARCH_R8A779
        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
  
  config ARCH_R8A7791
 -      bool "R-Car M2 (R8A77910)"
 +      bool "R-Car M2-W (R8A77910)"
 +      select ARCH_RCAR_GEN2
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_GIC
 -      select CPU_V7
        select MIGHT_HAVE_PCI
 -      select SH_CLK_CPG
 -      select RENESAS_IRQC
 -      select SYS_SUPPORTS_SH_CMT
        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
  
- config ARCH_R7S72100
-       bool "RZ/A1H (R7S72100)"
-       select ARCH_WANT_OPTIONAL_GPIOLIB
-       select ARM_GIC
-       select CPU_V7
-       select SH_CLK_CPG
-       select SYS_SUPPORTS_SH_MTU2
- 
  comment "Renesas ARM SoCs Board Type"
  
  config MACH_APE6EVM

diff --cc arch/arm/mach-shmobile/Makefile
index 7b259ce60bebbbdc912f6f6c937ca48d9c127863,d7337a5f6232585e8c45cb9df8425a0fba8f3c41..e20f2786ec72a23056e306c4ad8df1e560579288
--- 1/arch/arm/mach-shmobile/Makefile
--- 2/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@@ -8,14 -6,16 +6,15 @@@
  obj-y                         := timer.o console.o
  
  # CPU objects
 -obj-$(CONFIG_ARCH_SH7372)     += setup-sh7372.o intc-sh7372.o
 -obj-$(CONFIG_ARCH_SH73A0)     += setup-sh73a0.o intc-sh73a0.o
 +obj-$(CONFIG_ARCH_SH7372)     += setup-sh7372.o intc-sh7372.o pm-sh7372.o
 +obj-$(CONFIG_ARCH_SH73A0)     += setup-sh73a0.o intc-sh73a0.o pm-sh73a0.o
  obj-$(CONFIG_ARCH_R8A73A4)    += setup-r8a73a4.o
 -obj-$(CONFIG_ARCH_R8A7740)    += setup-r8a7740.o
 +obj-$(CONFIG_ARCH_R8A7740)    += setup-r8a7740.o pm-r8a7740.o
  obj-$(CONFIG_ARCH_R8A7778)    += setup-r8a7778.o
 -obj-$(CONFIG_ARCH_R8A7779)    += setup-r8a7779.o
 -obj-$(CONFIG_ARCH_R8A7790)    += setup-r8a7790.o
 -obj-$(CONFIG_ARCH_R8A7790)    += setup-r8a7790.o setup-rcar-gen2.o
 -obj-$(CONFIG_ARCH_R8A7791)    += setup-r8a7791.o setup-rcar-gen2.o
 +obj-$(CONFIG_ARCH_R8A7779)    += setup-r8a7779.o pm-r8a7779.o
 +obj-$(CONFIG_ARCH_R8A7790)    += setup-r8a7790.o pm-r8a7790.o
 +obj-$(CONFIG_ARCH_R8A7791)    += setup-r8a7791.o pm-r8a7791.o
+ obj-$(CONFIG_ARCH_R8A7794)    += setup-r8a7794.o
  obj-$(CONFIG_ARCH_EMEV2)      += setup-emev2.o
  obj-$(CONFIG_ARCH_R7S72100)   += setup-r7s72100.o
  

diff --cc arch/arm/mach-shmobile/board-mackerel.c
Simple merge

diff --cc arch/arm/mach-shmobile/pm-r8a7740.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-r8a7740.c
Simple merge

diff --cc arch/arm/mach-shmobile/setup-sh7372.c
Simple merge