Merge tag 'imx-fixes-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo...
authorOlof Johansson <olof@lixom.net>
Thu, 8 Sep 2016 04:24:22 +0000 (21:24 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 8 Sep 2016 04:24:22 +0000 (21:24 -0700)
commit28fa9917368978e8272407f2d7f8829b17f024ea
tree3844ef643b272d1ff634c7000609025d077eb16a
parentd8b795f5e3a3f81e0635919b3c9cd746631a6a76
parentf065e9e4addd75c21bb976bb2558648bf4f61de6
Merge tag 'imx-fixes-4.8-2' of git://git./linux/kernel/git/shawnguo/linux into fixes

i.MX fixes for 4.8, 2nd round:
 - Fix misspelled "ti,x-plate-ohms" property name of touchscreen
   controller for imx7d-sdb DTS.
 - Add missing BM_CLPCR_BYPASS_PMIC_READY setting for i.MX6SX to get
   suspend/resume work properly.
 - Fix SPDIF regression on imx6qdl which caused by a clock update on
   spdif device node.

* tag 'imx-fixes-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6qdl: Fix SPDIF regression
  ARM: imx6: add missing BM_CLPCR_BYPASS_PMIC_READY setting for imx6sx
  ARM: dts: imx7d-sdb: fix ti,x-plate-ohms property name

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