Merge tag 'imx-fixes-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorOlof Johansson <olof@lixom.net>
Wed, 19 Jun 2019 14:26:01 +0000 (07:26 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 19 Jun 2019 14:26:01 +0000 (07:26 -0700)
commitc914767610946845bd3054341f4636b702fd7632
tree75e29202e32ad08a12ae5191c5dfc5401e56293f
parentcd3967bee004bcbd142403698d658166fa618c9e
parenta019ab40679715ea680cc8561a02888be70bc4e9
Merge tag 'imx-fixes-5.2-2' of git://git./linux/kernel/git/shawnguo/linux into arm/fixes

i.MX fixes for 5.2, round 2:
 - A fix on LS1028A device tree CPU state to get CPU idle work.
 - Enable FSL_EDMA driver support in defconfig to fix a indefinite
   deferring probe on Layerscape platforms.

* tag 'imx-fixes-5.2-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  arm64: defconfig: Enable FSL_EDMA driver
  arm64: dts: ls1028a: Fix CPU idle fail.

Signed-off-by: Olof Johansson <olof@lixom.net>