Hi Tom,

Here are various cleanups and preparation for new SoCs support. Please pull!

The following changes since commit f84c2b665b87fc6713a756d0fddf5c45e02255e5:

Prepare v2016.01-rc3 (2015-12-21 21:07:04 -0500)

are available in the git repository at:

git://git.denx.de/u-boot-uniphier.git master

for you to fetch changes up to 8182b41994f0b1824c31652d64171ffa596517fc:

ARM: dts: uniphier: add SD/MMC pinmux nodes (2015-12-23 00:09:05 +0900)

---------------------------------------------------------------- Masahiro Yamada (22): ARM: uniphier: add static qualifiers to locally used functions ARM: uniphier: add const qualifier to constant array ARM: uniphier: rename DTCR_RNKEN_* register bit to DTCR_RANKEN_* ARM: uniphier: use BIT() macro for DDR PHY header ARM: uniphier: allow DDR function to return more precise error code ARM: dts: uniphier: factor out common nodes to uniphier-common32.dtsi ARM: dts: uniphier: add outer cache nodes ARM: dts: uniphier: use stdout-path instead of console ARM: uniphier: add functions to get SoC model/revision ARM: uniphier: call uniphier_get_board_param() without FDT blob ARM: uniphier: split ProXstream2 board data and change DDR frequency ARM: uniphier: compile uniphier_get_board_param() for U-Boot proper ARM: uniphier: add macros and revision IDs for sLD11 and LD10 ARM: uniphier: display model number all the time on boot up ARM: uniphier: merge umc/ and ddrphy/ into a single directory ARM: uniphier: set DTB file name to fdt_file environment ARM: uniphier: drop fdt_file from CONFIG_EXTRA_ENV_SETTINGS ARM: uniphier: merge ph1_ld4_defconfig and ph1_sld8_defconfig ARM: uniphier: support ProXstream2, PH1-LD6b boards in single defconfig ARM: uniphier: rename rest of defconfig files ARM: uniphier: allow to run zImage rather than uImage ARM: dts: uniphier: add SD/MMC pinmux nodes

MAINTAINERS | 2 +- arch/arm/dts/uniphier-common32.dtsi | 105 ++++++++++++++ arch/arm/dts/uniphier-ph1-ld4-ref.dts | 3 +- arch/arm/dts/uniphier-ph1-ld4.dtsi | 269 +++++++++++++--------------------- arch/arm/dts/uniphier-ph1-ld6b-ref.dts | 3 +- arch/arm/dts/uniphier-ph1-pro4-ref.dts | 3 +- arch/arm/dts/uniphier-ph1-pro4.dtsi | 327 +++++++++++++++++------------------------- arch/arm/dts/uniphier-ph1-pro5-4kbox.dts | 3 +- arch/arm/dts/uniphier-ph1-pro5.dtsi | 294 ++++++++++++++++--------------------- arch/arm/dts/uniphier-ph1-sld3-ref.dts | 3 +- arch/arm/dts/uniphier-ph1-sld8-ref.dts | 3 +- arch/arm/dts/uniphier-ph1-sld8.dtsi | 269 +++++++++++++--------------------- arch/arm/dts/uniphier-pinctrl.dtsi | 15 ++ arch/arm/dts/uniphier-proxstream2-gentil.dts | 3 +- arch/arm/dts/uniphier-proxstream2-vodka.dts | 3 +- arch/arm/dts/uniphier-proxstream2.dtsi | 308 ++++++++++++++++----------------------- arch/arm/mach-uniphier/Makefile | 4 +- arch/arm/mach-uniphier/board_late_init.c | 35 +++++ arch/arm/mach-uniphier/boards.c | 27 +++- arch/arm/mach-uniphier/cmd_ddrphy.c | 12 +- arch/arm/mach-uniphier/cpu_info.c | 9 +- arch/arm/mach-uniphier/ddrphy/Makefile | 7 - arch/arm/mach-uniphier/dram/Makefile | 10 ++ arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-ph1-ld4.c | 0 arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-ph1-pro4.c | 0 arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-ph1-sld8.c | 0 arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-training.c | 11 +- arch/arm/mach-uniphier/{umc => dram}/umc-ph1-ld4.c | 0 arch/arm/mach-uniphier/{umc => dram}/umc-ph1-pro4.c | 0 arch/arm/mach-uniphier/{umc => dram}/umc-ph1-sld8.c | 0 arch/arm/mach-uniphier/include/mach/ddrphy-regs.h | 95 ++++++------ arch/arm/mach-uniphier/include/mach/init.h | 2 +- arch/arm/mach-uniphier/include/mach/soc_info.h | 15 +- arch/arm/mach-uniphier/init/init.c | 4 +- arch/arm/mach-uniphier/soc_info.c | 22 +++ arch/arm/mach-uniphier/umc/Makefile | 7 - configs/ph1_sld8_defconfig | 30 ---- configs/{ph1_ld4_defconfig => uniphier_ld4_sld8_defconfig} | 1 + configs/{ph1_pro4_defconfig => uniphier_pro4_defconfig} | 0 configs/{ph1_pro5_defconfig => uniphier_pro5_defconfig} | 0 configs/{ph1_ld6b_defconfig => uniphier_pxs2_ld6b_defconfig} | 3 +- configs/{ph1_sld3_defconfig => uniphier_sld3_defconfig} | 0 doc/README.uniphier | 36 ++--- include/configs/uniphier.h | 12 +- 44 files changed, 919 insertions(+), 1036 deletions(-) create mode 100644 arch/arm/dts/uniphier-common32.dtsi delete mode 100644 arch/arm/mach-uniphier/ddrphy/Makefile create mode 100644 arch/arm/mach-uniphier/dram/Makefile rename arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-ph1-ld4.c (100%) rename arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-ph1-pro4.c (100%) rename arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-ph1-sld8.c (100%) rename arch/arm/mach-uniphier/{ddrphy => dram}/ddrphy-training.c (92%) rename arch/arm/mach-uniphier/{umc => dram}/umc-ph1-ld4.c (100%) rename arch/arm/mach-uniphier/{umc => dram}/umc-ph1-pro4.c (100%) rename arch/arm/mach-uniphier/{umc => dram}/umc-ph1-sld8.c (100%) delete mode 100644 arch/arm/mach-uniphier/umc/Makefile delete mode 100644 configs/ph1_sld8_defconfig rename configs/{ph1_ld4_defconfig => uniphier_ld4_sld8_defconfig} (95%) rename configs/{ph1_pro4_defconfig => uniphier_pro4_defconfig} (100%) rename configs/{ph1_pro5_defconfig => uniphier_pro5_defconfig} (100%) rename configs/{ph1_ld6b_defconfig => uniphier_pxs2_ld6b_defconfig} (88%) rename configs/{ph1_sld3_defconfig => uniphier_sld3_defconfig} (100%)