From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 15 Mar 2018 15:10:32 +0000 (+0100)
Subject: Merge tag 'imx-soc-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawng... 
X-Git-Tag: v4.19~1282^2~29
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0240f307213e4fb238eeacbf4bc18c7a13ac4774;p=platform%2Fkernel%2Flinux-rpi3.git

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

Pull "i.MX SoC changes for 4.17" from Shawn Guo:

 - Add i.MX 6SoloLiteLite (i.MX6SLL) SoC support on top of the existing
   i.MX6SL platform code.
 - Improve the SoC revision mapping by utilizing the MAJOR field of
   ANATOP DIGPROG register.
 - Add CPUIDLE_FLAG_TIMER_STOP flag for cpuidle ARM power off state,
   so that we can use ARM generic timer for some i.MX6 SoC.
 - Set low-power interrupt mask for i.MX25 to support STOP mode.
 - Drop EPIT driver as there is no user of it.
 - Simplify the error path of imx6_pm_get_base() a bit.

* tag 'imx-soc-4.17' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: imx: Add basic msl support for imx6sll
  ARM: imx: pm-imx6: Return the error directly
  ARM: imx: avic: set low-power interrupt mask for imx25
  ARM: imx: Improve the soc revision calculation flow
  ARM: imx: add timer stop flag to ARM power off state
  ARM: imx: Remove epit support
---

0240f307213e4fb238eeacbf4bc18c7a13ac4774