Merge pull request #1656 from masahir0y/uniphier

uniphier: clean-up and improve SCP handling code