Hi Tom,

please pull these zynq and zynqmp changes to your tree.

Thanks, Michal

The following changes since commit cc555bd4f40a652471df4a3621d45ee57df0ca11:

Merge branch 'master' of git://git.denx.de/u-boot-spi (2015-04-28 07:28:43 -0400)

are available in the git repository at:

git://www.denx.de/git/u-boot-microblaze.git zynq

for you to fetch changes up to 5ca269a4df21a7e326eb3b3f7788177d064fe782:

ARM: zynq: rename CONFIG_ZYNQ to CONFIG_ARCH_ZYNQ (2015-04-29 11:19:05 +0200)

---------------------------------------------------------------- Andrea Scian (1): gpio: add Xilinx Zynq PS GPIO driver

Masahiro Yamada (5): ARM: zynq: drop legacy ps7_init.c/h support ARM: zynq: pass "-mfpu=neon" only to lowlevel_init.S ARM: zynq: move SoC sources to mach-zynq ARM: zynq: move SoC headers to mach-zynq/include/mach ARM: zynq: rename CONFIG_ZYNQ to CONFIG_ARCH_ZYNQ

Michal Simek (6): zynq: Enable GPIO driver and GPIO commands serial: zynq: Add support for slow emulation platform zynqmp: Add support for R5 sw loading zynqmp: Add support for emulation platform - Veloce zynqmp: Add support for EMMC bootmode zynqmp: Enable SDHCI0 options

Nathan Rossi (1): zynq: Add Zynq PicoZed board support

Siva Durga Prasad Paladugu (7): zynq: slcr: Disable all level shifters zynqmp: caches: Enable dcache for zynqmp zynqmp: sdhci: Remove the quirk SDHCI_QUIRK_NO_CD zynq: timer: Fix wrong timer calculation zynqmp: i2c: Enable i2c driver for zynqMP zynqmp: Add SPI driver support for ZynqMP zynqmp: Enable FS_GENERIC option

arch/arm/Kconfig | 4 +-- arch/arm/Makefile | 1 + arch/arm/cpu/armv7/Makefile | 1 - arch/arm/cpu/armv7/zynq/config.mk | 7 ----- arch/arm/cpu/armv8/zynqmp/Makefile | 1 + arch/arm/cpu/armv8/zynqmp/clk.c | 3 ++ arch/arm/cpu/armv8/zynqmp/cpu.c | 166 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/cpu/armv8/zynqmp/mp.c | 242 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/dts/Makefile | 3 +- arch/arm/dts/zynq-picozed.dts | 23 +++++++++++++++ arch/arm/include/asm/arch-zynq/gpio.h | 10 ------- arch/arm/include/asm/arch-zynqmp/gpio.h | 12 ++++++++ arch/arm/include/asm/arch-zynqmp/hardware.h | 53 ++++++++++++++++++++++++++++++++--- arch/arm/{cpu/armv7/zynq => mach-zynq}/Kconfig | 6 +++- arch/arm/{cpu/armv7/zynq => mach-zynq}/Makefile | 1 + arch/arm/{cpu/armv7/zynq => mach-zynq}/clk.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/cpu.c | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/ddrc.c | 0 arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/clk.h | 0 arch/arm/mach-zynq/include/mach/gpio.h | 76 ++++++++++++++++++++++++++++++++++++++++++++++++++ arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/hardware.h | 0 arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/sys_proto.h | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/lowlevel_init.S | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/slcr.c | 7 +++++ arch/arm/{cpu/armv7/zynq => mach-zynq}/spl.c | 2 +- arch/arm/{cpu/armv7/zynq => mach-zynq}/timer.c | 4 ++- arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot-spl.lds | 0 arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot.lds | 0 board/xilinx/zynq/.gitignore | 1 - board/xilinx/zynq/Makefile | 4 +-- board/xilinx/zynq/legacy.c | 2 -- board/xilinx/zynqmp/zynqmp.c | 9 ++++-- configs/zynq_microzed_defconfig | 2 +- configs/zynq_picozed_defconfig | 6 ++++ configs/zynq_zc70x_defconfig | 2 +- configs/zynq_zc770_xm010_defconfig | 2 +- configs/zynq_zc770_xm012_defconfig | 2 +- configs/zynq_zc770_xm013_defconfig | 2 +- configs/zynq_zed_defconfig | 2 +- configs/zynq_zybo_defconfig | 2 +- drivers/gpio/Makefile | 1 + drivers/gpio/zynq_gpio.c | 220 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/zynq_sdhci.c | 2 +- drivers/serial/serial_zynq.c | 8 +++++- include/configs/xilinx_zynqmp.h | 41 +++++++++++++++++++++++++-- include/configs/zynq-common.h | 7 +++-- include/configs/zynq_picozed.h | 27 ++++++++++++++++++ 47 files changed, 914 insertions(+), 50 deletions(-) delete mode 100644 arch/arm/cpu/armv7/zynq/config.mk create mode 100644 arch/arm/cpu/armv8/zynqmp/mp.c create mode 100644 arch/arm/dts/zynq-picozed.dts delete mode 100644 arch/arm/include/asm/arch-zynq/gpio.h create mode 100644 arch/arm/include/asm/arch-zynqmp/gpio.h rename arch/arm/{cpu/armv7/zynq => mach-zynq}/Kconfig (85%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/Makefile (90%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/clk.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/cpu.c (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/ddrc.c (100%) rename arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/clk.h (100%) create mode 100644 arch/arm/mach-zynq/include/mach/gpio.h rename arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/hardware.h (100%) rename arch/arm/{include/asm/arch-zynq => mach-zynq/include/mach}/sys_proto.h (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/lowlevel_init.S (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/slcr.c (95%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/spl.c (96%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/timer.c (97%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot-spl.lds (100%) rename arch/arm/{cpu/armv7/zynq => mach-zynq}/u-boot.lds (100%) delete mode 100644 board/xilinx/zynq/legacy.c create mode 100644 configs/zynq_picozed_defconfig create mode 100644 drivers/gpio/zynq_gpio.c create mode 100644 include/configs/zynq_picozed.h