From patchwork Mon Oct 2 12:30:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luca Weiss X-Patchwork-Id: 147298 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1430826vqb; Mon, 2 Oct 2023 06:34:16 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHTB4vdByVAST6QAFOnTeWUnS0FQ4m4QNER48tvVAd7OjVOxawtu4uY5cWiT5y7OQBCFOp6 X-Received: by 2002:a17:90a:c685:b0:269:5adb:993 with SMTP id n5-20020a17090ac68500b002695adb0993mr8229824pjt.22.1696253656332; Mon, 02 Oct 2023 06:34:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696253656; cv=none; d=google.com; s=arc-20160816; b=PEzUo+JONniCHd4Cv5hs0R1AghOpHkB93J/ZqAQb9XMkd/LTWW8c5BR/PaW4nZxMx+ GT5HdoVkNeHD+dmUyl48qvHREjs7I35EWtKIWSf2POGAPI7MmjhLUjGQJ2E1JtVp+pXr l48oUjCH21G1Hh51ImNrlTxWc8OdoG/CXA1imQSddXnpEJyiUqv/hboyEF6vcOCjkqQe ujIb3hLBjZDssPwnEcrEKoO1GPORh5EbEI+qBMuLG2H/+qYp39JSr+Voxh+YNhLE0dXK LRGch+6tFSDRW0YZsL48srlexVFTBjXJ0bCaGPkVomx9LhK+EeuiPSiBgMttrpqhm284 kxfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=oUM3IeGYooZNDk2CRvBMQ1vJndezulmjEoPqwHgdaxM=; fh=mAkaAvjB0SXoFW6sNljxTK8epzq/Hp+7ss9k9NC2v60=; b=jtN00vzGY/qPBHb6q0ixJGJa8VkxOKIYuw3Hm+Kn/1ANbpLP+43anDLH9opgWY1nrL ZNqTS6vnM2VGm3JgLmgUYjq3rYuXAyPflnq6cfbM5pPafVUkYh9Ujgcz12Rc1/WuzmZb E+ZCovu1UYFx5qTb5LOUDAXPExm5QWqiLE92cInSbf5xpxy2ICq24ago2IdJgw0oohbn lW3wegqOSkie3KEv5aQN80gQuYI4gZ+fsOt+7y84TKBS7L7v4oawGrsPwxQ0MjQYCvcO fFhu6UE9qA8YP1wYO+lcNI+x0mCXCRqkl4nDgLYex2TSb4zskFVkPcq4i0nWM85YBgbQ mGjg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=R94eh1WO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id t186-20020a6381c3000000b005859c6d691dsi8192929pgd.895.2023.10.02.06.34.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 06:34:16 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@fairphone.com header.s=fair header.b=R94eh1WO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fairphone.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 613F580732B4; Mon, 2 Oct 2023 05:31:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237075AbjJBMa4 (ORCPT + 18 others); Mon, 2 Oct 2023 08:30:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50056 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236982AbjJBMay (ORCPT ); Mon, 2 Oct 2023 08:30:54 -0400 Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07C68AD for ; Mon, 2 Oct 2023 05:30:50 -0700 (PDT) Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-9b64b98656bso113028366b.0 for ; Mon, 02 Oct 2023 05:30:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fairphone.com; s=fair; t=1696249848; x=1696854648; darn=vger.kernel.org; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:from:to:cc:subject:date:message-id:reply-to; bh=oUM3IeGYooZNDk2CRvBMQ1vJndezulmjEoPqwHgdaxM=; b=R94eh1WOYcJB04MPrp/P9ViOr1A4TlCCMpTY3PY+1NqMs2lOPuoqyI4Cq320h2C/VQ QpYfQbyzfjA70Z/kKgjiTbs/cVzUOOTa5JhRXQ5nltQ4LlNjVWbOkc+VsBU9IQOVaqV5 qazyByFrY2IvTMPMxIjwcXc5W48idpV0oP9enPh0GHi4qgpRQ0bQLZc4o3plN+fI9K4I 1z+9Eb41cKGXFRbAqwAQYLvN/BvcSGVyFCMJyGTAT92VRZLrU1wVa5ZlMav6ifRKDuyt YioKWAFBfTNegKoyqGSZkWQvT+Af18AIG8PHiGEUMKxxHILfqfYkD90/dPYH5+t73T+j EGRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696249848; x=1696854648; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=oUM3IeGYooZNDk2CRvBMQ1vJndezulmjEoPqwHgdaxM=; b=u8J9K94E1yuWR3qiOKkjUNnQkQXXXnPOLJAwBf56RgJd6YAQG/okPGMUHE96K9AMSS 1FrNcyJHiCmEIWvVXiLzz1CI/kb7ntvv4qYBqAI7sTzu1lXsyggsCcuY8fI6widjQzAX J/uegYtESE6ffOqgDJ7RHxumPgqDF6dwosl1D+ORhgRGKiZ3azZjEvmqMzXAolx6Bdln o4p04ISza/cBXjVIeaTos1TFWUu+jc58aQdf2OHnd9ct8DKfE7suUXNfYW5rt9JItWh4 RWkBElRs6aNZVKMelNZyFa7ZSDa8hEzIMns+hPO9MHKRQaZLScvz1GN0nWtAQYwtcEnZ NmnQ== X-Gm-Message-State: AOJu0Yzwl5ifKu6k8/DR6xCZA3EnlOkc4gbtcsLYLbS1HGmorx1dliYt 97gQACkikgLb5NNya3DyIcFCGx/yRjiHYKLdn8X7aw== X-Received: by 2002:a17:907:75d9:b0:9b2:7148:dd5e with SMTP id jl25-20020a17090775d900b009b27148dd5emr10317571ejc.16.1696249848444; Mon, 02 Oct 2023 05:30:48 -0700 (PDT) Received: from otso.luca.vpn.lucaweiss.eu (144-178-202-138.static.ef-service.nl. [144.178.202.138]) by smtp.gmail.com with ESMTPSA id gx10-20020a170906f1ca00b0099cb349d570sm16957197ejb.185.2023.10.02.05.30.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 05:30:47 -0700 (PDT) From: Luca Weiss Date: Mon, 02 Oct 2023 14:30:41 +0200 Subject: [PATCH v2] arm64: dts: qcom: qcm6490-fairphone-fp5: Enable UFS MIME-Version: 1.0 Message-Id: <20231002-fp5-ufs-v2-1-e2d7de522134@fairphone.com> X-B4-Tracking: v=1; b=H4sIAPC3GmUC/2WMQQ7CIBBFr9LMWgyM1Ygr72G6QBxkFgIBJW0a7 i52a/7q/by8FQplpgKXYYVMlQvH0AF3A1hvwpMEPzoDSjxIjVq4dBQfVwShlYTKSDUidDtlcjx vpdvU2XN5x7xs4ap+73+jKtGHqEdFeL7L09UZzsnHQHsbXzC11r4zB49NogAAAA== To: Andy Gross , Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Nitin Rawat Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Luca Weiss X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 02 Oct 2023 05:31:17 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778650874072284337 X-GMAIL-MSGID: 1778650874072284337 Enable the UFS phy and controller so that we can access the internal storage of the phone. At the same time we need to bump the minimum voltage used for UFS VCC, otherwise it doesn't initialize properly. The 2.952V is taken from the vcc-voltage-level property downstream. See also the following link for more information about the VCCQ/VCCQ2: https://gerrit-public.fairphone.software/plugins/gitiles/kernel/msm-extra/devicetree/+/1590a3739e7dc29d2597307881553236d492f188/fp5/yupik-idp-pm7250b.dtsi#207 Signed-off-by: Luca Weiss Reviewed-by: Konrad Dybcio --- Depends on: https://lore.kernel.org/linux-arm-msm/20230927081858.15961-1-quic_nitirawa@quicinc.com/ --- Changes in v2: - Constrain UFS voltage to only 2.952V - Link to v1: https://lore.kernel.org/r/20230929-fp5-ufs-v1-1-122941e28b06@fairphone.com --- arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 27 ++++++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) --- base-commit: d85348daa4407216e47198ed35a43a66883edab6 change-id: 20230929-fp5-ufs-e2c0e21a0142 Best regards, diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts index 2de0b8c26c35..762c5db29520 100644 --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts @@ -182,8 +182,9 @@ vreg_l6b: ldo6 { }; vreg_l7b: ldo7 { - regulator-min-microvolt = <2400000>; - regulator-max-microvolt = <3544000>; + /* Constrained for UFS VCC, at least until UFS driver scales voltage */ + regulator-min-microvolt = <2952000>; + regulator-max-microvolt = <2952000>; regulator-initial-mode = ; }; @@ -632,6 +633,28 @@ bluetooth: bluetooth { }; }; +&ufs_mem_hc { + reset-gpios = <&tlmm 175 GPIO_ACTIVE_LOW>; + + vcc-supply = <&vreg_l7b>; + vcc-max-microamp = <800000>; + /* + * Technically l9b enables an eLDO (supplied by s1b) which then powers + * VCCQ2 of the UFS. + */ + vccq-supply = <&vreg_l9b>; + vccq-max-microamp = <900000>; + + status = "okay"; +}; + +&ufs_mem_phy { + vdda-phy-supply = <&vreg_l10c>; + vdda-pll-supply = <&vreg_l6b>; + + status = "okay"; +}; + &usb_1 { status = "okay"; };