Merge tag 'imx-fixes-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawngu...
authorOlof Johansson <olof@lixom.net>
Tue, 17 Jan 2017 05:44:56 +0000 (21:44 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 17 Jan 2017 05:44:56 +0000 (21:44 -0800)
commita11f4706d102ddf82ba38f1db93ac2a61b4685e7
tree6986aa8fec5c5d62009bedd1c716f0740b636f3b
parent64cbff449a8ad11d72c2b437cb7412e70fc99654
parent37530e74609a28ae3a3b51e7685fe54a00b1e2f2
Merge tag 'imx-fixes-4.10-2' of git://git./linux/kernel/git/shawnguo/linux into fixes

i.MX fixes for 4.10, 2nd round:
 - A couple of Nitrogen6 device tree fixes for audio codec probe
   failure, which is caused by that pinctrl setting for codec clock
   was not in the correct device node.

* tag 'imx-fixes-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx6qdl-nitrogen6_som2: fix sgtl5000 pinctrl init
  ARM: dts: imx6qdl-nitrogen6_max: fix sgtl5000 pinctrl init

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