Merge tag 'imx-fixes-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Wed, 28 Feb 2018 22:24:01 +0000 (23:24 +0100)
committerArnd Bergmann <arnd@arndb.de>
Wed, 28 Feb 2018 22:24:01 +0000 (23:24 +0100)
commit36b38aef5749583e8695b2b93636391a47cf24c7
treed8783f7bf5638f570ad2fdb7cb9d3efc9770bdae
parent29d1d52b06fbf4b26b592310bff7c4fe3ffaca07
parentc0c6bb2322964bd264b4ddedaa5776f40c709f0c
Merge tag 'imx-fixes-4.16' of ssh://gitolite./linux/kernel/git/shawnguo/linux into fixes

Pull "i.MX fixes for 4.16" from Shawn Guo:

 - Fix i.MX GPC driver to remove power domains only when they are
   initialized in imx_gpc_probe().
 - Fix the broken Engicam i.CoreM6 DualLite/Solo RQS board DT to include
   imx6dl.dtsi instead of imx6q.dtsi.

* tag 'imx-fixes-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6dl: Include correct dtsi file for Engicam i.CoreM6 DualLite/Solo RQS
  soc: imx: gpc: de-register power domains only if initialized