mbox

[U-Boot,GIT,PULL] Xilinx changes

Message ID 5a32250a-f76a-bbb5-4903-72353fe48a1a@monstr.eu
State Accepted
Delegated to: Tom Rini
Headers show

Pull-request

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

Message

Michal Simek Nov. 15, 2016, 5:59 p.m. UTC
Hi Tom,

please pull these changes to your tree.
There are several things in this PR like
DTS cleanups, Topic NL board with extending mkimage format and nand driver.

I have run buildman over it and there is not an issue.
./tools/buildman/buildman -b master zynq -C

Thanks,
Michal

The following changes since commit 29e0cfb4f77f7aa369136302cee14a91e22dca71:

  Prepare v2016.11 (2016-11-14 11:27:11 -0500)

are available in the git repository at:

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

for you to fetch changes up to 688d1be5ba63be281c2894e74b27209133598e2e:

  ARM64: zynqmp: Adding prefetchable memory space to pcie (2016-11-15
15:30:41 +0100)

----------------------------------------------------------------
Anurag Kumar Vulisha (1):
      ARM64: zynqmp: Add device tree properties for ZynqMP GT core

Bharat Kumar Gogada (2):
      ARM64: zynqmp: pci: Updating device tree as per upstream
      ARM64: zynqmp: Adding prefetchable memory space to pcie

Filip Drazic (4):
      ARM64: zynqmp: DT: Remove unused DDR PM domain
      ARM64: zynqmp: DT: Remove unused PM domains for PLL
      ARM64: zynqmp: DT: Add PM domains for GPU and PCIE
      ARM64: zynqmp: Support for multiple PM IDs assigned to a PM domain

Hyun Kwon (1):
      ARM64: zynqmp: drm: Add DMA index

Kedareswara rao Appana (3):
      ARM64: zynqmp: Add clocks for LPDDMA
      ARM64: zynqmp: Add description for LPDDMA channel usage
      ARM64: zynqmp: Add clocks for LPDDMA

Michal Simek (18):
      tools: mkimage: Check if file is regular file
      zynq: nand: Runtime detection of nand buswidth through slcr
      ARM: zynq: Add support for Zynq 7000S 7007s/7012s/7014s devices
      ARM64: zynqmp: Record board name as serial number for DFU/FASTBOOT
      ARM64: zynqmp: Fix secondary bootmode enabling
      ARM64: zynqmp: Ignore warnings from autogenerated files
      ARM: zynq: Remove DTC 1.4.2 warnings
      ARM64: zynqmp: Remove DTC 1.4.2 warnings
      ARM64: zynqmp: Enable gpio-led as heartbeat on zcu102
      ARM64: zynqmp: Add gpio-keys for zcu102
      ARM64: zynqmp: Add dcc port to dtsi
      ARM64: zynqmp: Remove note about level shifter on zcu102
      ARM64: zynqmp: Remove xlnx,id property
      ARM64: zynqmp: Sync gpio node properties
      Revert "ARM64: zynqmp: Add serdes address space dp driver"
      ARM64: zynqmp: List all SMMU ids
      Revert "ARM64: zynqmp: Added broken-tuning property to SD, eMMC nodes"
      ARM64: zynqmp: Use 64bit size cell format for main amba bus

Mike Looijmans (3):
      tools: mkimage: Add support for initialization table for Zynq and
ZynqMP
      ARM: zynq: Make SYS_VENDOR configurable
      ARM: zynq: Add support for the topic-miami system-on-modules and
carrier boards

Naga Sureshkumar Relli (3):
      ARM64: zynqmp: Enable can1 for ep108
      ARM64: zynqmp: Add cortexa53 edac node
      ARM64: zynqmp: Add ocm node in dtsi

Nava kishore Manne (1):
      ARM64: zynqmp: Add support for zynqmp fpga manager

Sai Krishna Potthuri (1):
      ARM64: zynqmp: change sdhci compatible string.

Siva Durga Prasad Paladugu (7):
      mtd: nand: zynq_nand: Add nand driver support for zynq
      zynq: nand: Enable Nand flash controller driver a zynq board
      nand: arasan_nfc: Clear ecc on bit while sending read command
      net: zynq_gem: Modify the nwcfg bit definitions
      net: zynq_gem: Correct SGMII enable bit setting
      ARM64: zynqmp: Add support for SD1 with level shifters bootmode
      ARM64: zynqmp: Correct the sdhci minimum frequency for ep108

