From patchwork Mon Apr 22 16:16:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13638658 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1878DC4345F for ; Mon, 22 Apr 2024 16:16:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=529FRvh3qqy+lzTlcSihPnRBI2WTJVJ2jRFIiYFOqt8=; b=HXITt/K3ZRaPQa 1stkxF3d35pK3ozU4hjT4VsB09tooiUBgVBsvMcmeS1/MmErL9yCVsxdZuI24YlbhNbUsh1tHvwqQ sYeYG7qnlPGCH4XbPUgUJ9x3UAewMX037W/kRmJ85/o9/NPPCTMSmcKBWHNBuIkgc9yuFYQkwdu0m YE18paSGMhxCLx65bDe1HPNJ/T0BeYGrM9mXMq/dzNBCaI0UNMdL2N6DD3jCVZX4FpllYeScjMQzI mOtLMzmRRNs1BC4VnF2gAGHZd3DRND4CMQa6KPqycBcbrcELHoai8uO4Pvljo0qnysEKZVq7hiLmZ yotVcUoP8pFFbvwJ9zMQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rywLE-0000000EFmj-3IRq; Mon, 22 Apr 2024 16:16:28 +0000 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rywLC-0000000EFkZ-09C4 for linux-phy@lists.infradead.org; Mon, 22 Apr 2024 16:16:27 +0000 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-41a0979b999so11362465e9.0 for ; Mon, 22 Apr 2024 09:16:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713802584; x=1714407384; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=LbaftYc/ei4oHUBSrTKOEB6H45OgBK8ia0PvwI9H3VM=; b=IjI9mEW2YDTaohshQviI+oECP5BZ+NMl3GKbwO+TeOgfOyz7y7XYocJ2hyU0FBNiaU uC7SOrLcPN6ZT0CKq0SRv+LdHOfVu58H2gBHYvOocAKosElXLvpHRnC/0S5nP3a7fBTg yLWklE3v7rp3fAnAxMB3DCDxGbOcFQviIpBIcfvDVIOnUAJSzFmYu5UPnQL+zh8Ai3iO Hybvwi/gcUfI5i3ykrDK7xhBQsXcQc5LoWTyz+0BDawFyCgTcXl5dWN8o6R3+4H783iT 7VFafHm0HRkrVx77Y9GzzOPzEnFizF7t7GgLSCIvZfhy5y+VmKeZ9aRLiZuNflCXlCB6 /3Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713802584; x=1714407384; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LbaftYc/ei4oHUBSrTKOEB6H45OgBK8ia0PvwI9H3VM=; b=O+WH1CBpFUPxZEK1QyS/rYWBjHowHDDKDjfEg6KgzoKT+qRulzQsiKPGvoNno48Z8Q vudhVZ6QB5QZLoaKZ7B2KhfuoO+53/fSNSGKXm0nTdHlft+KINGkmDqM68x5Y5TmZink sTFBIiYFE66Lus8lTuD2hkyd7pbV78ym1dnDPGg5Lb5phBD+GxkuSPE8uDybRivhnEKB Kpvyf6zsGFMu+hfzX7xSRaDKPtmgIY7chuBuFjbrg8wGtUm6xNpDWms8knNcT2TBwCRK jGIESAIj2j7sy2vZt8lkqPdN3THbCdAENmT/dv/L69UthY9L2Kvq0obCbf1jW38k0Sr9 2aYA== X-Forwarded-Encrypted: i=1; AJvYcCX3qy6shNGwAtr7m6wfzR0JhqRcWow5mCDGmouJfy0g1vlAeoUDbqo/sq02saoVNQYkzw2Y5HETOruxlQgH95tZP9sFjexiM86dy5s+BQ== X-Gm-Message-State: AOJu0Yxv8nD3yMcm8L/52TBqIkK3nl7P09EXH7b1p+08CT0HnUJNNWua zKP67MUnWZsQiqSp5exPs8g3YNUl2SJ5MlhNUmaTuZIR5QE7e6+2mcYx1F6ge78= X-Google-Smtp-Source: AGHT+IFtuRbB7/bsMHFBiRzVKO0N2/H4DC2fwitR9R+6Qndbhc6U5jg5aAj6yfHlfDcTrPds0p9osA== X-Received: by 2002:a05:600c:354d:b0:41a:c92:d323 with SMTP id i13-20020a05600c354d00b0041a0c92d323mr4315677wmq.10.1713802583862; Mon, 22 Apr 2024 09:16:23 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id a12-20020a056000100c00b00349ceadededsm12463710wrx.16.2024.04.22.09.16.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 09:16:23 -0700 (PDT) From: Neil Armstrong Date: Mon, 22 Apr 2024 18:16:18 +0200 Subject: [PATCH v4 1/3] arm64: dts: qcom: sm8450: remove pcie-1-phy-aux-clk and add pcie1_phy pcie1_phy_aux_clk MIME-Version: 1.0 Message-Id: <20240422-topic-sm8x50-upstream-pcie-1-phy-aux-clk-v4-1-868b15a17a45@linaro.org> References: <20240422-topic-sm8x50-upstream-pcie-1-phy-aux-clk-v4-0-868b15a17a45@linaro.org> In-Reply-To: <20240422-topic-sm8x50-upstream-pcie-1-phy-aux-clk-v4-0-868b15a17a45@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong , Dmitry Baryshkov X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=1175; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=1bqm37cHBp77XacdQMnUI5xOez5SEa+Brh+86TcfY3k=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmJo1UjpLONI6SQLX+Etrq9QTUa1CvKcawV0W+TVTt GPpSoVCJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZiaNVAAKCRB33NvayMhJ0XBDD/ 0TejuyODhFAqwnaXddK6COIB6YKsg41/lT08lAx38ZYgt4B1XhVFBj3c7X+2wkkz4WYcSSyg/h/CCi pwYBYcPmfWTC/5hJHw1P7WhNdKN+FpJGPz2XNNVozZKv5RXZQv5IqwNo5oxuz+n7SXoTHDXIf7UDfA D16TTPg9+FGXEK/e+DAuf9RPAQxDSlT+ZfkTsuK2CXFQvr6oFUZX6w4gJQ7phajn8e25a8FKeBlXpd eCizpX9iOSFcLd0zykGiqJj7vKjiKtBIwQ5N93hQbcJNMQvLDpDC1i668KqrSuuOuojG6SGVeJcCLU 1WbBNgqtpv7K5bOmvn16rVvnfWMAdX8BQcWQ9/3N6BR+hFIXzuGKAYXxizZYZMtjNc3fsDAuEcqZIJ /VniMWKcpXRopV+dBuJYSAoT2jzrnU4UB6RQ5NDj1mH5Jr4tXbWYXre+lnND8CNai+7nWjTPdSyHV2 S/u2bHc+rrte7dD3BnLufgsaHS240hoI1AL5HtbcelM9G0RPbRpI15TG4+6GJcYYkZI7/pz5+ShNKA UNTkW6nkPuZ8BadWtayoDwOQkdOWTX+iPU/wTuj18QwQX4MPb8GHehcCGP4nsWliabx293PIj1cXi4 sWyzYLe5TeQkESuCDijH2eS638vz4H+ujMQYlaRRnYI+QGJISdkDzXqKc5qw== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240422_091626_092347_7937A185 X-CRM114-Status: UNSURE ( 8.70 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Remove the dummy pcie-1-phy-aux-clk clock and replace with the pcie1_phy provided QMP_PCIE_PHY_AUX_CLK. Reviewed-by: Dmitry Baryshkov Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8450.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8450.dtsi b/arch/arm64/boot/dts/qcom/sm8450.dtsi index 616461fcbab9..71797f337d19 100644 --- a/arch/arm64/boot/dts/qcom/sm8450.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8450.dtsi @@ -754,8 +754,8 @@ gcc: clock-controller@100000 { clocks = <&rpmhcc RPMH_CXO_CLK>, <&sleep_clk>, <&pcie0_phy>, - <&pcie1_phy>, - <0>, + <&pcie1_phy QMP_PCIE_PIPE_CLK>, + <&pcie1_phy QMP_PCIE_PHY_AUX_CLK>, <&ufs_mem_phy 0>, <&ufs_mem_phy 1>, <&ufs_mem_phy 2>, @@ -2000,8 +2000,8 @@ pcie1_phy: phy@1c0e000 { "rchng", "pipe"; - clock-output-names = "pcie_1_pipe_clk"; - #clock-cells = <0>; + clock-output-names = "pcie_1_pipe_clk", "pcie_1_phy_aux_clk"; + #clock-cells = <1>; #phy-cells = <0>; From patchwork Mon Apr 22 16:16:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13638661 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 51D39C4345F for ; Mon, 22 Apr 2024 16:16:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rnhnKsD5Hs6kMznm+30ElrZKvc7wPmKEH6FHA+fLcI4=; b=I8sePElIX7p8n8 WIojgUFhGLFPCNKW2+QnbmJYJJFuhMrjZTbYcqx51cYFryfH90NUQMmx+BBn+0XGKAjlEbktph7Bu pVkCodD4zu9K1Z+EvaMfpC5FzK3GoGnXGFXgFlNpZIWYwWXxGnzOBnizI5ZLUeDV8RvqyczkDgS8V ywSi4dpxNVryUc5SVDyEDyaR0npQPnvcr9X+I7SbVmwyfmrxrvN/FIQQ8RGozb8ipfX/CfR9QXR3z k6Dqpm9myKIoJnm9k2BHlxX7CR6omNyWiivO8E/QCPuZcE8Uup5LuYOozcHIIRoRGbmYVc92IL+is 3v+waF+jBnh/a8m8VQVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rywLH-0000000EFnt-3RNC; Mon, 22 Apr 2024 16:16:31 +0000 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rywLD-0000000EFkp-3T7e for linux-phy@lists.infradead.org; Mon, 22 Apr 2024 16:16:29 +0000 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-41a4f291f9dso9051055e9.2 for ; Mon, 22 Apr 2024 09:16:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713802585; x=1714407385; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=oegXinPYwwoL2z7AYKNs7tSUYhpriNFMkgsj5BeRMAw=; b=FDbxqFTDErqaLw9WAPUdNqkpPt5utnJXJV/+YRD+VrZkFcEwxH82F7qV35BPngM7eU tQk96nzmJTEtcBut2kGPquj+QsvGMrNs5mb9Mjls1aifwwCNxpXsPA5CG9wvdQBx0dNK u5C+qx8Cep+ZHzuOjdWvKkMDi9KN3RtpaygjGDr5luz5IGxZGRUhFRwWfXze7tbPCtfN IT3qqFZURFvGP4+AGATJLrXn1315IvIEnZz5zhx76MzKxPYNniujhvJVwMsr4Z56HwkR tiGz2is0jfLXpNF6yAEIllDxWnPzw3O+oQjAoGbXgsNUx6Yv7HjS2ooLxnSr5q50d85y pETQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713802585; x=1714407385; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=oegXinPYwwoL2z7AYKNs7tSUYhpriNFMkgsj5BeRMAw=; b=XNeo9mYid7+Qn4yn1gZVfqlgxf+qurJHFqjRn6F0z2okpvGkRK68597AgXcQQRzGYt jKh9XcKyJ2XKDULoEtYqJXu/1vaZU3UFO/w/SBtATv6SuSrQAmblqHmOQhlmvwmYALcd PsRAn/32wZukAzOFFpUX3nMuouwfCy/+9GEghgUOPhStBHIA3mUz/o/VpPnaslY8Kmq4 cy/pLxT9AKQnvmoSOINHzHW2Ej52r9vkM1QRPtR/CGI+gpO6FnL4KQDJPzxH+SvHVkD2 NSqjpN/kdL/sxUaBkUKDvGH+Lre9NSQXzR0fvO0cQfJGSAWOSWkb59HjvLFCtBXQUxMg w59w== X-Forwarded-Encrypted: i=1; AJvYcCVJwq88Mv4PCGYPgblQw8UxkWxlISYVKgGhWPbV0Y9fUJDGRLxK/qNWu/dgMFAGgcL53/3eDf6IK/qv1jTs3eRmz1ZZbYuE8DR0h2Cs1Q== X-Gm-Message-State: AOJu0YyHEAD8lEjuFT85X07phnpyS2IO9OgcSNccBRA7c4KbM66llXAn 74IZd/aNUgRWeb2F352tiOFNS3JYjJjFl492zgxCssGlrBFJpqrfcx1m1Wi1H1I= X-Google-Smtp-Source: AGHT+IGSQUQfn8YiizXCX0G96buoTLgow78PntJ8E8/Mr8X0ro+Sanyat2q1M625zyt//Gj6wmDfTw== X-Received: by 2002:a05:600c:3504:b0:416:605b:5868 with SMTP id h4-20020a05600c350400b00416605b5868mr6505304wmq.35.1713802584792; Mon, 22 Apr 2024 09:16:24 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id a12-20020a056000100c00b00349ceadededsm12463710wrx.16.2024.04.22.09.16.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 09:16:24 -0700 (PDT) From: Neil Armstrong Date: Mon, 22 Apr 2024 18:16:19 +0200 Subject: [PATCH v4 2/3] arm64: dts: qcom: sm8550: remove pcie-1-phy-aux-clk and add pcie1_phy pcie1_phy_aux_clk MIME-Version: 1.0 Message-Id: <20240422-topic-sm8x50-upstream-pcie-1-phy-aux-clk-v4-2-868b15a17a45@linaro.org> References: <20240422-topic-sm8x50-upstream-pcie-1-phy-aux-clk-v4-0-868b15a17a45@linaro.org> In-Reply-To: <20240422-topic-sm8x50-upstream-pcie-1-phy-aux-clk-v4-0-868b15a17a45@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong , Dmitry Baryshkov X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=3526; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=rYxvioeYdrYpFuDiaA9P8FKJ7TkOlkTdAv+95S9xHjU=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmJo1VxU2ecxpDYSriHYfNiKEKc1H/282dmFjacNo2 b2qwI3iJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZiaNVQAKCRB33NvayMhJ0Q05EA CvoavizC5fznewE5XEKnrfZIghet8RQ5aDEKYxrcayZ1d/KAdeFVWdN1v5R0BZloPfPm/kEPYKctF6 JuZllGgrC8efxtAWG0P4YNB+oxzMCd0f9YXtGD3p3dwctp7HWno9qLIRmrc53T9AnGVtHRZePHEFcr bdcLVnPeADtXWzx8QcQp4QWo68OdySBN0kd6il2iae7JlyWQOeq4hTWB14yJAw8T7j+Giu8Ptotn8l 0zt3XWvtJOOB0fMLIuTrrBHYUdyCEvTRQFb39y/hr7asFUgDHAtcSr+RW5MWrclcSnOSDnKFEPPjgt emFBtLLeX0UUP92qG8vZkAfXiU+YOdvF+T1y4gb9mSpHxUjrFYkJ/s2oJSNhQXS4+xwRRp9aRNdjyI Mf5k+Y2tqxCae3MJ7LxkipEDqOJHdKXlbK+Ms/lANecUg2IFMWO1bwwEwvUaas0Ps1EmiKBbdauA9d KFbEMPxWvFDpERSVMK20Jb2K9MVw1ItJSL7b3KRQeocv+jDat4Ad37I4BeJBmkxUlaN/CykCfEhixm E92gozD+DJEJMoeUGE1DOzT+7F43J3EGMgiL0fHWaaXXfwrrLyrcOtMH01KV9sL1PS3Ts5F41e3EXJ P7dfH1rxyxOlko3uCYBDURdFNzUXuC8DWjkQKpIt5ZNvbiDPLwdH3eT5GiwQ== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240422_091627_915328_F77E04E3 X-CRM114-Status: UNSURE ( 9.79 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Remove the dummy pcie-1-phy-aux-clk clock and replace with the pcie1_phy provided QMP_PCIE_PHY_AUX_CLK. Reviewed-by: Dmitry Baryshkov Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 4 ---- arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 4 ---- arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 19 ------------------- arch/arm64/boot/dts/qcom/sm8550.dtsi | 13 ++++--------- 4 files changed, 4 insertions(+), 36 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts index 12d60a0ee095..ccff744dcd14 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-hdk.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-hdk.dts @@ -979,10 +979,6 @@ &pcie1_phy { status = "okay"; }; -&pcie_1_phy_aux_clk { - clock-frequency = <1000>; -}; - &pm8550_gpios { sdc2_card_det_n: sdc2-card-det-state { pins = "gpio12"; diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts index 3d4ad5aac70f..1fa7c4492057 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts @@ -739,10 +739,6 @@ &mdss_dp0_out { remote-endpoint = <&usb_dp_qmpphy_dp_in>; }; -&pcie_1_phy_aux_clk { - clock-frequency = <1000>; -}; - &pcie0 { wake-gpios = <&tlmm 96 GPIO_ACTIVE_HIGH>; perst-gpios = <&tlmm 94 GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts index 92f015017418..39ba3e9969b7 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts @@ -720,17 +720,6 @@ &ipa { status = "okay"; }; -&gcc { - clocks = <&bi_tcxo_div2>, <&sleep_clk>, - <&pcie0_phy>, - <&pcie1_phy>, - <0>, - <&ufs_mem_phy 0>, - <&ufs_mem_phy 1>, - <&ufs_mem_phy 2>, - <&usb_dp_qmpphy QMP_USB43DP_USB3_PIPE_CLK>; -}; - &gpi_dma1 { status = "okay"; }; @@ -810,10 +799,6 @@ &mdss_dp0_out { remote-endpoint = <&usb_dp_qmpphy_dp_in>; }; -&pcie_1_phy_aux_clk { - status = "disabled"; -}; - &pcie0 { wake-gpios = <&tlmm 96 GPIO_ACTIVE_HIGH>; perst-gpios = <&tlmm 94 GPIO_ACTIVE_LOW>; @@ -907,10 +892,6 @@ &pon_resin { status = "okay"; }; -&pcie_1_phy_aux_clk { - clock-frequency = <1000>; -}; - &qupv3_id_0 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/sm8550.dtsi b/arch/arm64/boot/dts/qcom/sm8550.dtsi index bc5aeb05ffc3..143994d1e6ca 100644 --- a/arch/arm64/boot/dts/qcom/sm8550.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8550.dtsi @@ -58,11 +58,6 @@ bi_tcxo_ao_div2: bi-tcxo-ao-div2-clk { clock-mult = <1>; clock-div = <2>; }; - - pcie_1_phy_aux_clk: pcie-1-phy-aux-clk { - compatible = "fixed-clock"; - #clock-cells = <0>; - }; }; cpus { @@ -776,8 +771,8 @@ gcc: clock-controller@100000 { #power-domain-cells = <1>; clocks = <&bi_tcxo_div2>, <&sleep_clk>, <&pcie0_phy>, - <&pcie1_phy>, - <&pcie_1_phy_aux_clk>, + <&pcie1_phy QMP_PCIE_PIPE_CLK>, + <&pcie1_phy QMP_PCIE_PHY_AUX_CLK>, <&ufs_mem_phy 0>, <&ufs_mem_phy 1>, <&ufs_mem_phy 2>, @@ -1928,8 +1923,8 @@ pcie1_phy: phy@1c0e000 { power-domains = <&gcc PCIE_1_PHY_GDSC>; - #clock-cells = <0>; - clock-output-names = "pcie1_pipe_clk"; + #clock-cells = <1>; + clock-output-names = "pcie1_pipe_clk", "pcie1_phy_aux_clk"; #phy-cells = <0>; From patchwork Mon Apr 22 16:16:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 13638660 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DAFDDC07C79 for ; Mon, 22 Apr 2024 16:16:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References:Message-Id :MIME-Version:Subject:Date:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=k/4xnYjzFs3CMTMKoZiNfh2VkK4Ke5UCRa2+wLLF2Bg=; b=XMnzqP9AGzXuv3 FV12h9XxZfAdHN0wZorBlKhc2Hb+Ei/HY2cSMmgAXGIzodanTgo1fk0sBtzIiBpbzvG7Xih7YkbNO 9/agYPNRgAPtwlVjMFGbPc39r4R+tdbCMsHM9I2Qx2yHLInJc0sQnkLjU9BZh26c4sBEzIoqau0fC MIx4V720F7JPIrOU07N8dozDH4RIfySm217aP29AHGtPo0sPyDSLC83Enm/vQNChSxnofZ8SaKQ6i 77vV/ufAWta4bhPocBig9cnbo1alw6IEaU1/nCxXrTh529w7jwKpx3ltY/bdOQuNGn8OWRpy7T72G BJj8W1m1mgZ3d9XPLfEQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rywLH-0000000EFng-2CPX; Mon, 22 Apr 2024 16:16:31 +0000 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rywLD-0000000EFli-3T3e for linux-phy@lists.infradead.org; Mon, 22 Apr 2024 16:16:29 +0000 Received: by mail-wm1-x332.google.com with SMTP id 5b1f17b1804b1-41a72f3a1edso7128655e9.2 for ; Mon, 22 Apr 2024 09:16:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1713802586; x=1714407386; darn=lists.infradead.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=cLRaymjKldV5Ae25ez2pVEwmOtAjv9LTg0zkuha6uuU=; b=FezMzaLKs3czGJRzuUsvRQHQmyq/5cyCrJ/z1NN/QLyaRVL0rwxS2UcJhP3yIn3Cta MMRSGqICDbdwZTEVb3UwdZbHGD3b1h+7H3584n2nLcqdM5VA7808R1MwDMujoXpBgtHc NaeJloZjR+EPBYgche7Kwx78o1dMN8Tb0E/Ias72hEVLJDYH83K5ZpILGEnFSzS4Ny2i KRLUXmhJ/G/uWWHn1IdLVDiejwTaul37CNn0HMdgXnRIpsVsRdg3dGrVKwJkzCmqqVZG BrJ7P2Yz9Rs9vDvHo1VgueJetHe1YPpAMSv2LkMvYPkkyOgNrYM9fAQZCtB2bGylvzoS KGGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713802586; x=1714407386; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cLRaymjKldV5Ae25ez2pVEwmOtAjv9LTg0zkuha6uuU=; b=uSFrecRwDBX01DtNr3mVDZICxDTFnqcmgtnxDU5tH+9/iZxITpbTmUsny1XDAj46mj wln5XhMX2svx0qeYzixaahBssXabYkfUGxSZNB0PfD7kkdICTHgDrGcGkJMUZc67nu7o 6dQ8mdQOSlyH1UP1bPvzh3P8+IZPStfqpFmroNnHOczY3RGg2muwbPFsDK5yqN1HsiiI 2j4opp79KhAT8Ase4nVQ8dv2YSk426I7IYlEkRxWIVFnK0JOMHeWWngg8GqwlkEIkJNF kxyw2GmmpHXNcvC0oPCKWsBqAxfONMj4FbaUGeeTzBgSvoqyEh0iJPslQl5SxdrFZOL4 Kl4g== X-Forwarded-Encrypted: i=1; AJvYcCXLa6dE9nF9q+VPITw5DMwUckNv7eRN8whtKHX0gXbgqEZ/ozPPyFJBHLdZnZdb+vx+efMlwrl/yh8mfQRsYnD7yq4F8eYcD+1R6BiSfA== X-Gm-Message-State: AOJu0YybzqPNbV6vCPZ0sypjpTnl+wkJTGj9LQwa+BKbAtdDq7EkOw6Z owL94Y6j5jskrDPSqEPTO6lK6GptT98lSED97eLEW/v19rMkK5n1ySJoSISmtOPpNFdWmSaMTvH 4aHwjww== X-Google-Smtp-Source: AGHT+IEdkYcVtwh40osd4Oka6JYMUbTOhMjD4X/PZ8vmFTtoSEQvJrYa2uPdOkANHBd0NVvOkkru2Q== X-Received: by 2002:a05:600c:4f49:b0:418:7401:b15f with SMTP id m9-20020a05600c4f4900b004187401b15fmr7685138wmq.38.1713802585704; Mon, 22 Apr 2024 09:16:25 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id a12-20020a056000100c00b00349ceadededsm12463710wrx.16.2024.04.22.09.16.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Apr 2024 09:16:25 -0700 (PDT) From: Neil Armstrong Date: Mon, 22 Apr 2024 18:16:20 +0200 Subject: [PATCH v4 3/3] arm64: dts: qcom: sm8650: remove pcie-1-phy-aux-clk and add pcie1_phy pcie1_phy_aux_clk MIME-Version: 1.0 Message-Id: <20240422-topic-sm8x50-upstream-pcie-1-phy-aux-clk-v4-3-868b15a17a45@linaro.org> References: <20240422-topic-sm8x50-upstream-pcie-1-phy-aux-clk-v4-0-868b15a17a45@linaro.org> In-Reply-To: <20240422-topic-sm8x50-upstream-pcie-1-phy-aux-clk-v4-0-868b15a17a45@linaro.org> To: Bjorn Andersson , Konrad Dybcio , Vinod Koul , Kishon Vijay Abraham I , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Krzysztof Kozlowski Cc: linux-arm-msm@vger.kernel.org, linux-phy@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Neil Armstrong , Dmitry Baryshkov X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=2488; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=zQpxV0djrOiwPxhRvSgIUZn7ViHWbqTnSNjH4kOd7u8=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmJo1VSLSi38VwUGg9SkrFCuwR25JxE8KGd2ordZb/ iMfwOeaJAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZiaNVQAKCRB33NvayMhJ0VRtD/ 9P+KWUA0JixCC1oGR2+YHAxDG+fQHXgdzp2az5ClOduO3N7RRavgAW9eXu/RCG+etSnXlXV9Cb8bwJ zQRFJgon3i3erE3aMlmgjEUM/E3/dfLpfvP73rON4BrIWVQ3uTEbNb1W38U7ww+CYA+8pMiU/1OjRk W8vQzfPZM8xiG58kVagNo6z7XJvpMAO0S9uHCZRZV3b9N/FuZPlGu9bphEOTTiMmtb/nuJze0x1bV7 6bBPC1xeCwoZpq2isz0ePgFEcZQbuBJMlw2Kre0Nf7WF1QqZTjXTnq3zIId/N2jGkNp3yev9LDlRaj zgHEX/LqARu1nlSBczDoy56J92Q8nP7VliMaUoVmkfUN7WOoppwGC05sWlhfX409GoUmxwBu7e5RGj Zh+/pzsafSWO/jOarfo8SsAsLkJeH8a75Bf0U1aCdp78KsTwHekC1EFTwALCPyO/FbbpNsdImpe3Wn O+6Xjy4gwZe/Wumfy3rLZ9UOxvkRinFIOYXXHot6LOTbLTUc5ZxywUaTbWWSi7QUn2qCrDTlnmqnaT xmm/DNeOMSB6QT06HlJXTNHFuR+9XttavsSSwuuCbxhhbJGsSXrw3muKD5GR3eLFRgINOjmspvwDI+ KZ/tU64jVUJceM8veKRafjYnK5T+NaHkh4BXADXoWLJW+OwXa8SjyIG3o6Xg== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240422_091627_891712_11D4AA5D X-CRM114-Status: UNSURE ( 9.82 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-phy@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Linux Phy Mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-phy" Errors-To: linux-phy-bounces+linux-phy=archiver.kernel.org@lists.infradead.org Remove the dummy pcie-1-phy-aux-clk clock and replace with the pcie1_phy provided QMP_PCIE_PHY_AUX_CLK. Reviewed-by: Dmitry Baryshkov Signed-off-by: Neil Armstrong --- arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 4 ---- arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 4 ---- arch/arm64/boot/dts/qcom/sm8650.dtsi | 13 ++++--------- 3 files changed, 4 insertions(+), 17 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts index d04ceaa73c2b..ea092f532e5a 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts @@ -641,10 +641,6 @@ &mdss_dsi0_phy { status = "okay"; }; -&pcie_1_phy_aux_clk { - clock-frequency = <1000>; -}; - &pcie0 { wake-gpios = <&tlmm 96 GPIO_ACTIVE_HIGH>; perst-gpios = <&tlmm 94 GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts index 4e94f7fe4d2d..bd87aa3aa548 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts @@ -835,10 +835,6 @@ &mdss_dp0_out { remote-endpoint = <&usb_dp_qmpphy_dp_in>; }; -&pcie_1_phy_aux_clk { - clock-frequency = <1000>; -}; - &pcie0 { wake-gpios = <&tlmm 96 GPIO_ACTIVE_HIGH>; perst-gpios = <&tlmm 94 GPIO_ACTIVE_LOW>; diff --git a/arch/arm64/boot/dts/qcom/sm8650.dtsi b/arch/arm64/boot/dts/qcom/sm8650.dtsi index 8e0c1841f748..658ad2b41c5a 100644 --- a/arch/arm64/boot/dts/qcom/sm8650.dtsi +++ b/arch/arm64/boot/dts/qcom/sm8650.dtsi @@ -60,11 +60,6 @@ bi_tcxo_ao_div2: bi-tcxo-ao-div2-clk { clock-mult = <1>; clock-div = <2>; }; - - pcie_1_phy_aux_clk: pcie-1-phy-aux-clk { - compatible = "fixed-clock"; - #clock-cells = <0>; - }; }; cpus { @@ -758,8 +753,8 @@ gcc: clock-controller@100000 { <&bi_tcxo_ao_div2>, <&sleep_clk>, <&pcie0_phy>, - <&pcie1_phy>, - <&pcie_1_phy_aux_clk>, + <&pcie1_phy QMP_PCIE_PIPE_CLK>, + <&pcie1_phy QMP_PCIE_PHY_AUX_CLK>, <&ufs_mem_phy 0>, <&ufs_mem_phy 1>, <&ufs_mem_phy 2>, @@ -2467,8 +2462,8 @@ pcie1_phy: phy@1c0e000 { power-domains = <&gcc PCIE_1_PHY_GDSC>; - #clock-cells = <0>; - clock-output-names = "pcie1_pipe_clk"; + #clock-cells = <1>; + clock-output-names = "pcie1_pipe_clk", "pcie1_phy_aux_clk"; #phy-cells = <0>;