Merge pull request #1081 from masahir0y/uniphier

uniphier: fix-up for PXs3 SoC