Zynq changes

GIT PULL Michal Simek 3 participants 4 messages Jul 28, 2015

Share & tools

Michal Simek

author

2015-07-28 13:41 UTC #0 lore raw

Hi Tom,

please pull these changes to your tree. The most of that changes are DT related which is simple synchronization DTSes with the kernel where binding was properly reviewed.

Thanks,
Michal

The following changes since commit 26473945ad6667183296e7edee2a65edf31bb6f7:

Merge branch 'master' of http://git.denx.de/u-boot-sunxi (2015-07-25
09:04:18 -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 711e5e26b41457e658155e7c225c9ccfed0182ef:

cmd_mp: Add support for showing all CPU status by one command
(2015-07-28 11:56:29 +0200)

----------------------------------------------------------------
Michal Simek (29):
zynq: gem: Setting up WRAP bit for one TX bd
zynqmp: mp: Simplify set_r5_start handling
zynqmp: Add support for IP detection via SLCR
ARM: zynq: DT: Use the right names for nodes
ARM: zynq: DT: Add missing nodes to DTSI
ARM: zynq: DT: Add a fixed regulator for CPU voltage
ARM: zynq: DT: Migrate UART to Cadence binding
ARM: zynq: DT: Remove 222 MHz OPP
spi: Fix zynq SPI binding
ARM: zynq: DT: Fix GEM register area size
ARM: zynq: DT: Use the zynq binding with macb
ARM: zynq: DT: Clean up timer device tree nodes
ARM: zynq: DT: Cleanup address-cells and size-cells
ARM: zynq: DT: Add pinctrl node
ARM: zynq: DT: Add reference to bus node
ARM: zynq: DT: Sync zc702/zc706/zed/zybo DT with kernel
ARM: zynq: DT: Update years in copyright
ARM: zynq: DT: Get rid of ps-clk-frequency
ARM: zynq: DT: Add missing interrupt for L2 pl310
ARM: zynq: DT: Add zc702 pushbuttons to DT as gpio-keys
ARM: zynq: DT: Update zc770 dtses
ARM: zynq: Add support for zc770-xm011
ARM: zynqmp: Wire up ethernet controllers
ARM: zynqmp: Wire up SATA for the board
zynqmp: Show EL level where U-Boot runs
net: gem: Extend timeout value
zynq: Fix typo in Makefile about custom ps7_init file
spi: zynq_spi: Simplify debug macro
cmd_mp: Add support for showing all CPU status by one command

Siva Durga Prasad Paladugu (7):
zynqmp: gem: Set data bus width to 64bit for arm64
zynqmp: gem: Flush the rx buffers while transmitting
zynq: gem: Increase the Rx buffer descriptors to 32
zynqmp: Kconfig: Move zynqmp Kconfig
zynqmp: Define ep config for ZynqMP
Kconfig: zynqmp: Move CONFIG_SYS_TEXT_BASE to defconfig
zynqmp: Provide option to enable uart dcc support for zynqmp

 Kconfig                                                         |   2 +-
 arch/arm/Kconfig                                                |   5 ++-
 arch/arm/cpu/armv8/Makefile                                     |   2 +-
 arch/arm/cpu/armv8/zynqmp/Kconfig                               |  23
++++++++++
 arch/arm/cpu/armv8/zynqmp/Makefile                              |   1 +
 arch/arm/cpu/armv8/zynqmp/mp.c                                  |   7 +--
 arch/arm/cpu/armv8/zynqmp/slcr.c                                |  63
+++++++++++++++++++++++++++
 arch/arm/dts/Makefile                                           |   1 +
 arch/arm/dts/zynq-7000.dtsi                                     | 174
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
 arch/arm/dts/zynq-zc702.dts                                     | 372
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 arch/arm/dts/zynq-zc706.dts                                     | 293
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 arch/arm/dts/zynq-zc770-xm010.dts                               |  75
+++++++++++++++++++++++++++++---
 arch/arm/dts/zynq-zc770-xm011.dts                               |  65
++++++++++++++++++++++++++++
 arch/arm/dts/zynq-zc770-xm012.dts                               |  51
