On 04/30/2013 04:50 PM, Tom Rini wrote:

On Tue, Apr 30, 2013 at 11:49:33AM +0200, Michal Simek wrote:

...

Hi Tom and Albert,

please pull this patchset related to arm zynq to your tree. I haven't got any ACK for gem and platform changes but the whole patchset was reviewed by Tom. Also not all patches are ARM core specific but they are affecting zynq platform that's why I think it can go directly to Tom tree.

Please let me know if you have any problem with it. I can create more branches with specific patches which should go through specific trees.

I have removed fpga related patch because I have some others pending fpga patches and I will group them together.

Thanks, Michal

The following changes since commit d10f68ae47b67acab8b110b5c605dde4197a1820:

Prepare v2013.04 (2013-04-19 10:25: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 8934f7846501070a5b01c1fab5db27559e9d70d1:

i2c: zynq: Add support for Xilinx Zynq (2013-04-30 11:39:28 +0200)

---

David Andrey (3): arm: zynq: U-Boot udelay < 1000 FIX net: gem: Pass phy address to init net: gem: Preserve clk on emio interface

Michal Simek (11): arm: zynq: Rename XPSS_ prefix to ZYNQ_ for hardcoded SoC addresses zynq: Move scutimer baseaddr to hardware.h net: phy: Define Marvell 88e1518 phy net: gem: Remove WRAP bit from TX buffer description net: gem: Simplify return path in zynq_gem_recv net: gem: Do not initialize BDs again net: gem: Fix gem driver on 1Gbps LAN zynq: Move macros to hardware.h net: gem: Add support for phy autodetection mmc: Add support for Xilinx Zynq sdhci controller i2c: zynq: Add support for Xilinx Zynq

arch/arm/cpu/armv7/zynq/slcr.c | 26 ++++++++ arch/arm/cpu/armv7/zynq/timer.c | 49 ++++++++++++--- arch/arm/include/asm/arch-zynq/hardware.h | 26 +++++--- arch/arm/include/asm/arch-zynq/sys_proto.h | 4 ++ board/xilinx/zynq/board.c | 29 ++++++++- drivers/i2c/Makefile | 1 + drivers/i2c/zynq_i2c.c | 306 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/mmc/Makefile | 1 + drivers/mmc/zynq_sdhci.c | 40 ++++++++++++ drivers/net/phy/marvell.c | 11 ++++ drivers/net/zynq_gem.c | 199 +++++++++++++++++++++++++++++++++++++++++----------------- include/configs/zynq.h | 33 ++++++++-- include/netdev.h | 2 +- 13 files changed, 644 insertions(+), 83 deletions(-) create mode 100644 drivers/i2c/zynq_i2c.c create mode 100644 drivers/mmc/zynq_sdhci.c

Unless Albert really doesn't want this, I'm fine going through his tree as it's all ARM related.

Albert: any comment?

Thanks, Michal