From patchwork Sat Dec 10 14:09:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13070362 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 727E6C4332F for ; Sat, 10 Dec 2022 15:42:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229655AbiLJPmC (ORCPT ); Sat, 10 Dec 2022 10:42:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229568AbiLJPmA (ORCPT ); Sat, 10 Dec 2022 10:42:00 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 71DC714090 for ; Sat, 10 Dec 2022 07:41:59 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id e13so7010494edj.7 for ; Sat, 10 Dec 2022 07:41:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=K3CkQrIxpcKZmpNzno1f/XqJw/g2MsuKc2yDZ3HQ1+Q=; b=W227L6KzcAYmrjGuU4Ve0Ec0FdrlLVq4GdTMmyDQacgEpLQqgpYOZq/3GB7AqNNjZV hT9CPQ77bnb+Yoa+jI1ox0OhGjhinY3XR4Eb00gtcXc0ZEIrsiDCQGKsqUDD4iUAHH6P rx26ML5w70ZqmAgb6XNPIdmk1RJPnpTVv410WWtJYQG/mU9mdQ+8Ojm08XJPerTY4VHy TbunGmTuPae+E67rvJRFLjZCaD4Wr2Rnu9LsKtjPk/FQupuxbz5Y+SS7MhMVmYpE0s7e V/w2Kfo75QRHHtOshdsoWzObO1ZEdnKTSs63DkvgMnT0vrLLFGpxl0w0WQLdjqR1zSUl Cv1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=K3CkQrIxpcKZmpNzno1f/XqJw/g2MsuKc2yDZ3HQ1+Q=; b=4Fm5AM4+ahQiQmX8W/Zt+dJK6ZXCC8uYxyvzAtrJ+sQb2OjZbTYtZwWIlsVLOACru9 8n5VhEFCDppHdMUTHKIAUh7PEZJwLpGAa3bSTZuLjcacxLzUq5LJikQltjRdcF758+Q4 99v4UMmqQkMfwEKvLVjXnqirlWjnxFBLzCjZBkPRK45kkOvfeCuGBAqtDfVkq9La7ORS AVSZbw6Xm6a0wa7hvPgujnl7v2HKmoO86PSKOSXKiu3auwVDdRc43TOlTn7sDEXavoK6 S8uRE+RMS4SZerIqFBf6vWCrTdEaiKSMEEgzSzLMWVJ/QM1S3TkQT+9chW5YzeAeaLU7 Ivdw== X-Gm-Message-State: ANoB5pn3W7CG5UcwXGQtW71gexTvkY3cK2nIOsowKdJKRjtwKGM3lWku bxDe0qQZYnSmDxhuOlPCdmGxbbubHVPJCyph X-Google-Smtp-Source: AA0mqf7tgUvEUG2vCMK38KjGFgMT6DDo+K4JgmplI2XtNPVkh9E6U28H7mgimecBcPqhfng4BsXrKQ== X-Received: by 2002:a05:6512:3050:b0:4b5:1545:222b with SMTP id b16-20020a056512305000b004b51545222bmr3368018lfb.47.1670681404294; Sat, 10 Dec 2022 06:10:04 -0800 (PST) Received: from localhost.localdomain (abxh44.neoplus.adsl.tpnet.pl. [83.9.1.44]) by smtp.gmail.com with ESMTPSA id bf38-20020a05651225a600b004b5901b8011sm734857lfb.105.2022.12.10.06.10.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Dec 2022 06:10:03 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: patches@linaro.org, Konrad Dybcio , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] arm64: dts: qcom: msm8996-tone: Enable SDHCI1 Date: Sat, 10 Dec 2022 15:09:59 +0100 Message-Id: <20221210141000.14344-1-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org With the recent patch that allowed us to reset the SDHCI controller from Linux, things started working properly. Enable SDHCI1, and by extension eMMC. Also, remove the now-useless cmdline SDHCI quirks. Signed-off-by: Konrad Dybcio Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi index dec361b93cce..c9be32b81d36 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi @@ -24,11 +24,7 @@ / { qcom,board-id = <8 0>; chosen { - /* - * Due to an unknown-for-a-few-years regression, - * SDHCI only works on MSM8996 in PIO (lame) mode. - */ - bootargs = "sdhci.debug_quirks=0x40 sdhci.debug_quirks2=0x4 maxcpus=2"; + bootargs = "maxcpus=2"; }; reserved-memory { @@ -825,8 +821,7 @@ pm8994_l32: l32 { }; &sdhc1 { - /* eMMC doesn't seem to cooperate even in PIO mode.. */ - status = "disabled"; + status = "okay"; vmmc-supply = <&pm8994_l20>; vqmmc-supply = <&pm8994_s4>; From patchwork Sat Dec 10 14:10:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 13070360 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9269FC4332F for ; Sat, 10 Dec 2022 15:34:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229656AbiLJPeq (ORCPT ); Sat, 10 Dec 2022 10:34:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33744 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229475AbiLJPep (ORCPT ); Sat, 10 Dec 2022 10:34:45 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6064DC77B for ; Sat, 10 Dec 2022 07:34:44 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id p13-20020a05600c468d00b003cf8859ed1bso1842567wmo.1 for ; Sat, 10 Dec 2022 07:34:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Gdfh0K5pQc5eYfucsnL5ACF2m5gK2MnXNNuw4hKO/+M=; b=NGhzzGwEOX5S7B4TeZbxukX50t2dcEDsu98zuTqsYTuYzyZ599lljIkI3WM6MvNA3K hCjr9znXK3BZReG2TJmLxG4OB+06AQIf3AJZDmWZ3CHZNLDLIE3yr1PcLPlvO8m2ygWW cBaF1yT+R1ia5cT2EnSG1D5F02otev5Ott5ghl+wRlIwj7H9pNMDz84sS1cJVqChuGXQ jKUTGphaa0bD2ockGwW9jwBRGTT9Xo0qLWYZaffNE8XvE1bf7wMsfsFLnhVz84eaCGoY scjyTRrkIywkJNGuVWCWsgoPHZjwOxCWWWDsUuJwk+Hjq6602f9Jr1pH2NUuNIEniuS9 UhMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=Gdfh0K5pQc5eYfucsnL5ACF2m5gK2MnXNNuw4hKO/+M=; b=fiVXgeABIDumMmnNI1T+a/o8jcthcEkg0XApHPkwVlsNVN2EMsDeKaIbVbf2ikUzSq N1dM4FBQBFqyofW30qAwjkn7IFftwgq4NrFSpd7EdNEUdW5muSMFJtOobwXDLWvJ2hYU 1XduwIgG1sRbIcbDOxGBMRCCrSsL7m4GQqSCLlHTGpI8Pp8taISzYB9T7B93aV0rcNJ+ 7pM9Z+6e0OYWGrA5WFni1hpYpn56irYfQZqvQxjW/ceCtaIv+8wh2sq9CoKr5Ee8x1cQ g2OJ2lFq/mJxoBhovgmEFo7wPN0Fg3W9uEDe0YtIWPGTq+SXGQ13KaP8imBdrmbIkdi1 c45g== X-Gm-Message-State: ANoB5plaz9quIwe8CKh1QP/sBu6CFwRFZvSmilJQ/1wE/xQhs5KrpJAL rjElOZmwJ2pnylS/ifC/0du9IvpdbF3O0hPx X-Google-Smtp-Source: AA0mqf5viKBsPqGxdaGh8HrMk7K9dL/2SPOWimdfKUCYTDO0+XEgz2WfLtFeI4l+hev5dF3Zmm72Xg== X-Received: by 2002:a05:6512:2c85:b0:4a4:68b8:f4d9 with SMTP id dw5-20020a0565122c8500b004a468b8f4d9mr2907512lfb.31.1670681406060; Sat, 10 Dec 2022 06:10:06 -0800 (PST) Received: from localhost.localdomain (abxh44.neoplus.adsl.tpnet.pl. [83.9.1.44]) by smtp.gmail.com with ESMTPSA id bf38-20020a05651225a600b004b5901b8011sm734857lfb.105.2022.12.10.06.10.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Dec 2022 06:10:05 -0800 (PST) From: Konrad Dybcio To: linux-arm-msm@vger.kernel.org, andersson@kernel.org, agross@kernel.org, krzysztof.kozlowski@linaro.org Cc: patches@linaro.org, Konrad Dybcio , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] arm64: dts: qcom: msm8996-tone: Move status last Date: Sat, 10 Dec 2022 15:10:00 +0100 Message-Id: <20221210141000.14344-2-konrad.dybcio@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221210141000.14344-1-konrad.dybcio@linaro.org> References: <20221210141000.14344-1-konrad.dybcio@linaro.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Align the style with other boards. Signed-off-by: Konrad Dybcio --- .../dts/qcom/msm8996-sony-xperia-tone.dtsi | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi index c9be32b81d36..40b28489d3f5 100644 --- a/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi @@ -100,8 +100,8 @@ wlan_en: wlan-en-1-8v { }; &blsp1_i2c3 { - status = "okay"; clock-frequency = <355000>; + status = "okay"; tof_sensor: vl53l0x@29 { compatible = "st,vl53l0x"; @@ -114,15 +114,15 @@ &blsp1_uart2 { }; &blsp2_i2c5 { - status = "okay"; clock-frequency = <355000>; + status = "okay"; /* FUSB301 USB-C controller */ }; &blsp2_i2c6 { - status = "okay"; clock-frequency = <355000>; + status = "okay"; synaptics@2c { compatible = "syna,rmi4-i2c"; @@ -179,11 +179,10 @@ &camera2_rst { }; &hsusb_phy1 { - status = "okay"; - vdd-supply = <&pm8994_l28>; vdda-pll-supply = <&pm8994_l12>; vdda-phy-dpdm-supply = <&pm8994_l24>; + status = "okay"; }; &mmcc { @@ -191,18 +190,17 @@ &mmcc { }; &pcie0 { - status = "okay"; perst-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>; wake-gpios = <&tlmm 37 GPIO_ACTIVE_HIGH>; vddpe-3v3-supply = <&wlan_en>; vdda-supply = <&pm8994_l28>; + status = "okay"; }; &pcie_phy { - status = "okay"; - vdda-phy-supply = <&pm8994_l28>; vdda-pll-supply = <&pm8994_l12>; + status = "okay"; }; &pm8994_gpios { @@ -474,8 +472,8 @@ rf-id-mpp-pins { }; &pm8994_resin { - status = "okay"; linux,code = ; + status = "okay"; }; &pmi8994_gpios { @@ -619,9 +617,9 @@ pmi8994_s2: s2 { }; &pmi8994_wled { - status = "okay"; default-brightness = <512>; qcom,num-strings = <3>; + status = "okay"; }; &rpm_requests { @@ -821,20 +819,18 @@ pm8994_l32: l32 { }; &sdhc1 { - status = "okay"; - vmmc-supply = <&pm8994_l20>; vqmmc-supply = <&pm8994_s4>; mmc-hs400-1_8v; mmc-hs200-1_8v; + status = "okay"; }; &sdhc2 { - status = "okay"; - cd-gpios = <&tlmm 40 GPIO_ACTIVE_HIGH>; vmmc-supply = <&pm8994_l21>; vqmmc-supply = <&pm8994_l13>; + status = "okay"; }; &tlmm { @@ -943,8 +939,8 @@ touch_int_sleep: touch-int-sleep-state { * 6 minutes to wake up (nothing interesting in kernel logs), but then it works as it should. */ &usb3 { - status = "okay"; qcom,select-utmi-as-pipe-clk; + status = "okay"; }; &usb3_dwc3 {