[jammy xilinx-zynqmp 1/1] UBUNTU: SAUCE: zynqmp.dtsi fix incorrectly backported changes

[Portia Stephens]

BugLink: https://bugs.launchpad.net/bugs/2054366

When backporting the zynqmp.dtsi changes from 6.1 to support the KD240
platform, changes were brought in that are not compatible with the
5.15 kernel.

Fixes: 23fc78f4000f8 ("Sync KD240 DTS from xlnx_rebase_v6.1_LTS")

Signed-off-by: Portia Stephens <portia.stephens at canonical.com>
---
 .../arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi |  2 +-
 arch/arm64/boot/dts/xilinx/zynqmp.dtsi        | 42 +++++++++++--------
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi
index 653e0681c919..2ea3d45291fb 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi
@@ -126,7 +126,7 @@ &fpd_dma_chan8 {
 };
 
 &gpu {
-	clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>;
+	clocks = <&zynqmp_clk GPU_REF>, <&zynqmp_clk GPU_PP0_REF>, <&zynqmp_clk GPU_PP1_REF>;
 };
 
 &lpd_dma_chan1 {
diff --git a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
index badbd260fa29..2c59088ceeb1 100644
--- a/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
+++ b/arch/arm64/boot/dts/xilinx/zynqmp.dtsi
@@ -449,12 +449,12 @@ gic: interrupt-controller at f9010000 {
 
 		gpu: gpu at fd4b0000 {
 			status = "disabled";
-			compatible = "xlnx,zynqmp-mali", "arm,mali-400";
+			compatible = "arm,mali-400", "arm,mali-utgard";
 			reg = <0x0 0xfd4b0000 0x0 0x10000>;
 			interrupt-parent = <&gic>;
 			interrupts = <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>, <0 132 4>;
-			interrupt-names = "gp", "gpmmu", "pp0", "ppmmu0", "pp1", "ppmmu1";
-			clock-names = "bus", "core";
+			interrupt-names = "IRQGP", "IRQGPMMU", "IRQPP0", "IRQPPMMU0", "IRQPP1", "IRQPPMMU1";
+			clock-names = "gpu", "gpu_pp0", "gpu_pp1";
 			power-domains = <&zynqmp_firmware PD_GPU>;
 		};
 
@@ -587,7 +587,7 @@ nand0: nand-controller at ff100000 {
 		};
 
 		gem0: ethernet at ff0b0000 {
-			compatible = "xlnx,zynqmp-gem", "cdns,gem";
+			compatible = "cdns,zynqmp-gem", "cdns,gem";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 57 4>, <0 57 4>;
@@ -602,7 +602,7 @@ gem0: ethernet at ff0b0000 {
 		};
 
 		gem1: ethernet at ff0c0000 {
-			compatible = "xlnx,zynqmp-gem", "cdns,gem";
+			compatible = "cdns,zynqmp-gem", "cdns,gem";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 59 4>, <0 59 4>;
@@ -617,7 +617,7 @@ gem1: ethernet at ff0c0000 {
 		};
 
 		gem2: ethernet at ff0d0000 {
-			compatible = "xlnx,zynqmp-gem", "cdns,gem";
+			compatible = "cdns,zynqmp-gem", "cdns,gem";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 61 4>, <0 61 4>;
@@ -632,7 +632,7 @@ gem2: ethernet at ff0d0000 {
 		};
 
 		gem3: ethernet at ff0e0000 {
-			compatible = "xlnx,zynqmp-gem", "cdns,gem";
+			compatible = "cdns,zynqmp-gem", "cdns,gem";
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 63 4>, <0 63 4>;
@@ -1002,9 +1002,11 @@ dwc3_0: usb at fe200000 {
 				interrupts = <0 65 4>, <0 69 4>, <0 75 4>;
 				iommus = <&smmu 0x860>;
 				snps,quirk-frame-length-adjustment = <0x20>;
-				clock-names = "ref";
+				snps,refclk_fladj;
+				snps,enable_guctl1_resume_quirk;
 				snps,enable_guctl1_ipd_quirk;
-				snps,resume-hs-terminations;
+				snps,xhci-reset-on-resume;
+				snps,xhci-stream-quirk;
 				/* dma-coherent; */
 			};
 		};
@@ -1032,9 +1034,11 @@ dwc3_1: usb at fe300000 {
 				interrupts = <0 70 4>, <0 74 4>, <0 76 4>;
 				iommus = <&smmu 0x861>;
 				snps,quirk-frame-length-adjustment = <0x20>;
-				clock-names = "ref";
+				snps,refclk_fladj;
+				snps,enable_guctl1_resume_quirk;
 				snps,enable_guctl1_ipd_quirk;
-				snps,resume-hs-terminations;
+				snps,xhci-reset-on-resume;
+				snps,xhci-stream-quirk;
 				/* dma-coherent; */
 			};
 		};
@@ -1063,22 +1067,24 @@ xilinx_ams: ams at ffa50000 {
 			status = "disabled";
 			interrupt-parent = <&gic>;
 			interrupts = <0 56 4>;
+			interrupt-names = "ams-irq";
 			reg = <0x0 0xffa50000 0x0 0x800>;
-			#address-cells = <1>;
-			#size-cells = <1>;
+			reg-names = "ams-base";
+			#address-cells = <2>;
+			#size-cells = <2>;
 			#io-channel-cells = <1>;
-			ranges = <0 0 0xffa50800 0x800>;
+			ranges;
 
-			ams_ps: ams-ps at 0 {
+			ams_ps: ams_ps at ffa50800 {
 				compatible = "xlnx,zynqmp-ams-ps";
 				status = "disabled";
-				reg = <0x0 0x400>;
+				reg = <0x0 0xffa50800 0x0 0x400>;
 			};
 
-			ams_pl: ams-pl at 400 {
+			ams_pl: ams_pl at ffa50c00 {
 				compatible = "xlnx,zynqmp-ams-pl";
 				status = "disabled";
-				reg = <0x400 0x400>;
+				reg = <0x0 0xffa50c00 0x0 0x400>;
 			};
 		};
 
-- 
2.34.1