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

Pull ARM SoC platform changes from Olof Johansson:
 "New core SoC-specific changes.

  New platforms:
   * Introduction of a vendor, Hisilicon, and one of their SoCs with
     some random numerical product name.
   * Introduction of EFM32, embedded platform from Silicon Labs (ARMv7m,
     i.e. !MMU).
   * Marvell Berlin series of SoCs, which include the one in Chromecast.
   * MOXA platform support, ARM9-based platform used mostly in
     industrial products
   * Support for Freescale's i.MX50 SoC.

  Other work:
   * Renesas work for new platforms and drivers, and conversion over to
     more multiplatform-friendly device registration schemes.
   * SMP support for Allwinner sunxi platforms.
   * ... plus a bunch of other stuff across various platforms"

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (201 commits)
  ARM: tegra: fix tegra_powergate_sequence_power_up() inline
  ARM: msm_defconfig: Update for multi-platform
  ARM: msm: Move MSM's DT based hardware to multi-platform support
  ARM: msm: Only build timer.c if required
  ARM: msm: Only build clock.c on proc_comm based platforms
  ARM: ux500: Enable system suspend with WFI support
  ARM: ux500: turn on PRINTK_TIME in u8500_defconfig
  ARM: shmobile: r8a7790: Fix I2C controller names
  ARM: msm: Simplify ARCH_MSM_DT config
  ARM: msm: Add support for MSM8974 SoC
  ARM: sunxi: select ARM_PSCI
  MAINTAINERS: Update Allwinner sunXi maintainer files
  ARM: sunxi: Select RESET_CONTROLLER
  ARM: imx: improve the comment of CCM lpm SW workaround
  ARM: imx: improve status check of clock gate
  ARM: imx: add necessary interface for pfd
  ARM: imx_v6_v7_defconfig: Select CONFIG_REGULATOR_PFUZE100
  ARM: imx_v6_v7_defconfig: Select MX35 and MX50 device tree support
  ARM: imx: Add cpu frequency scaling support
  ARM i.MX35: Add devicetree support.
  ...

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Kconfig.debug
index 9afabbb5e798e8cf95d34c9c508bdab2c430b1cc,bda94e46e8d6cf605b51b980da253aab66e8979d..0531da8e5216e442ee1f9c8878e4fb9d84611581
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -106,17 -94,14 +106,25 @@@ choic
                depends on ARCH_BCM2835
                select DEBUG_UART_PL01X
  
 +      config DEBUG_BCM_KONA_UART
 +              bool "Kernel low-level debugging messages via BCM KONA UART"
 +              depends on ARCH_BCM
 +              select DEBUG_UART_8250
 +              help
 +                Say Y here if you want kernel low-level debugging support
 +                on Broadcom SoC platforms.
 +                This low level debug works for Broadcom
 +                mobile SoCs in the Kona family of chips (e.g. bcm28155,
 +                bcm11351, etc...)
 +
+       config DEBUG_BERLIN_UART
+               bool "Marvell Berlin SoC Debug UART"
+               depends on ARCH_BERLIN
+               select DEBUG_UART_8250
+               help
+                 Say Y here if you want kernel low-level debugging support
+                 on Marvell Berlin SoC based platforms.
+ 
        config DEBUG_CLPS711X_UART1
                bool "Kernel low-level debugging messages via UART1"
                depends on ARCH_CLPS711X

diff --cc arch/arm/Makefile
Simple merge

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

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

diff --cc arch/arm/configs/bcm_defconfig
Simple merge

diff --cc arch/arm/mach-at91/Kconfig
index f1bf952da747cbca542a862ca2252859e76c4169,44eacdd7468bd069ed3a3818ef57f5551c4cd90b..4f0e800e7e711707caaf9c3331f9f90c4eae8cab
--- 1/arch/arm/mach-at91/Kconfig
--- 2/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@@ -85,12 -64,10 +85,12 @@@ config SOC_SAMA5D
        select SOC_SAMA5
        select HAVE_FB_ATMEL
        select HAVE_AT91_DBGU1
 +      select HAVE_AT91_UTMI
 +      select HAVE_AT91_SMD
 +      select HAVE_AT91_USB_CLK
        help
          Select this if you are using one of Atmel's SAMA5D3 family SoC.
