Merge tag 'v4.4-next-soc' of https://github.com/mbgg/linux-mediatek into next/drivers
authorOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 21:02:28 +0000 (13:02 -0800)
committerOlof Johansson <olof@lixom.net>
Tue, 22 Dec 2015 21:02:28 +0000 (13:02 -0800)
Change the scpsys to builtin_platform_driver_probe.

Add regulator support for scpsys driver.

* tag 'v4.4-next-soc' of https://github.com/mbgg/linux-mediatek:
  drivers/soc: make mediatek/mtk-scpsys.c explicitly non-modular
  soc: mediatek: SCPSYS: Add regulator support

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

Trivial merge