++++++++++++++++++++--
 arch/arm/dts/zynq-zc770-xm013.dts                               |  62
++++++++++++++++++++++++--
 arch/arm/dts/zynq-zed.dts                                       |  46
++++++++++++++++++--
 arch/arm/dts/zynq-zybo.dts                                      |  38
++++++++++++++--
 arch/arm/include/asm/arch-zynqmp/hardware.h                     |  16
+++++++
 arch/arm/include/asm/arch-zynqmp/sys_proto.h                    |   6 +++
 board/xilinx/zynq/Makefile                                      |   2 +-
 board/xilinx/zynqmp/Kconfig                                     |  15
-------
 board/xilinx/zynqmp/MAINTAINERS                                 |   5 ++-
 board/xilinx/zynqmp/zynqmp.c                                    |  37
++++++++++++++++
 common/cmd_mp.c                                                 |  22
++++++++++
 configs/{xilinx_zynqmp_defconfig => xilinx_zynqmp_ep_defconfig} |   5 ++-
 configs/zynq_zc770_xm011_defconfig                              |  13
++++++
 doc/device-tree-bindings/spi/spi-zynq.txt                       |  35
++++++++-------
 drivers/net/zynq_gem.c                                          |  26
++++++++---
 drivers/spi/zynq_spi.c                                          |   4 +-
 include/configs/xilinx_zynqmp.h                                 |  48
+++++++++++++++++----
 include/configs/xilinx_zynqmp_ep.h                              |  27
++++++++++++
 include/configs/zynq_zc770.h                                    |   3 ++
 32 files changed, 1427 insertions(+), 117 deletions(-)
 create mode 100644 arch/arm/cpu/armv8/zynqmp/Kconfig
 create mode 100644 arch/arm/cpu/armv8/zynqmp/slcr.c
 create mode 100644 arch/arm/dts/zynq-zc770-xm011.dts
 delete mode 100644 board/xilinx/zynqmp/Kconfig
 rename configs/{xilinx_zynqmp_defconfig => xilinx_zynqmp_ep_defconfig}
(81%)
 create mode 100644 configs/zynq_zc770_xm011_defconfig
 create mode 100644 include/configs/xilinx_zynqmp_ep.h

Michal Simek

2015-07-28 13:43 UTC #1 lore raw

Adding actual Tom's address.

Cheers,
Michal

Quoted 126 lines · Michal Simek

Hi Tom,
please pull these changes to your tree. The most of that changes are DT related which is simple synchronization DTSes with the kernel where binding was properly reviewed.
Thanks,
Michal
The following changes since commit 26473945ad6667183296e7edee2a65edf31bb6f7:
Merge branch 'master' of http://git.denx.de/u-boot-sunxi (2015-07-25
09:04:18 -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 711e5e26b41457e658155e7c225c9ccfed0182ef:
cmd_mp: Add support for showing all CPU status by one command
(2015-07-28 11:56:29 +0200)
----------------------------------------------------------------
Michal Simek (29):
zynq: gem: Setting up WRAP bit for one TX bd
zynqmp: mp: Simplify set_r5_start handling
zynqmp: Add support for IP detection via SLCR
ARM: zynq: DT: Use the right names for nodes
ARM: zynq: DT: Add missing nodes to DTSI
ARM: zynq: DT: Add a fixed regulator for CPU voltage
ARM: zynq: DT: Migrate UART to Cadence binding
ARM: zynq: DT: Remove 222 MHz OPP
spi: Fix zynq SPI binding
ARM: zynq: DT: Fix GEM register area size
ARM: zynq: DT: Use the zynq binding with macb
ARM: zynq: DT: Clean up timer device tree nodes
ARM: zynq: DT: Cleanup address-cells and size-cells
ARM: zynq: DT: Add pinctrl node
ARM: zynq: DT: Add reference to bus node
ARM: zynq: DT: Sync zc702/zc706/zed/zybo DT with kernel
ARM: zynq: DT: Update years in copyright
ARM: zynq: DT: Get rid of ps-clk-frequency
ARM: zynq: DT: Add missing interrupt for L2 pl310
ARM: zynq: DT: Add zc702 pushbuttons to DT as gpio-keys
ARM: zynq: DT: Update zc770 dtses
ARM: zynq: Add support for zc770-xm011
ARM: zynqmp: Wire up ethernet controllers
ARM: zynqmp: Wire up SATA for the board
zynqmp: Show EL level where U-Boot runs
net: gem: Extend timeout value
zynq: Fix typo in Makefile about custom ps7_init file
spi: zynq_spi: Simplify debug macro
cmd_mp: Add support for showing all CPU status by one command
Siva Durga Prasad Paladugu (7):
zynqmp: gem: Set data bus width to 64bit for arm64
zynqmp: gem: Flush the rx buffers while transmitting
zynq: gem: Increase the Rx buffer descriptors to 32
zynqmp: Kconfig: Move zynqmp Kconfig
zynqmp: Define ep config for ZynqMP
Kconfig: zynqmp: Move CONFIG_SYS_TEXT_BASE to defconfig
zynqmp: Provide option to enable uart dcc support for zynqmp
 Kconfig                                                         |   2 +-
 arch/arm/Kconfig                                                |   5 ++-
 arch/arm/cpu/armv8/Makefile                                     |   2 +-
 arch/arm/cpu/armv8/zynqmp/Kconfig                               |  23
