diff options
| author | Olof Johansson <olof@lixom.net> | 2017-06-18 23:06:06 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-06-18 23:06:06 -0700 |
| commit | 67a87a94f9c8a7bf776a04821158b0c7913a5284 (patch) | |
| tree | 64d66f725ff7ec6dd8a1c1ae23adf8e76f604ec1 /arch/arm/mach-nomadik | |
| parent | 5a55029f46d636ffed430d47c7fc1bfa0e64a3b6 (diff) | |
| parent | bf5a01d7c50fb0c4e1c3d320d670bad252d50bcb (diff) | |
| download | talos-obmc-linux-67a87a94f9c8a7bf776a04821158b0c7913a5284.tar.gz talos-obmc-linux-67a87a94f9c8a7bf776a04821158b0c7913a5284.zip | |
Merge tag 'imx-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc
The i.MX SoC updates for 4.13:
- Select GPCv2 for i.MX7 SoCs to get imx-gpcv2 irqchip driver built
for i.MX7 platforms by default.
- A couple of patches from Leonard to add IMX6ULL cpu check and get
suspend/resume work on IMX6ULL.
* tag 'imx-soc-4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx6ull: Make suspend/resume work like on 6ul
ARM: imx: Add MXC_CPU_IMX6ULL and cpu_is_imx6ull
ARM: imx: Select GPCv2 for i.MX7
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-nomadik')
0 files changed, 0 insertions, 0 deletions
