From patchwork Fri Nov 4 09:20:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 15432 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp271463wru; Fri, 4 Nov 2022 02:22:36 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6PAdVra/dyQLydim+BkJ7UI1lRXOJpjUuAEYtR3fBtwcOZzPuU5A37+mnEF/Zm1ya0lpDg X-Received: by 2002:a17:907:6d03:b0:782:abba:936c with SMTP id sa3-20020a1709076d0300b00782abba936cmr33491438ejc.758.1667553756073; Fri, 04 Nov 2022 02:22:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1667553756; cv=none; d=google.com; s=arc-20160816; b=m+tw0+puQcH6BJjm1SyoGSgImLBQoDy1muWMt9zYAcNYJVHCxv6scZU7uJYuCS+wIV xBbzkyYfLAgR9T+G86zkjc4VrH8mkmG2Fc+vjyrP6fSXw/l8GMpjtJfqJRYT0Wp08/au eBHcy725WjIuZbAs6wSUd7WueyFI8H2nJf7CGSlron0rMM4glM7BaLtn1hnxluye4jnh rNZ2LU22GdARWLBGPIZ/EYLw8IrlfsrYnOkRwr6MkbmTXFI1xyYe0YYWuKdMePTy9BU5 XcYczMz6cznVEg/sI7SBGMGv1SXCGJISm4bE+ZUCGeFe/Hv0+VW7VGVm+eL5DjT+igvF EdRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=R6c5wQnLBT8Rx2H/SAtiH1HQfHfwhnVUnsC/m3VahZo=; b=fIN2vnmlbYsOGrOjwVzxbc0W3YZqJO3E1dpwvDx2hl4acPYbJ3qtTNTlSvmqmD9G7O AGVJeFJoYVdp8YP5+dRuqNLKIKARzcfRBGRbZJhmE7e/qh4uxUODEnVecILJihfXeNsV H+3oC25ZFIqJL4JI2fuHSo+s3zrbBjWA1wKR8MyJYdCPErOToNWl8a10HfbKg0d7NslD gRFaOa0Zxt26l4NMyew/WKp8ZcxtnXs9rxQDYeUUYFojVxjtFqmoTUURFniKs+0BjLmU sTq0BnFIFUVLfQbZ/cBO3/ibmvrI+yzfXNSaR8sQwlWc7+gtc26ZxqsSMhQWHBwZZS4Q iUYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YfPn9BjA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i5-20020a1709064fc500b0078356aaeb63si3847242ejw.288.2022.11.04.02.22.12; Fri, 04 Nov 2022 02:22:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YfPn9BjA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231356AbiKDJVU (ORCPT + 99 others); Fri, 4 Nov 2022 05:21:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229572AbiKDJVR (ORCPT ); Fri, 4 Nov 2022 05:21:17 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6EEB0248DB; Fri, 4 Nov 2022 02:21:15 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 07D6D6202C; Fri, 4 Nov 2022 09:21:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D70DC433D7; Fri, 4 Nov 2022 09:21:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1667553674; bh=JiGW3IovHz7nDy/fwgLDO/2d+ZpNIFbV/Xo9gEkjrPc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YfPn9BjAdbYNYQMQD54Z00EzH3XFq9a6iYx9SEbkRxNXL6zouY5Dc6kq3rtCVRX2+ a5gAtPn0adnxG6DD7VXBrqY7TvoumMSV002oqka5m1cQ1lHy2BMscI8Q6FidArS6bU voArok4ngCRjAirPqGO8x5W+56xXm9beZVUxTb14/J3vA4OaV3N7PC9ZdLOuYcZjxo xD3ufEKRiklObg6j8x3MwvG10H2G3cB4efCfkW4Y3mJpUxFQjUzAYguTL5gTCKNoan vheehfXafk9g5eqktjU0Ptgu19LiB0bxvyG7YKZ1PF0CUBKGz339p9+tLTng4fIzXb pWeXV3ASlGLXQ== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1oqssi-0004XZ-Ii; Fri, 04 Nov 2022 10:20:56 +0100 From: Johan Hovold To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Brian Masney , Shazad Hussain , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , stable@vger.kernel.org Subject: [PATCH 1/2] arm64: dts: qcom: sc8280xp: fix UFS reference clocks Date: Fri, 4 Nov 2022 10:20:44 +0100 Message-Id: <20221104092045.17410-2-johan+linaro@kernel.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221104092045.17410-1-johan+linaro@kernel.org> References: <20221104092045.17410-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1748556847397789771?= X-GMAIL-MSGID: =?utf-8?q?1748556847397789771?= There are three UFS reference clocks on SC8280XP which are used as follows: - The GCC_UFS_REF_CLKREF_CLK clock is fed to any UFS device connected to either controller. - The GCC_UFS_1_CARD_CLKREF_CLK and GCC_UFS_CARD_CLKREF_CLK clocks provide reference clocks to the two PHYs. Note that this depends on first updating the clock driver to reflect that all three clocks are sourced from CXO. Specifically, the UFS controller driver expects the device reference clock to have a valid frequency: ufshcd-qcom 1d84000.ufs: invalid ref_clk setting = 0 Fixes: 152d1faf1e2f ("arm64: dts: qcom: add SC8280XP platform") Fixes: 8d6b458ce6e9 ("arm64: dts: qcom: sc8280xp: fix ufs_card_phy ref clock") Fixes: f3aa975e230e ("arm64: dts: qcom: sc8280xp: correct ref clock for ufs_mem_phy") Link: https://lore.kernel.org/lkml/Y2OEjNAPXg5BfOxH@hovoldconsulting.com/ Cc: stable@vger.kernel.org # 5.20 Signed-off-by: Johan Hovold Reviewed-by: Konrad Dybcio Reviewed-by: Brian Masney --- arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi index 21ac119e0382..e0d0fb6994b5 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc8280xp.dtsi @@ -912,7 +912,7 @@ ufs_mem_hc: ufs@1d84000 { <&gcc GCC_AGGRE_UFS_PHY_AXI_CLK>, <&gcc GCC_UFS_PHY_AHB_CLK>, <&gcc GCC_UFS_PHY_UNIPRO_CORE_CLK>, - <&rpmhcc RPMH_CXO_CLK>, + <&gcc GCC_UFS_REF_CLKREF_CLK>, <&gcc GCC_UFS_PHY_TX_SYMBOL_0_CLK>, <&gcc GCC_UFS_PHY_RX_SYMBOL_0_CLK>, <&gcc GCC_UFS_PHY_RX_SYMBOL_1_CLK>; @@ -943,7 +943,7 @@ ufs_mem_phy: phy@1d87000 { ranges; clock-names = "ref", "ref_aux"; - clocks = <&gcc GCC_UFS_REF_CLKREF_CLK>, + clocks = <&gcc GCC_UFS_CARD_CLKREF_CLK>, <&gcc GCC_UFS_PHY_PHY_AUX_CLK>; resets = <&ufs_mem_hc 0>; @@ -980,7 +980,7 @@ ufs_card_hc: ufs@1da4000 { <&gcc GCC_AGGRE_UFS_CARD_AXI_CLK>, <&gcc GCC_UFS_CARD_AHB_CLK>, <&gcc GCC_UFS_CARD_UNIPRO_CORE_CLK>, - <&rpmhcc RPMH_CXO_CLK>, + <&gcc GCC_UFS_REF_CLKREF_CLK>, <&gcc GCC_UFS_CARD_TX_SYMBOL_0_CLK>, <&gcc GCC_UFS_CARD_RX_SYMBOL_0_CLK>, <&gcc GCC_UFS_CARD_RX_SYMBOL_1_CLK>; @@ -1011,7 +1011,7 @@ ufs_card_phy: phy@1da7000 { ranges; clock-names = "ref", "ref_aux"; - clocks = <&gcc GCC_UFS_REF_CLKREF_CLK>, + clocks = <&gcc GCC_UFS_1_CARD_CLKREF_CLK>, <&gcc GCC_UFS_CARD_PHY_AUX_CLK>; resets = <&ufs_card_hc 0>;