Merge tag 'hisi-armv7-soc-for-4.12' of git://github.com/hisilicon/linux-hisi into next/soc

ARM: mach-hisi: Hisilicon SoC updates for 4.12

- Fix the error return code in hip04_smp_init

* tag 'hisi-armv7-soc-for-4.12' of git://github.com/hisilicon/linux-hisi

:
  ARM: hisi: fix error return code in hip04_smp_init()

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