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