From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Dec 2014 22:38:28 +0000 (-0800)
Subject: Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.19-rc1~169
X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=6cd94d5e57ab97ddd672b707ab4bb639672c1727

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

Pull ARM SoC platform changes from Arnd Bergmann:
 "New and updated SoC support, notable changes include:

   - bcm:
        brcmstb SMP support
        initial iproc/cygnus support
   - exynos:
        Exynos4415 SoC support
        PMU and suspend support for Exynos5420
        PMU support for Exynos3250
        pm related maintenance
   - imx:
        new LS1021A SoC support
        vybrid 610 global timer support
   - integrator:
        convert to using multiplatform configuration
   - mediatek:
        earlyprintk support for mt8127/mt8135
   - meson:
        meson8 soc and l2 cache controller support
   - mvebu:
        Armada 38x CPU hotplug support
        drop support for prerelease Armada 375 Z1 stepping
        extended suspend support, now works on Armada 370/XP
   - omap:
        hwmod related maintenance
        prcm cleanup
   - pxa:
        initial pxa27x DT handling
   - rockchip:
        SMP support for rk3288
        add cpu frequency scaling support
   - shmobile:
        r8a7740 power domain support
        various small restart, timer, pci apmu changes
   - sunxi:
        Allwinner A80 (sun9i) earlyprintk support
   - ux500:
        power domain support

  Overall, a significant chunk of changes, coming mostly from the usual
  suspects: omap, shmobile, samsung and mvebu, all of which already
  contain a lot of platform specific code in arch/arm"

* tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (187 commits)
  ARM: mvebu: use the cpufreq-dt platform_data for independent clocks
  soc: integrator: Add terminating entry for integrator_cm_match
  ARM: mvebu: add SDRAM controller description for Armada XP
  ARM: mvebu: adjust mbus controller description on Armada 370/XP
  ARM: mvebu: add suspend/resume DT information for Armada XP GP
  ARM: mvebu: synchronize secondary CPU clocks on resume
  ARM: mvebu: make sure MMU is disabled in armada_370_xp_cpu_resume
  ARM: mvebu: Armada XP GP specific suspend/resume code
  ARM: mvebu: reserve the first 10 KB of each memory bank for suspend/resume
  ARM: mvebu: implement suspend/resume support for Armada XP
  clk: mvebu: add suspend/resume for gatable clocks
  bus: mvebu-mbus: provide a mechanism to save SDRAM window configuration
  bus: mvebu-mbus: suspend/resume support
  clocksource: time-armada-370-xp: add suspend/resume support
  irqchip: armada-370-xp: Add suspend/resume support
  ARM: add lolevel debug support for asm9260
  ARM: add mach-asm9260
  ARM: EXYNOS: use u8 for val[] in struct exynos_pmu_conf
  power: reset: imx-snvs-poweroff: add power off driver for i.mx6
  ARM: imx: temporarily remove CONFIG_SOC_FSL from LS1021A
  ...
---

6cd94d5e57ab97ddd672b707ab4bb639672c1727
diff --cc Documentation/devicetree/bindings/vendor-prefixes.txt
index a344ec2713a5,3da78a14e6c7..ecaf2035c2fe
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -91,9 -90,9 +91,10 @@@ lltc	Linear Technology Corporatio
  marvell	Marvell Technology Group Ltd.
  maxim	Maxim Integrated Products
  mediatek	MediaTek Inc.
+ merrii	Merrii Technology Co., Ltd.
  micrel	Micrel Inc.
  microchip	Microchip Technology Inc.
 +micron	Micron Technology Inc.
  mitsubishi	Mitsubishi Electric Corporation
  mosaixtech	Mosaix Technologies, Inc.
  moxa	Moxa
diff --cc arch/arm/Kconfig.debug
index d8f6a2ec3d4e,66ebfb88c505..f9295a4e1036
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1187,9 -1339,10 +1339,10 @@@ config DEBUG_UART_VIR
  	default 0xf1c28000 if DEBUG_SUNXI_UART0
  	default 0xf1c28400 if DEBUG_SUNXI_UART1
  	default 0xf1f02800 if DEBUG_SUNXI_R_UART
 -	default 0xf2100000 if DEBUG_PXA_UART1
 +	default 0xf6200000 if DEBUG_PXA_UART1
  	default 0xf4090000 if ARCH_LPC32XX
  	default 0xf4200000 if ARCH_GEMINI
+ 	default 0xf7000000 if DEBUG_SUN9I_UART0
  	default 0xf7000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \
  				DEBUG_S3C2410_UART0)
  	default 0xf7004000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART1 || \
diff --cc arch/arm/mach-shmobile/setup-sh73a0.c
index 1ff4bd65e647,fa7cab820ab9..93ebe3430bfe
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@@ -794,9 -791,10 +802,10 @@@ static const char *sh73a0_boards_compat
  DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
  	.smp		= smp_ops(sh73a0_smp_ops),
  	.map_io		= sh73a0_map_io,
 -	.init_early	= sh73a0_init_delay,
 +	.init_early	= shmobile_init_delay,
  	.init_machine	= sh73a0_add_standard_devices_dt,
  	.init_late	= shmobile_init_late,
+ 	.restart	= sh73a0_restart,
  	.dt_compat	= sh73a0_boards_compat_dt,
  MACHINE_END
  #endif /* CONFIG_USE_OF */