Soren Brinkmann (1):
      ARM64: zynqmp: Adjust to new SMC interface to get silicon version

VNSL Durga (1):
      ARM64: zynqmp: Added clocks to DT for ep108

 arch/arm/cpu/armv8/zynqmp/Kconfig                    |    7 +
 arch/arm/cpu/armv8/zynqmp/spl.c                      |    6 +-
 arch/arm/dts/Makefile                                |    2 +
 arch/arm/dts/zynq-7000.dtsi                          |    7 +-
 arch/arm/dts/zynq-microzed.dts                       |    2 +-
 arch/arm/dts/zynq-picozed.dts                        |    2 +-
 arch/arm/dts/zynq-topic-miami.dts                    |   97 +++++++++++++
 arch/arm/dts/zynq-topic-miamiplus.dts                |   17 +++
 arch/arm/dts/zynq-zc702.dts                          |    2 +-
 arch/arm/dts/zynq-zc706.dts                          |    2 +-
 arch/arm/dts/zynq-zc770-xm010.dts                    |    2 +-
 arch/arm/dts/zynq-zc770-xm011.dts                    |    2 +-
 arch/arm/dts/zynq-zed.dts                            |    2 +-
 arch/arm/dts/zynq-zybo.dts                           |    2 +-
 arch/arm/dts/zynqmp-clk.dtsi                         |   32 +++++
 arch/arm/dts/zynqmp-ep108-clk.dtsi                   |   48 +++++++
 arch/arm/dts/zynqmp-ep108.dts                        |    8 +-
 arch/arm/dts/zynqmp-zc1751-xm015-dc1.dts             |    4 +-
 arch/arm/dts/zynqmp-zc1751-xm016-dc2.dts             |    2 +-
 arch/arm/dts/zynqmp-zc1751-xm018-dc4.dts             |    2 +-
 arch/arm/dts/zynqmp-zc1751-xm019-dc5.dts             |    2 +-
 arch/arm/dts/zynqmp-zcu102.dts                       |   34 ++++-
 arch/arm/dts/zynqmp.dtsi                             |  341
++++++++++++++++++++++++++++----------------
 arch/arm/include/asm/arch-zynqmp/hardware.h          |    1 +
 arch/arm/mach-zynq/Kconfig                           |    8 ++
 arch/arm/mach-zynq/slcr.c                            |   25 ++++
 board/topic/zynq/MAINTAINERS                         |    6 +
 board/topic/zynq/Makefile                            |   10 ++
 board/topic/zynq/board.c                             |    1 +
 board/topic/zynq/ps7_init_common.c                   |  117 +++++++++++++++
 board/topic/zynq/ps7_init_gpl.h                      |   34 +++++
 board/topic/zynq/zynq-topic-miami/ps7_init_gpl.c     |  227
+++++++++++++++++++++++++++++
 board/topic/zynq/zynq-topic-miami/ps7_regs.txt       |   61 ++++++++
 board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c |  233
++++++++++++++++++++++++++++++
 board/topic/zynq/zynq-topic-miamiplus/ps7_regs.txt   |   61 ++++++++
 board/xilinx/zynq/board.c                            |   12 ++
 board/xilinx/zynqmp/Makefile                         |    3 +
 board/xilinx/zynqmp/xil_io.h                         |    9 ++
 board/xilinx/zynqmp/zynqmp.c                         |   21 +++
 configs/topic_miami_defconfig                        |   49 +++++++
 configs/topic_miamiplus_defconfig                    |   49 +++++++
 configs/zynq_zc770_xm011_defconfig                   |    2 +
 drivers/mtd/nand/Kconfig                             |    7 +
 drivers/mtd/nand/Makefile                            |    1 +
 drivers/mtd/nand/arasan_nfc.c                        |    2 +
 drivers/mtd/nand/zynq_nand.c                         | 1186
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 drivers/net/zynq_gem.c                               |   16 +--
 include/configs/topic_miami.h                        |  149
