Hi Tom,

Here is a bunch of UniPhier updates which include GPIO driver support, MMC driver support, DRAM init code clean-ups, etc. Please pull.

Changes for 2nd round: - Fix a build error when CONFIG_DEBUG_LL is defined

The following changes since commit 50dc8677d769be6e2b34f49b6c43ad1e977bdc51:

Merge git://git.denx.de/u-boot-usb (2016-02-26 18:08:43 -0500)

are available in the git repository at:

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

for you to fetch changes up to 11d3ede42ceccef9b5941ea7907f398cb97ed361:

ARM: uniphier: fix warnings reported by aarch64 compiler (2016-03-01 00:33:29 +0900)

---------------------------------------------------------------- Masahiro Yamada (38): ARM: dts: uniphier: rework System Bus nodes gpio: uniphier: add driver for UniPhier GPIO controller gpio: do not include <asm/arch/gpio.h> for UniPhier ARM: uniphier: enable GPIO command and driver for UniPhier SoCs ARM: dts: uniphier: add GPIO controller nodes mmc: uniphier: add driver for UniPhier SD/MMC host controller ARM: uniphier: enable UniPhier SD/MMC host driver ARM: dts: uniphier: add SD/MMC host controller nodes ARM: uniphier: add eMMC boot support ARM: uniphier: add a command to find the first MMC (non-SD) device ARM: uniphier: add emmcupdate command ARM: uniphier: default to environment in eMMC ARM: uniphier: remove unused umc_polling() ARM: uniphier: rework struct uniphier_board_data ARM: uniphier: optimize ProXstream2 UMC init code with "for" loop ARM: uniphier: use pr_err() where possible ARM: uniphier: refactor UMC init code for ProXstream2 ARM: uniphier: remove UMC_INITCTL* and UMC_DRMR* settings ARM: uniphier: disable debug circuit clocks for PH1-Pro4 ARM: uniphier: add a field to specify DDR3+ ARM: uniphier: merge DDR PHY init code for 3 SoCs ARM: uniphier: remove unused argument of ph1_ld4_ddrphy_init() ARM: uniphier: refactor DDR-PHY init code ARM: uniphier: refactor UMC init code for PH1-sLD8 ARM: uniphier: support more DRAM use cases for PH1-sLD8 ARM: uniphier: refactor UMC init code for PH1-LD4 ARM: uniphier: optimize PH1-sLD8 UMC init code with "for" loop ARM: uniphier: optimize PH1-LD4 UMC init code with "for" loop ARM: uniphier: optimize PH1-Pro4 UMC init code with "for" loop ARM: uniphier: rework DRAM size handling in UMC init code ARM: uniphier: remove unused macros for UMC base addresses ARM: uniphier: deprecate umc_dram_init_{start, poll} ARM: uniphier: rename variable for DRAM controller base address ARM: uniphier: merge two defconfig files ARM: uniphier: rework UniPhier SoC select in Kconfig ARM: uniphier: rename PH1-LD10/PH1-sLD11 to PH1-LD20/PH1-LD11 ARM: uniphier: prepare directory structure for ARMv8 SoC support ARM: uniphier: fix warnings reported by aarch64 compiler

