mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-08 09:12:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'zynq-dt-for-v6.3' of https://github.com/Xilinx/linux-xlnx into arm/dt

Browse Source 
ARM: Zynq DT changes for v6.3

- Fix node names to be aligned with dt schema
- Describe qspi controller
- Use xlnx prefix for ethernet IP

* tag 'zynq-dt-for-v6.3' of https://github.com/Xilinx/linux-xlnx:
  ARM: zynq: Use recommended dma-controller name instead of dmac
  ARM: dts: zynq: Add xlnx prefix to GEM compatible string
  ARM: zynq: Comment interrupt names IRQs for pl330
  ARM: dts: zynq: add QSPI controller node

Link: https://lore.kernel.org/r/850bb18f-ca22-f3d7-71a7-f367bfef4ccc@monstr.eu
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2023-02-01 16:48:40 +01:00
parent 777d90d5f2 8932a99240
commit 61f1b48445
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arch/arm/boot/dts/zynq-7000.dtsi
View File

@@ -230,8 +230,20 @@ spi1: spi@e0007000 {
#size-cells = <0>;
};
qspi: spi@e000d000 {
compatible = "xlnx,zynq-qspi-1.0";
reg = <0xe000d000 0x1000>;
interrupt-parent = <&intc>;
interrupts = <0 19 4>;
clocks = <&clkc 10>, <&clkc 43>;
clock-names = "ref_clk", "pclk";
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
};
gem0: ethernet@e000b000 {
compatible = "cdns,zynq-gem", "cdns,gem";
compatible = "xlnx,zynq-gem", "cdns,gem";
reg = <0xe000b000 0x1000>;
status = "disabled";
interrupts = <0 22 4>;
@@ -242,7 +254,7 @@ gem0: ethernet@e000b000 {
};
gem1: ethernet@e000c000 {
compatible = "cdns,zynq-gem", "cdns,gem";
compatible = "xlnx,zynq-gem", "cdns,gem";
reg = <0xe000c000 0x1000>;
status = "disabled";
interrupts = <0 45 4>;
@@ -331,12 +343,14 @@ pinctrl0: pinctrl@700 {
};
};
dmac_s: dmac@f8003000 {
dmac_s: dma-controller@f8003000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0xf8003000 0x1000>;
interrupt-parent = <&intc>;
interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3",
"dma4", "dma5", "dma6", "dma7";
/*
* interrupt-names = "abort", "dma0", "dma1", "dma2", "dma3",
* "dma4", "dma5", "dma6", "dma7";
*/
interrupts = <0 13 4>,
<0 14 4>, <0 15 4>,
<0 16 4>, <0 17 4>,