Merge 'hisilicon' from https://github.com/hisilicon/linux-hisi.git (for-next)

Merged-SHA: 6cdd694551d6a11fb03d154fd7e15ab2f9b3f1f9