Merge pull request #1203 from masahir0y/uniphier

uniphier: a bundle of fixes