From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 21 Jan 2016 02:10:05 +0000 (-0800)
Subject: Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: Ubuntu-4.10.0-19.21~4085
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=1305eda751d7df3069b1fcb6f62036185acd24a0;p=mirror_ubuntu-artful-kernel.git

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

Pull ARM SoC platform updates from Olof Johansson:
 "Updates for new platform support:

   - New platform: Tango4 from Sigma Designs.
   - Broadcom BCM2836 (Raspberry Pi 2 SoC)
   - Enable cpufreq on Freescale i.MX7D
   - Rockchip: SMP support for rk3036, general support for rk3228
   - SMP support on Broadcom Kona and NSP
   - Cleanups for OMAP removing legacy IOMMU data

  + a bunch of misc fixes and tweaks for various platforms"

* tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (46 commits)
  ARM: tango: Fix UP build issues
  ARM: tango: pass ARM arch level for smc.S
  ARM: bcm2835: Add Kconfig support for bcm2836
  ARM: OMAP2+: Add support for dm814x and dra62x usb
  ARM: OMAP2+: Add mmc hwmod entries for dm814x
  ARM: OMAP2+: Update 81xx clock and power domains for default, active and sgx
  ARM: OMAP2+: Fix SoC detection for dra62x j5-eco
  ARM: tango4: Initial platform support
  ARM: bcm2835: Add a compat string for bcm2836 machine probe
  dt-bindings: Add root properties for Raspberry Pi 2
  ARM: imx: select SRC for i.MX7
  ARM: uniphier: select PINCTRL
  ARM: OMAP2+: Remove device creation for omap-pcm-audio
  ARM: OMAP1: Remove device creation for omap-pcm-audio
  ARM: rockchip: enable support for RK3228 SoCs
  ARM: rockchip: use const and __initconst for rk3036 smp_operations
  ARM: zynq: Select ARCH_HAS_RESET_CONTROLLER
  ARM: BCM: Add SMP support for Broadcom 4708
  ARM: BCM: Add SMP support for Broadcom NSP
  ARM: BCM: Clean up SMP support for Broadcom Kona
  ...
---

1305eda751d7df3069b1fcb6f62036185acd24a0
diff --cc arch/arm/mach-exynos/Kconfig
index 05c83fca1f81,ed02905eb67a..652a0bb11578
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -28,7 -28,9 +28,10 @@@ menuconfig ARCH_EXYNO
  	select SRAM
  	select THERMAL
  	select MFD_SYSCON
 +	select CLKSRC_EXYNOS_MCT
+ 	select POWER_RESET
+ 	select POWER_RESET_SYSCON
+ 	select POWER_RESET_SYSCON_POWEROFF
  	help
  	  Support for SAMSUNG EXYNOS SoCs (EXYNOS4/5)
  
diff --cc arch/arm/mach-omap2/omap_hwmod_81xx_data.c
index 1b96cdfd1558,27f4e197d949..e493ae372910
--- a/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_81xx_data.c
@@@ -1230,9 -1354,9 +1354,7 @@@ static struct omap_hwmod_ocp_if dm81xx_
  
  /*
   * REVISIT: Test and enable the following once clocks work:
 - * dm81xx_l4_ls__gpio1
 - * dm81xx_l4_ls__gpio2
   * dm81xx_l4_ls__mailbox
-  * dm81xx_alwon_l3_slow__gpmc
-  * dm81xx_default_l3_slow__usbss
   *
   * Also note that some devices share a single clkctrl_offs..
   * For example, i2c1 and 3 share one, and i2c2 and 4 share one.
@@@ -1248,10 -1372,10 +1370,12 @@@ static struct omap_hwmod_ocp_if *dm814x
  	&dm81xx_l4_ls__wd_timer1,
  	&dm81xx_l4_ls__i2c1,
  	&dm81xx_l4_ls__i2c2,
 +	&dm81xx_l4_ls__gpio1,
 +	&dm81xx_l4_ls__gpio2,
  	&dm81xx_l4_ls__elm,
  	&dm81xx_l4_ls__mcspi1,
+ 	&dm814x_l4_ls__mmc1,
+ 	&dm814x_l4_ls__mmc2,
  	&dm81xx_alwon_l3_fast__tpcc,
  	&dm81xx_alwon_l3_fast__tptc0,
  	&dm81xx_alwon_l3_fast__tptc1,