-         This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35.
+         This support covers SAMA5D31, SAMA5D33, SAMA5D34, SAMA5D35, SAMA5D36.
  endif
  
  if SOC_SAM_V4_V5

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

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

diff --cc arch/arm/mach-ixp4xx/common.c
Simple merge

diff --cc arch/arm/mach-pxa/time.c
Simple merge

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

diff --cc arch/arm/mach-shmobile/clock-r7s72100.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-r8a7790.c
Simple merge

diff --cc arch/arm/mach-shmobile/clock-sh73a0.c
Simple merge

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

diff --cc arch/arm/mach-shmobile/setup-r8a7790.c
index 3543c3bacb75d828cd9681f9e5b93740822a9467,d6589f33f31ad1c726f7d099a8aec7f91d024ce6..6ab37aa1e919825aa6584441cffc91b7057fcbf5
--- 1/arch/arm/mach-shmobile/setup-r8a7790.c
--- 2/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@@ -67,9 -63,31 +67,30 @@@ R8A7790_GPIO(5)
                &r8a7790_gpio##idx##_platform_data,                     \
                sizeof(r8a7790_gpio##idx##_platform_data))
  
+ static struct resource i2c_resources[] __initdata = {
+       /* I2C0 */
+       DEFINE_RES_MEM(0xE6508000, 0x40),
+       DEFINE_RES_IRQ(gic_spi(287)),
+       /* I2C1 */
+       DEFINE_RES_MEM(0xE6518000, 0x40),
+       DEFINE_RES_IRQ(gic_spi(288)),
+       /* I2C2 */
+       DEFINE_RES_MEM(0xE6530000, 0x40),
+       DEFINE_RES_IRQ(gic_spi(286)),
+       /* I2C3 */
+       DEFINE_RES_MEM(0xE6540000, 0x40),
+       DEFINE_RES_IRQ(gic_spi(290)),
+ 
+ };
+ 
+ #define r8a7790_register_i2c(idx)             \
+       platform_device_register_simple(        \
+               "i2c-rcar_gen2", idx,           \
+               i2c_resources + (2 * idx), 2);  \
+ 
  void __init r8a7790_pinmux_init(void)
  {
 -      platform_device_register_simple("pfc-r8a7790", -1, pfc_resources,
 -                                      ARRAY_SIZE(pfc_resources));
 +      r8a7790_register_pfc();
        r8a7790_register_gpio(0);
        r8a7790_register_gpio(1);
        r8a7790_register_gpio(2);

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

diff --cc arch/arm/mach-sunxi/Kconfig
index bce0d4277f71974ceefb7a2f9ec8e31ef75ceb9d,8053b1befc5e6994976b65ad24db1117ca45ffd6..b9d6cad8669b8ea623aa5787de36c80d8caa5621
--- 1/arch/arm/mach-sunxi/Kconfig
--- 2/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@@ -10,6 -12,6 +12,7 @@@ config ARCH_SUNX
        select HAVE_SMP
        select PINCTRL
        select PINCTRL_SUNXI
+       select RESET_CONTROLLER
        select SPARSE_IRQ
        select SUN4I_TIMER
 +      select SUN5I_HSTIMER

diff --cc arch/arm/mach-u300/timer.c
index 5226162fac69e46f78f470f883b8b11f3f3cdbda,9724e4e7cc93ffa6232833bbb0c1f6ebdc1fbdf2..fe08fd34c0ce8422b00508efb20cb94ff3a2dda2
--- 1/arch/arm/mach-u300/timer.c
--- 2/arch/arm/mach-u300/timer.c
+++ b/arch/arm/mach-u300/timer.c
@@@ -387,9 -379,7 +387,9 @@@ static void __init u300_timer_init_of(s
        clk_prepare_enable(clk);
        rate = clk_get_rate(clk);
  
-       setup_sched_clock(u300_read_sched_clock, 32, rate);
 +      u300_clockevent_data.ticks_per_jiffy = DIV_ROUND_CLOSEST(rate, HZ);
 +
+       sched_clock_register(u300_read_sched_clock, 32, rate);
  
        u300_delay_timer.read_current_timer = &u300_read_current_timer;
        u300_delay_timer.freq = rate;

diff --cc arch/arm/plat-orion/time.c
Simple merge

diff --cc drivers/clocksource/Makefile
Simple merge