From patchwork Tue Feb 20 04:30:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Portia Stephens X-Patchwork-Id: 1901203 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Tf6160gzYz1yP6 for ; Tue, 20 Feb 2024 15:31:22 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1rcHml-0004Ji-HZ; Tue, 20 Feb 2024 04:31:15 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1rcHmh-0004Ix-HL for kernel-team@lists.ubuntu.com; Tue, 20 Feb 2024 04:31:11 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 318E93F0C3 for ; Tue, 20 Feb 2024 04:31:11 +0000 (UTC) Received: by mail-pl1-f200.google.com with SMTP id d9443c01a7336-1d409124358so35782395ad.1 for ; Mon, 19 Feb 2024 20:31:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708403467; x=1709008267; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/9Nx7yz2IP0L/5iB539VH3HwedmG2pqFnIKvIhTzQYc=; b=Rn/spyfBjNm9T7MzOYdLBsnWLbh8PsD/EsMBFiOotypU7peHjbuI/cDvxjVF0bRtP8 uHPBThmVzPEUhfJbzNaSPk3C3m3oXdlYSxCXLbbzc44DitbbyMEyrZvJhzWeOT52yP5j nvQKgBwsKNxDGXdMXUEpKSPzwVFZLZpCH8BKyF2bsI7xD0aRBNxxbXCuM5TTxQBR42qN Raw2sBLzjLvtMwN8hin5+vL77sA9ZVOFDqY1sowkCGAKxU8BwnMpi39aRo1WWSkwVrVy +k1X8nyRZdo+az1RKTQVMD2ug5+rFRHdhofuVXYwXCCtxEAfmeQOYExKA9Lt2cmdiKBT YBHw== X-Gm-Message-State: AOJu0YxFOo4gXTgNgW9TJisroEQ9IuVBvkZ15IhkGa/e38EAtssKxtHk Z3Nj9q2BwXheU5Yr43nw0762Fycfh3rwgUUVJvnv+cSUZXRWV+cNnGhhySas5BQlLgCzfqfe1IA 9oKNPss1mIGxsZ+jJTSmM7u+2lpxiZEqL3luuT6KyAC3gp8XfEy//ca7OYmrMFA7gOCmajVN0V3 DM6TDtbszNsQ== X-Received: by 2002:a17:902:b190:b0:1d9:760d:31c7 with SMTP id s16-20020a170902b19000b001d9760d31c7mr11906806plr.29.1708403467690; Mon, 19 Feb 2024 20:31:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IEymComzfmBmLXLLXsBdBhM9QkPHduOgjwTanMzWa/QUXkYPKt1slPAo9wsujbrMYM+jOzq2A== X-Received: by 2002:a17:902:b190:b0:1d9:760d:31c7 with SMTP id s16-20020a170902b19000b001d9760d31c7mr11906798plr.29.1708403467311; Mon, 19 Feb 2024 20:31:07 -0800 (PST) Received: from localhost ([159.196.41.205]) by smtp.gmail.com with ESMTPSA id b3-20020a170902a9c300b001dc0955c635sm1481316plr.244.2024.02.19.20.31.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 19 Feb 2024 20:31:06 -0800 (PST) From: Portia Stephens To: kernel-team@lists.ubuntu.com Subject: [jammy xilinx-zynqmp 1/1] UBUNTU: SAUCE: zynqmp.dtsi fix incorrectly backported changes Date: Tue, 20 Feb 2024 14:30:59 +1000 Message-Id: <20240220043059.276750-2-portia.stephens@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220043059.276750-1-portia.stephens@canonical.com> References: <20240220043059.276750-1-portia.stephens@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 --- .../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@f9010000 { gpu: gpu@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@ff100000 { }; gem0: ethernet@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@ff0b0000 { }; gem1: ethernet@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@ff0c0000 { }; gem2: ethernet@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@ff0d0000 { }; gem3: ethernet@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@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@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@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@0 { + ams_ps: ams_ps@ffa50800 { compatible = "xlnx,zynqmp-ams-ps"; status = "disabled"; - reg = <0x0 0x400>; + reg = <0x0 0xffa50800 0x0 0x400>; }; - ams_pl: ams-pl@400 { + ams_pl: ams_pl@ffa50c00 { compatible = "xlnx,zynqmp-ams-pl"; status = "disabled"; - reg = <0x400 0x400>; + reg = <0x0 0xffa50c00 0x0 0x400>; }; };