Merge branch 'master' of git://git.denx.de/u-boot-uniphier

arch/arm/cpu/armv7/uniphier/Kconfig

arch/arm/cpu/armv7/uniphier/Makefile

arch/arm/cpu/armv7/uniphier/cmd_ddrphy.c

arch/arm/cpu/armv7/uniphier/cmd_pinmon.c

arch/arm/cpu/armv7/uniphier/ddrphy_training.c

arch/arm/cpu/armv7/uniphier/ph1-ld4/Makefile

arch/arm/cpu/armv7/uniphier/ph1-ld4/ddrphy_init.c

arch/arm/cpu/armv7/uniphier/ph1-ld4/umc_init.c

arch/arm/cpu/armv7/uniphier/ph1-pro4/Makefile

arch/arm/cpu/armv7/uniphier/ph1-pro4/ddrphy_init.c

arch/arm/cpu/armv7/uniphier/ph1-pro4/umc_init.c

arch/arm/cpu/armv7/uniphier/ph1-sld8/Makefile

arch/arm/cpu/armv7/uniphier/ph1-sld8/ddrphy_init.c

arch/arm/cpu/armv7/uniphier/ph1-sld8/umc_init.c

arch/arm/include/asm/arch-uniphier/ddrphy-regs.h