Merge tag 'v4.12-next-soc' of https://github.com/mbgg/linux-mediatek into next/drivers
authorOlof Johansson <olof@lixom.net>
Mon, 19 Jun 2017 02:35:48 +0000 (19:35 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 19 Jun 2017 02:35:48 +0000 (19:35 -0700)
commit7a699a85e1411130960b9821c4498d7c1a81295a
tree183d5338f207188a43748381674e1c0a2afd6ead
parentf44a12dcd9b8490bf520b6c3bd3982761fc7fdad
parent58a823dd7b515827ed07adb268e1769b3c292586
Merge tag 'v4.12-next-soc' of https://github.com/mbgg/linux-mediatek into next/drivers

- enhance scpsys to support mt6797
- add mt6797 support to scpsys
- fix error path in pmic-wrapper
- fix possible NULL pointer dereference in pmic-wrapper

* tag 'v4.12-next-soc' of https://github.com/mbgg/linux-mediatek:
  soc: mediatek: PMIC wrap: Fix possible NULL derefrence.
  soc: mediatek: PMIC wrap: Fix error handling
  soc: mediatek: add MT6797 scpsys support
  soc: mediatek: add vdec item for scpsys
  soc: mediatek: avoid using fixed spm power status defines

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