Merge "ARM: mach-hisi: Hisilicon SoC updates for 4.8" from Wei Xu:
- Consolidate the hisilicon armv7 SoCs machine entries
- Avoid the compiling warning by making unexported symbols static
* tag 'hisi-armv7-soc-for-4.8-v3' of git://github.com/hisilicon/linux-hisi:
ARM: hisi: consolidate the hisilicon machine entries
ARM: hisi: make unexported symbols static