++++++++++
 arch/arm/cpu/armv8/zynqmp/Makefile                              |   1 +
 arch/arm/cpu/armv8/zynqmp/mp.c                                  |   7 +--
 arch/arm/cpu/armv8/zynqmp/slcr.c                                |  63
+++++++++++++++++++++++++++
 arch/arm/dts/Makefile                                           |   1 +
 arch/arm/dts/zynq-7000.dtsi                                     | 174
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------
 arch/arm/dts/zynq-zc702.dts                                     | 372
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 arch/arm/dts/zynq-zc706.dts                                     | 293
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 arch/arm/dts/zynq-zc770-xm010.dts                               |  75
+++++++++++++++++++++++++++++---
 arch/arm/dts/zynq-zc770-xm011.dts                               |  65
++++++++++++++++++++++++++++
 arch/arm/dts/zynq-zc770-xm012.dts                               |  51
++++++++++++++++++++--
 arch/arm/dts/zynq-zc770-xm013.dts                               |  62
++++++++++++++++++++++++--
 arch/arm/dts/zynq-zed.dts                                       |  46
++++++++++++++++++--
 arch/arm/dts/zynq-zybo.dts                                      |  38
++++++++++++++--
 arch/arm/include/asm/arch-zynqmp/hardware.h                     |  16
+++++++
 arch/arm/include/asm/arch-zynqmp/sys_proto.h                    |   6 +++
 board/xilinx/zynq/Makefile                                      |   2 +-
 board/xilinx/zynqmp/Kconfig                                     |  15
-------
 board/xilinx/zynqmp/MAINTAINERS                                 |   5 ++-
 board/xilinx/zynqmp/zynqmp.c                                    |  37
++++++++++++++++
 common/cmd_mp.c                                                 |  22
++++++++++
 configs/{xilinx_zynqmp_defconfig => xilinx_zynqmp_ep_defconfig} |   5 ++-
 configs/zynq_zc770_xm011_defconfig                              |  13
++++++
 doc/device-tree-bindings/spi/spi-zynq.txt                       |  35
++++++++-------
 drivers/net/zynq_gem.c                                          |  26
++++++++---
 drivers/spi/zynq_spi.c                                          |   4 +-
 include/configs/xilinx_zynqmp.h                                 |  48
+++++++++++++++++----
 include/configs/xilinx_zynqmp_ep.h                              |  27
++++++++++++
 include/configs/zynq_zc770.h                                    |   3 ++
 32 files changed, 1427 insertions(+), 117 deletions(-)
 create mode 100644 arch/arm/cpu/armv8/zynqmp/Kconfig
 create mode 100644 arch/arm/cpu/armv8/zynqmp/slcr.c
 create mode 100644 arch/arm/dts/zynq-zc770-xm011.dts
 delete mode 100644 board/xilinx/zynqmp/Kconfig
 rename configs/{xilinx_zynqmp_defconfig => xilinx_zynqmp_ep_defconfig}
