diff options
| author | Olof Johansson <olof@lixom.net> | 2020-08-21 04:12:06 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-08-21 04:12:06 +0200 |
| commit | cabe3a137148d1fdcf8eed494a6a881a5d5a8195 (patch) | |
| tree | 7d8c3864f0462695c0ef1023ce0277affee943b5 | |
| parent | arm64: defconfig: Enable ptn5150 extcon driver (diff) | |
| parent | arm64: dts: xilinx: Align IOMMU nodename with dtschema (diff) | |
| download | linux-cabe3a137148d1fdcf8eed494a6a881a5d5a8195.tar.xz linux-cabe3a137148d1fdcf8eed494a6a881a5d5a8195.zip | |
Merge tag 'zynqmp-dt-for-v5.9' of https://github.com/Xilinx/linux-xlnx into arm/fixes
arm64: soc: ZynqMP DT changes for v5.9
- Add node for PS-GTR transceivers
- Fix iommu node name to match dtschema
* tag 'zynqmp-dt-for-v5.9' of https://github.com/Xilinx/linux-xlnx:
arm64: dts: xilinx: Align IOMMU nodename with dtschema
arm64: dts: zynqmp: Add GTR transceivers
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi index 9174ddc76bdc..3ec99f13c259 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi +++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi @@ -13,6 +13,7 @@ */ #include <dt-bindings/power/xlnx-zynqmp-power.h> +#include <dt-bindings/reset/xlnx-zynqmp-resets.h> / { compatible = "xlnx,zynqmp"; @@ -558,6 +559,15 @@ }; }; + psgtr: phy@fd400000 { + compatible = "xlnx,zynqmp-psgtr-v1.1"; + status = "disabled"; + reg = <0x0 0xfd400000 0x0 0x40000>, + <0x0 0xfd3d0000 0x0 0x1000>; + reg-names = "serdes", "siou"; + #phy-cells = <4>; + }; + rtc: rtc@ffa60000 { compatible = "xlnx,zynqmp-rtc"; status = "disabled"; @@ -601,7 +611,7 @@ power-domains = <&zynqmp_firmware PD_SD_1>; }; - smmu: smmu@fd800000 { + smmu: iommu@fd800000 { compatible = "arm,mmu-500"; reg = <0x0 0xfd800000 0x0 0x20000>; status = "disabled"; |