From patchwork Fri Mar 8 00:25:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Portia Stephens X-Patchwork-Id: 1909506 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 4TrRm36b79z1yWx for ; Fri, 8 Mar 2024 11:25:55 +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 1riO3V-00054h-P7; Fri, 08 Mar 2024 00:25:45 +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 1riO3Q-000512-S0 for kernel-team@lists.ubuntu.com; Fri, 08 Mar 2024 00:25:42 +0000 Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) (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 5B3CE3FB6A for ; Fri, 8 Mar 2024 00:25:40 +0000 (UTC) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-299c12daea5so2080657a91.1 for ; Thu, 07 Mar 2024 16:25:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709857538; x=1710462338; 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=DiR3eH+TyhrRtFySKnBZy1Q7QFhyQZN+BdckSFL0OhM=; b=T1E/zwPSPB3Jm+lZdY/bGXW4BWfjrKT7Ic4Qqq3E6w/ixA4Iz6wTKClqiHhBcX2xij qygyhqZA8nPoY6py3R0vpOZ6Clve0iMBU1NP/1gIuuR2j+6xjuS5asjbWSASEdP0I1de 29Qln0ldOjLp+S26S1zF9iG6QLF4oPtBx/wqkJaNnFlWSrLLnhtrhq0Dtrp3TPt3eWIt WWXVB1kGLClCDG4EyDZAKP8E36ow6Ew3LV0Ebgyk3jIReuDt/jJ6GY+h0PisGf/f23yw 0icJkzEMKs3YktQh15g+oaeDCVOn6Z9eSeCaaY0V8CeIt8Nu0AMlq7ILZY3pRk+hwYDI GvVA== X-Gm-Message-State: AOJu0YxLn4oE6ACvcHheVIsDgzwzTD25q2gYQ6TZbS2qcD+nv7eQes1Q ze/zXygY45XUUVqvpW6ohKlN74PwMmrxKDomXDgF7c2j72fhxYqnVpCTZu7rOEStNzNXpoJGs80 5ULaeL/aDu75Ic55pkvTGYUhxdO0xLckaJRKYHtK5F98u+EhssZunkyPJDEZSN9UjJTu+nw7TMW 1lXhAZUwHqEA== X-Received: by 2002:a17:90b:3d0b:b0:29b:9de3:d373 with SMTP id pt11-20020a17090b3d0b00b0029b9de3d373mr3444239pjb.5.1709857537879; Thu, 07 Mar 2024 16:25:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IFbDmpdfZJIJoxexzXE5KipwNLePXHGN1VtKDqdc0EULcWJvOyH2mZWBH2pbW7hcnnHJwSgjg== X-Received: by 2002:a17:90b:3d0b:b0:29b:9de3:d373 with SMTP id pt11-20020a17090b3d0b00b0029b9de3d373mr3444217pjb.5.1709857537494; Thu, 07 Mar 2024 16:25:37 -0800 (PST) Received: from localhost ([159.196.41.205]) by smtp.gmail.com with ESMTPSA id gt17-20020a17090af2d100b00298cc4c56cdsm2135231pjb.22.2024.03.07.16.25.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 16:25:36 -0800 (PST) From: Portia Stephens To: kernel-team@lists.ubuntu.com Subject: [SRU] [jammy xilinx-zynqmp 3/3] arm64: zynqmp: Fix kr260 clock wiring Date: Fri, 8 Mar 2024 10:25:15 +1000 Message-Id: <20240308002515.1211465-4-portia.stephens@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240308002515.1211465-1-portia.stephens@canonical.com> References: <20240308002515.1211465-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" From: Michal Simek BugLink: https://bugs.launchpad.net/bugs/2055241 kr260 revA/revA01 is using discrete oscilator for DP (27MHz) and si5332 for other clocks but clocks are different compare to kv260 that's why fix it to aligned with the latest schematics. On the other handle kr260 revB/revA03 also contains 74.25 MHz discrete clock chip for SLVC-EC output which is not defined. (cherry picked from commit a0fe3083d290f8507922a68daa60cb92d76d56b2 linux-xlnx/xlnx_rebase_v6.6_LTS) Link: https://lore.kernel.org/r/e87ae94979c6efc909740bb1a569505042e4f876.1706626255.git.michal.simek@amd.com Signed-off-by: Michal Simek State: pending Signed-off-by: Portia Stephens --- .../arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revA.dts | 14 ++++++++++---- .../arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revB.dts | 6 ++++++ 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revA.dts b/arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revA.dts index 3e49dcbfe672..474ce65e5eef 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revA.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revA.dts @@ -25,16 +25,22 @@ ina260-u14 { io-channels = <&u14 0>, <&u14 1>, <&u14 2>; }; + clk_27: clock0 { /* u86 - DP */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <27000000>; + }; + clk_125: si5332_0 { /* u17 - GEM0/1 */ compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <125000000>; }; - clk_27: si5332_1 { /* u17 - DP */ + clk_74: si5332_5 { /* u17 - SLVC-EC */ compatible = "fixed-clock"; #clock-cells = <0>; - clock-frequency = <27000000>; + clock-frequency = <74250000>; }; clk_26: si5332_2 { /* u17 - USB */ @@ -49,13 +55,13 @@ clk_156: si5332_3 { /* u17 - SFP+ */ clock-frequency = <156250000>; }; - clk_25_0: si5332_4 { /* u17 - GEM2 */ + clk_25_0: si5332_1 { /* u17 - GEM2 */ compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <25000000>; }; - clk_25_1: si5332_5 { /* u17 - GEM3 */ + clk_25_1: si5332_4 { /* u17 - GEM3 */ compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <25000000>; diff --git a/arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revB.dts b/arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revB.dts index 4a0cabda3102..6636a63298ea 100644 --- a/arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revB.dts +++ b/arch/arm64/boot/dts/xilinx/zynqmp-sck-kr-g-revB.dts @@ -60,6 +60,12 @@ clk_25_1: clock5 { /* u92/u91 - GEM3 */ #clock-cells = <0>; clock-frequency = <25000000>; }; + + clk_74: clock6 { /* u88 - SLVC-EC */ + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <74250000>; + }; }; &i2c1 { /* I2C_SCK C26/C27 - MIO from SOM */