arch/arm/Kconfig | 3 +- arch/arm/dts/uniphier-common32.dtsi | 19 +- arch/arm/dts/uniphier-ph1-ld4-ref.dts | 4 + arch/arm/dts/uniphier-ph1-ld4.dtsi | 137 +++++ arch/arm/dts/uniphier-ph1-ld6b-ref.dts | 4 + arch/arm/dts/uniphier-ph1-pro4-ace.dts | 4 + arch/arm/dts/uniphier-ph1-pro4-ref.dts | 8 + arch/arm/dts/uniphier-ph1-pro4-sanji.dts | 16 + arch/arm/dts/uniphier-ph1-pro4.dtsi | 240 ++++++++ arch/arm/dts/uniphier-ph1-pro5-4kbox.dts | 8 + arch/arm/dts/uniphier-ph1-pro5.dtsi | 227 ++++++++ arch/arm/dts/uniphier-ph1-sld3-ref.dts | 4 + arch/arm/dts/uniphier-ph1-sld3.dtsi | 151 +++++- arch/arm/dts/uniphier-ph1-sld8-ref.dts | 4 + arch/arm/dts/uniphier-ph1-sld8.dtsi | 137 +++++ arch/arm/dts/uniphier-pinctrl.dtsi | 15 + arch/arm/dts/uniphier-proxstream2-gentil.dts | 16 + arch/arm/dts/uniphier-proxstream2-vodka.dts | 16 + arch/arm/dts/uniphier-proxstream2.dtsi | 220 ++++++++ arch/arm/include/asm/gpio.h | 2 + arch/arm/mach-uniphier/Kconfig | 66 ++- arch/arm/mach-uniphier/Makefile | 9 +- arch/arm/mach-uniphier/arm32/Makefile | 13 + arch/arm/mach-uniphier/{ => arm32}/arm-mpcore.h | 0 arch/arm/mach-uniphier/{ => arm32}/cache_uniphier.c | 0 arch/arm/mach-uniphier/{ => arm32}/debug_ll.S | 6 +- arch/arm/mach-uniphier/{ => arm32}/late_lowlevel_init.S | 0 arch/arm/mach-uniphier/{ => arm32}/lowlevel_init.S | 0 arch/arm/mach-uniphier/{ => arm32}/ssc-regs.h | 0 arch/arm/mach-uniphier/{ => arm32}/timer.c | 0 arch/arm/mach-uniphier/bcu/bcu-ph1-ld4.c | 2 +- arch/arm/mach-uniphier/bcu/bcu-ph1-sld3.c | 2 +- arch/arm/mach-uniphier/boards.c | 178 +++--- arch/arm/mach-uniphier/boot-mode/boot-mode.c | 64 +++ arch/arm/mach-uniphier/cpu_info.c | 4 +- arch/arm/mach-uniphier/dram/Makefile | 4 +- arch/arm/mach-uniphier/dram/ddrphy-ph1-ld4.c | 80 +-- arch/arm/mach-uniphier/dram/ddrphy-ph1-pro4.c | 67 --- arch/arm/mach-uniphier/dram/ddrphy-ph1-sld8.c | 78 --- arch/arm/mach-uniphier/dram/ddrphy-regs.h | 5 +- arch/arm/mach-uniphier/dram/umc-ph1-ld4.c | 225 ++++---- arch/arm/mach-uniphier/dram/umc-ph1-pro4.c | 182 +++---- arch/arm/mach-uniphier/dram/umc-ph1-sld8.c | 218 +++++--- arch/arm/mach-uniphier/dram/umc-proxstream2.c | 217 ++++---- arch/arm/mach-uniphier/dram/umc-regs.h | 48 +- arch/arm/mach-uniphier/dram_init.c | 5 +- arch/arm/mach-uniphier/init.h | 24 +- arch/arm/mach-uniphier/memconf/memconf-ph1-sld3.c | 6 +- arch/arm/mach-uniphier/memconf/memconf-proxstream2.c | 6 +- arch/arm/mach-uniphier/memconf/memconf.c | 14 +- arch/arm/mach-uniphier/micro-support-card.c | 3 +- arch/arm/mach-uniphier/sg-regs.h | 2 +- arch/arm/mach-uniphier/soc-info.h | 16 +- arch/arm/mach-uniphier/soc_info.c | 8 +- configs/uniphier_ld4_sld8_defconfig | 6 +- configs/uniphier_pro4_defconfig | 3 + configs/uniphier_pro5_defconfig | 30 - configs/uniphier_pxs2_ld6b_defconfig | 6 +- configs/uniphier_sld3_defconfig | 3 + doc/README.uniphier | 20 +- drivers/gpio/Kconfig | 6 + drivers/gpio/Makefile | 1 + drivers/gpio/gpio-uniphier.c | 147 +++++ drivers/mmc/Kconfig | 6 + drivers/mmc/Makefile | 1 + drivers/mmc/uniphier-sd.c | 751 ++++++++++++++++++++++++++ include/configs/uniphier.h | 26 +- 67 files changed, 2956 insertions(+), 837 deletions(-) create mode 100644 arch/arm/mach-uniphier/arm32/Makefile rename arch/arm/mach-uniphier/{ => arm32}/arm-mpcore.h (100%) rename arch/arm/mach-uniphier/{ => arm32}/cache_uniphier.c (100%) rename arch/arm/mach-uniphier/{ => arm32}/debug_ll.S (98%) rename arch/arm/mach-uniphier/{ => arm32}/late_lowlevel_init.S (100%) rename arch/arm/mach-uniphier/{ => arm32}/lowlevel_init.S (100%) rename arch/arm/mach-uniphier/{ => arm32}/ssc-regs.h (100%) rename arch/arm/mach-uniphier/{ => arm32}/timer.c (100%) delete mode 100644 arch/arm/mach-uniphier/dram/ddrphy-ph1-pro4.c delete mode 100644 arch/arm/mach-uniphier/dram/ddrphy-ph1-sld8.c delete mode 100644 configs/uniphier_pro5_defconfig create mode 100644 drivers/gpio/gpio-uniphier.c create mode 100644 drivers/mmc/uniphier-sd.c