• Kevin Hilman's avatar
    Merge tag 'imx-soc-4.2' of... · 3e0d0b81
    Kevin Hilman authored
    Merge tag 'imx-soc-4.2' of git://git.kernel.org/pub/scm/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
    3e0d0b81
MAINTAINERS 303 KB