Merge "uniphier: fix typo and coding style" into integration