Skip to content

Commit 5e64ee4

Browse files
committed
Merge tag 'zynqmp-dt-for-v6.5' of https://github.com/Xilinx/linux-xlnx into soc/dt
arm64: ZynqMP DT changes for v6.5 Various small fixes and cleanups to be aligned with the latest dt-schema. Other major changes are: - Wire mali-400 gpu - Change board name for zcu1275 - Use ethernet-phy-id to handle ETH phy reset properly - Switch to amd.com emails - Update people in DT bindings * tag 'zynqmp-dt-for-v6.5' of https://github.com/Xilinx/linux-xlnx: (33 commits) dt-bindings: usb: xilinx: Replace Manish by Piyush dt-bindings: xilinx: Remove Rajan, Jolly and Manish arm64: zynqmp: Used fixed-partitions for QSPI in k26 arm64: zynqmp: Add pmu interrupt-affinity arm64: zynqmp: Set qspi tx-buswidth to 4 arm64: zynqmp: Fix usb node drive strength and slew rate arm64: zynqmp: Describe TI phy as ethernet-phy-id arm64: zynqmp: Switch to amd.com emails arm64: zynqmp: Convert kv260-revA overlay to ASCII text dt-bindings: xilinx: Switch xilinx.com emails to amd.com arm64: xilinx: Use zynqmp prefix for SOM dt overlays arm64: zynqmp: Add phase tags marking arm64: zynqmp: Describe bus-width for SD card on KV260 arm64: zynqmp: Enable AMS on SOM and other zcu10x boards arm64: zynqmp: Enable DP driver for SOMs arm64: zynqmp: Setup clock for DP and DPDMA arm64: zynqmp: Switch to ethernet-phy-id in kv260 arm64: zynqmp: Disable USB3.0 for zc1751-xm016-dc2 arm64: zynqmp: Add pinctrl emmc description to SM-K26 arm64: zynqmp: Add gpio labels for modepin gpio ... Link: https://lore.kernel.org/r/CAHTX3d+2s_KmCnd=x5hydGb+LYoznAzYGTizvqqN2NFmrBurfw@mail.gmail.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents c9a5aa0 + 067bf44 commit 5e64ee4

57 files changed

Lines changed: 633 additions & 249 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/devicetree/bindings/arm/xilinx.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Xilinx Zynq Platforms
88

99
maintainers:
10-
- Michal Simek <michal.simek@xilinx.com>
10+
- Michal Simek <michal.simek@amd.com>
1111

1212
description: |
1313
Xilinx boards with Zynq-7000 SOC or Zynq UltraScale+ MPSoC
@@ -61,10 +61,10 @@ properties:
6161
- const: xlnx,zynqmp-zc1254
6262
- const: xlnx,zynqmp
6363

64-
- description: Xilinx internal board zc1275
64+
- description: Xilinx evaluation board zcu1275
6565
items:
66-
- const: xlnx,zynqmp-zc1275-revA
67-
- const: xlnx,zynqmp-zc1275
66+
- const: xlnx,zynqmp-zcu1275-revA
67+
- const: xlnx,zynqmp-zcu1275
6868
- const: xlnx,zynqmp
6969

7070
- description: Xilinx 96boards compatible board zcu100

Documentation/devicetree/bindings/ata/ceva,ahci-1v84.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Ceva AHCI SATA Controller
88

99
maintainers:
10-
- Piyush Mehta <piyush.mehta@xilinx.com>
10+
- Piyush Mehta <piyush.mehta@amd.com>
1111

1212
description: |
1313
The Ceva SATA controller mostly conforms to the AHCI interface with some

Documentation/devicetree/bindings/clock/xlnx,clocking-wizard.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Xilinx clocking wizard
88

99
maintainers:
10-
- Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
10+
- Shubhrajyoti Datta <shubhrajyoti.datta@amd.com>
1111

1212
description:
1313
The clocking wizard is a soft ip clocking block of Xilinx versal. It

Documentation/devicetree/bindings/clock/xlnx,versal-clk.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Xilinx Versal clock controller
88

99
maintainers:
10-
- Michal Simek <michal.simek@xilinx.com>
11-
- Jolly Shah <jolly.shah@xilinx.com>
12-
- Rajan Vaja <rajan.vaja@xilinx.com>
10+
- Michal Simek <michal.simek@amd.com>
1311

1412
description: |
1513
The clock controller is a hardware block of Xilinx versal clock tree. It

Documentation/devicetree/bindings/crypto/xlnx,zynqmp-aes.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Xilinx ZynqMP AES-GCM Hardware Accelerator
88

99
maintainers:
10-
- Kalyani Akula <kalyani.akula@xilinx.com>
11-
- Michal Simek <michal.simek@xilinx.com>
10+
- Kalyani Akula <kalyani.akula@amd.com>
11+
- Michal Simek <michal.simek@amd.com>
1212

1313
description: |
1414
The ZynqMP AES-GCM hardened cryptographic accelerator is used to

Documentation/devicetree/bindings/firmware/xilinx/xlnx,zynqmp-firmware.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Xilinx firmware driver
88

99
maintainers:
10-
- Nava kishore Manne <nava.manne@xilinx.com>
10+
- Nava kishore Manne <nava.kishore.manne@amd.com>
1111

1212
description: The zynqmp-firmware node describes the interface to platform
1313
firmware. ZynqMP has an interface to communicate with secure firmware.

Documentation/devicetree/bindings/fpga/xilinx-zynq-fpga-mgr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Xilinx Zynq FPGA Manager
88

99
maintainers:
10-
- Michal Simek <michal.simek@xilinx.com>
10+
- Michal Simek <michal.simek@amd.com>
1111

1212
properties:
1313
compatible:

Documentation/devicetree/bindings/fpga/xlnx,versal-fpga.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Xilinx Versal FPGA driver.
88

99
maintainers:
10-
- Nava kishore Manne <nava.manne@xilinx.com>
10+
- Nava kishore Manne <nava.kishore.manne@amd.com>
1111

1212
description: |
1313
Device Tree Versal FPGA bindings for the Versal SoC, controlled

Documentation/devicetree/bindings/fpga/xlnx,zynqmp-pcap-fpga.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Xilinx Zynq Ultrascale MPSoC FPGA Manager
88

99
maintainers:
10-
- Nava kishore Manne <navam@xilinx.com>
10+
- Nava kishore Manne <nava.kishore.manne@amd.com>
1111

1212
description: |
1313
Device Tree Bindings for Zynq Ultrascale MPSoC FPGA Manager.

Documentation/devicetree/bindings/gpio/gpio-zynq.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Xilinx Zynq GPIO controller
88

99
maintainers:
10-
- Michal Simek <michal.simek@xilinx.com>
10+
- Michal Simek <michal.simek@amd.com>
1111

1212
properties:
1313
compatible:

0 commit comments

Comments
 (0)