From: Kevin Hilman <khilman@linaro.org>
Date: Wed, 10 Jun 2015 23:58:05 +0000 (-0700)
Subject: Merge tag 'imx-soc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo... 
X-Git-Tag: v5.15~15561^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e0d0b81ea0f7ed01a706d7c0c48b157c66f870e;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'imx-soc-4.2' of git://git./linux/kernel/git/shawnguo/linux into next/soc

The i.MX SoC updates for 4.2:
 - Add new SoC i.MX7D support, which integrates two Cortex-A7 and one
   Cortex-M4 cores.
 - Support suspend from IRAM on i.MX53, so that DDR pins can be set to
   high impedance for more power saving during suspend.
 - Move i.MX clock drivers from arch/arm/mach-imx to drivers/clk/imx.
 - Move i.MX GPT timer driver from arch/arm/mach-imx into
   drivers/clocksource.
 - A couple of clock driver update for VF610 and i.MX6Q.
 - A few random code correction and improvement.

* tag 'imx-soc-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (44 commits)
  ARM: imx: imx7d requires anatop
  clocksource: timer-imx-gpt: remove include of <asm/mach/time.h>
  ARM: imx: move timer driver into drivers/clocksource
  ARM: imx: remove platform headers from timer driver
  ARM: imx: provide gpt device specific irq functions
  ARM: imx: get rid of variable timer_base
  ARM: imx: define gpt register offset per device type
  ARM: imx: move clock event variables into imx_timer
  ARM: imx: set up .set_next_event hook via imx_gpt_data
  ARM: imx: setup tctl register in device specific function
  ARM: imx: initialize gpt device type for DT boot
  ARM: imx: define an enum for gpt timer device type
  ARM: imx: move timer resources into a structure
  ARM: imx: use relaxed IO accessor in timer driver
  ARM: imx: make imx51/3 suspend optional
  ARM: clk-imx6q: refine sata's parent
  ARM: imx: clk-v610: Add clock for I2C2 and I2C3
  ARM: mach-imx: iomux-imx31: Use DECLARE_BITMAP
  ARM: imx: add imx7d clk tree support
  ARM: clk: imx: update pllv3 to support imx7
  ...

 Conflicts:
	arch/arm/mach-imx/Kconfig
---

3e0d0b81ea0f7ed01a706d7c0c48b157c66f870e
diff --cc arch/arm/mach-imx/Kconfig
index 2e3c458,8474c38..4fefeb6
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@@ -1,8 -1,8 +1,8 @@@
  menuconfig ARCH_MXC
 -	bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
 +	bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7 || ARM_SINGLE_ARMV7M
  	select ARCH_REQUIRE_GPIOLIB
  	select ARM_CPU_SUSPEND if PM
- 	select CLKSRC_MMIO
+ 	select CLKSRC_IMX_GPT
  	select GENERIC_IRQ_CHIP
  	select PINCTRL
  	select PM_OPP if PM
@@@ -582,24 -582,19 +582,33 @@@ config SOC_IMX6S
  	help
  	  This enables support for Freescale i.MX6 SoloX processor.
  
+ config SOC_IMX7D
+ 	bool "i.MX7 Dual support"
+ 	select PINCTRL_IMX7D
+ 	select ARM_GIC
+ 	select HAVE_IMX_ANATOP
+ 	select HAVE_IMX_MMDC
+ 	help
+ 		This enables support for Freescale i.MX7 Dual processor.
+ 
 +config SOC_LS1021A
 +	bool "Freescale LS1021A support"
 +	select ARM_GIC
 +	select HAVE_ARM_ARCH_TIMER
 +	select PCI_DOMAINS if PCI
 +	select ZONE_DMA if ARM_LPAE
 +	help
 +	  This enables support for Freescale LS1021A processor.
 +
 +endif
 +
 +comment "Cortex-A/Cortex-M asymmetric multiprocessing platforms"
 +
 +if ARCH_MULTI_V7 || ARM_SINGLE_ARMV7M
 +
  config SOC_VF610
  	bool "Vybrid Family VF610 support"
 -	select IRQ_DOMAIN_HIERARCHY
 -	select ARM_GIC
 +	select ARM_GIC if ARCH_MULTI_V7
  	select PINCTRL_VF610
  	select PL310_ERRATA_769419 if CACHE_L2X0
  	select SMP_ON_UP if SMP