+++++++++++++++++++
 include/configs/topic_miamiplus.h                    |    2 +
 include/configs/xilinx_zynqmp_ep.h                   |    2 +-
 include/configs/zynq-common.h                        |    7 +
 include/zynqmppl.h                                   |    6 +
 include/zynqpl.h                                     |   18 +++
 scripts/Makefile.spl                                 |    4 +-
 tools/zynqimage.c                                    |   28 ++++
 tools/zynqmpimage.c                                  |   34 +++++
 58 files changed, 2865 insertions(+), 155 deletions(-)
 create mode 100644 arch/arm/dts/zynq-topic-miami.dts
 create mode 100644 arch/arm/dts/zynq-topic-miamiplus.dts
 create mode 100644 board/topic/zynq/MAINTAINERS
 create mode 100644 board/topic/zynq/Makefile
 create mode 100644 board/topic/zynq/board.c
 create mode 100644 board/topic/zynq/ps7_init_common.c
 create mode 100644 board/topic/zynq/ps7_init_gpl.h
 create mode 100644 board/topic/zynq/zynq-topic-miami/ps7_init_gpl.c
 create mode 100644 board/topic/zynq/zynq-topic-miami/ps7_regs.txt
 create mode 100644 board/topic/zynq/zynq-topic-miamiplus/ps7_init_gpl.c
 create mode 100644 board/topic/zynq/zynq-topic-miamiplus/ps7_regs.txt
 create mode 100644 configs/topic_miami_defconfig
 create mode 100644 configs/topic_miamiplus_defconfig
 create mode 100644 drivers/mtd/nand/zynq_nand.c
 create mode 100644 include/configs/topic_miami.h
 create mode 100644 include/configs/topic_miamiplus.h

Comments

Masahiro Yamada Nov. 16, 2016, 12:26 a.m. UTC | #1
Hi Michal

2016-11-16 2:59 GMT+09:00 Michal Simek <monstr@monstr.eu>:
> Hi Tom,
>
> please pull these changes to your tree.
> There are several things in this PR like
> DTS cleanups, Topic NL board with extending mkimage format and nand driver.
>
> I have run buildman over it and there is not an issue.
> ./tools/buildman/buildman -b master zynq -C
>
> Thanks,
> Michal


I thought you would pick up the following:
http://patchwork.ozlabs.org/patch/681835/


Shall we ask Tom to apply it directly?
Michal Simek Nov. 16, 2016, 7:31 a.m. UTC | #2
On 16.11.2016 01:26, Masahiro Yamada wrote:
> Hi Michal
> 
> 2016-11-16 2:59 GMT+09:00 Michal Simek <monstr@monstr.eu>:
>> Hi Tom,
>>
>> please pull these changes to your tree.
>> There are several things in this PR like
>> DTS cleanups, Topic NL board with extending mkimage format and nand driver.
>>
>> I have run buildman over it and there is not an issue.
>> ./tools/buildman/buildman -b master zynq -C
>>
>> Thanks,
>> Michal
> 
> 
> I thought you would pick up the following:
> http://patchwork.ozlabs.org/patch/681835/
> 
> 
> Shall we ask Tom to apply it directly?

It was the part of series that's why I expected it will be taken
together not separately. As I see sunxi and uniphier patches are in and
zynq is missing. I will take it to my branch and will send it in next PR.
If Tom wants to take it directly he can - all ack lines are there already.

Thanks,
Michal
Tom Rini Nov. 17, 2016, 10:14 p.m. UTC | #3
On Tue, Nov 15, 2016 at 06:59:53PM +0100, Michal Simek wrote:

> Hi Tom,
> 
> please pull these changes to your tree.
> There are several things in this PR like
> DTS cleanups, Topic NL board with extending mkimage format and nand driver.
> 
> I have run buildman over it and there is not an issue.
> ./tools/buildman/buildman -b master zynq -C
> 
> Thanks,
> Michal
> 
> The following changes since commit 29e0cfb4f77f7aa369136302cee14a91e22dca71:
> 
>   Prepare v2016.11 (2016-11-14 11:27:11 -0500)
> 
> are available in the git repository at:
> 
>   git://www.denx.de/git/u-boot-microblaze.git master
> 
> for you to fetch changes up to 688d1be5ba63be281c2894e74b27209133598e2e:
> 
>   ARM64: zynqmp: Adding prefetchable memory space to pcie (2016-11-15
> 15:30:41 +0100)
> 

Applied to u-boot/master, thanks!