(81%)
 create mode 100644 configs/zynq_zc770_xm011_defconfig
 create mode 100644 include/configs/xilinx_zynqmp_ep.h

Signature · 14 lines

Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150728/faf1785d/attachment.sig>

Tom Rini

2015-07-28 15:37 UTC #2 lore raw

In reply to Michal Simek

Quoted 14 lines · Michal Simek

Hi Tom,
please pull these changes to your tree. The most of that changes are DT related which is simple synchronization DTSes with the kernel where binding was properly reviewed.
Thanks,
Michal
The following changes since commit 26473945ad6667183296e7edee2a65edf31bb6f7:
Merge branch 'master' of http://git.denx.de/u-boot-sunxi (2015-07-25
09:04:18 -0400)

Quoted 9 lines

are available in the git repository at:
git://www.denx.de/git/u-boot-microblaze.git zynq
for you to fetch changes up to 711e5e26b41457e658155e7c225c9ccfed0182ef:
cmd_mp: Add support for showing all CPU status by one command
(2015-07-28 11:56:29 +0200)

Applied to u-boot/master, thanks!

But please note:

       arm:  +   zynq_zc70x

+(zynq_zc70x) board/xilinx/zynq/Makefile:43: CONFIG_TARGET_ZYNQ_ZC70X is deprecated. +(zynq_zc70x) board/xilinx/zynq/Makefile:44: Enable CONFIG_TARGET_ZYNQ_ZC702 or CONFIG_TARGET_ZYNQ_706 instead. +(zynq_zc70x) board/xilinx/zynq/Makefile:45: "make zynq_zc70x_defconfig" is also deprecated. +(zynq_zc70x) board/xilinx/zynq/Makefile:46: Use "make zynq_zc702_defconfig" or "make zynq_zc706_defconfig".

Shows up for me when I build all xilinx boards. Are you planning to drop that config target this release or next? Thanks!

Signature · 8 lines

Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150728/9a3f080d/attachment.sig>

Michal Simek

2015-07-28 18:29 UTC #3 lore raw

Quoted 20 lines · Tom Rini

Quoted 18 lines · Michal Simek
Hi Tom,
please pull these changes to your tree. The most of that changes are DT related which is simple synchronization DTSes with the kernel where binding was properly reviewed.
Thanks,
Michal
The following changes since commit 26473945ad6667183296e7edee2a65edf31bb6f7:
Merge branch 'master' of http://git.denx.de/u-boot-sunxi (2015-07-25
09:04:18 -0400)
are available in the git repository at:
git://www.denx.de/git/u-boot-microblaze.git zynq

Quoted 7 lines

Quoted 5 lines
for you to fetch changes up to 711e5e26b41457e658155e7c225c9ccfed0182ef:
cmd_mp: Add support for showing all CPU status by one command
(2015-07-28 11:56:29 +0200)
Applied to u-boot/master, thanks!

Thanks.

Quoted 10 lines

But please note:

       arm:  +   zynq_zc70x

(quoted diff) +4 -0

+(zynq_zc70x) board/xilinx/zynq/Makefile:43: CONFIG_TARGET_ZYNQ_ZC70X is deprecated.
+(zynq_zc70x) board/xilinx/zynq/Makefile:44: Enable CONFIG_TARGET_ZYNQ_ZC702 or CONFIG_TARGET_ZYNQ_706 instead.
+(zynq_zc70x) board/xilinx/zynq/Makefile:45: "make zynq_zc70x_defconfig" is also deprecated.
+(zynq_zc70x) board/xilinx/zynq/Makefile:46: Use "make zynq_zc702_defconfig" or "make zynq_zc706_defconfig".

Shows up for me when I build all xilinx boards. Are you planning to drop that config target this release or next? Thanks!

Yes. In the next release I will remove it.

Thanks,
Michal

Signature · 14 lines

Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150728/bf4abc0a/attachment.sig>