From patchwork Wed Jun 14 07:15:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 692695 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 0CDEEEB64D9 for ; Wed, 14 Jun 2023 07:17:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234133AbjFNHRF (ORCPT ); Wed, 14 Jun 2023 03:17:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243454AbjFNHQ0 (ORCPT ); Wed, 14 Jun 2023 03:16:26 -0400 Received: from mo4-p01-ob.smtp.rzone.de (mo4-p01-ob.smtp.rzone.de [81.169.146.165]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A92101FD6; Wed, 14 Jun 2023 00:16:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686726977; cv=none; d=strato.com; s=strato-dkim-0002; b=Yd6xFIrgt8oo8FWpH6sxmqxA584pYs5ODxxpmfnI9tFV5sIpQrHm6yISEow5XN8YCE Nm4agIipW5oSKtqPjnoWqq5IxEAu4BdA8IYvsSMmLbXDOsUQMS7kzuM0YkLd7Fx04CYD 2oG8VSdfi8miHfncDfUZItubr8CQTsnNwqXQg1Qy2gqGunsTOaJPULZLgTnzM3PpRPpE B8MK402aL+aMEA1Y7r1YkGnwlaaP5UHLedSKNbjnTf7G9w9h7eePKCBiFIh9sURXEmam uINZvCirSYiDEyECm5sG9BdB02YwYDYc9mSEudCYY+VcNblEWZu+DyQEkl7YDCnTs8vQ pGKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1686726977; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=SnuT9mNjf2+O/dYCq7swKzDbiqXYWdUY1V2NxdDwNUs=; b=I1p1qNLwM1rjiZ+y8a6hwKE60oh3fzs17CTbNbI/Drh0ABHcq6mA6aXVE0rsvq+fim E8rZypr1S5iI2fKGm0kl1U2adWYQUw/fMjeBulEx90Z5sXHTeF9DnhsjTNUYaQO5lA48 R1TUgetnQ3dcxzD/hdDbH+cvoAUrOVuMSTpYdkyBR6qf/Eu7VgYaLJL9pHz5XqoNKcLO EIDl5+rHa2rwOj3+0Qw5twoeR6vcPDXqeuCgvHgNSupHXn7JKQ4HfaDgLm+H9XDTmZ92 MmSsTObPGz2Ro1dcmDpbYN940FGmGSebrqFJ+oQ3rTiRNw2qviYYPC2/XNi1HMA3apUH Ry2Q== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo01 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1686726977; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=SnuT9mNjf2+O/dYCq7swKzDbiqXYWdUY1V2NxdDwNUs=; b=PbUKfGwzVpPoLtoRM9dAxBYinZRYGLpxBuKEHdvmFEoGDnnpxt6lnU/W+nXJ6POGHv 8T+VPzGa7+n4+Hdka5bEbIpNJiyHSHBBkIHmtJAujZY4XDUyycWL9utjRgylRoR8++pE 7XUUg2VT2w3gFXRFAe76helMAJc+tpM+nlHhL+f4yHU8RmNSIncOIdKBFw9/UJ/OXzv8 1aHNk3y7r4z4q2SjXwfKTXBHMX7IY8vawGQmS4Nzs2PHzHe2VFFZJHfnLIxPJEOKrtLb fCzl7CNFUoqG1OXaNEioihy1F+7VlwvCRd5LTJhILeukbhBMI7Iv/U+FDxNLxy+VHlMz Y9QQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1686726977; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=SnuT9mNjf2+O/dYCq7swKzDbiqXYWdUY1V2NxdDwNUs=; b=DXiqCf05kcnSTsXUqiAnt/u7OhnpoC2IxAIC547HFddf7OSzWccliUP0vHublmDppi xYHlOCoyVXUYrpE/VpAw== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn8u4xxmw==" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.5.3 DYNA|AUTH) with ESMTPSA id Z82ec2z5E7GHb2c (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 14 Jun 2023 09:16:17 +0200 (CEST) From: Stephan Gerhold Date: Wed, 14 Jun 2023 09:15:59 +0200 Subject: [PATCH 1/8] arm64: dts: qcom: msm8939-pm8916: Add missing pm8916_codec supplies MIME-Version: 1.0 Message-Id: <20230530-msm8939-regulators-v1-1-a3c3ac833567@gerhold.net> References: <20230530-msm8939-regulators-v1-0-a3c3ac833567@gerhold.net> In-Reply-To: <20230530-msm8939-regulators-v1-0-a3c3ac833567@gerhold.net> To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Stephan Gerhold X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Update for recent changes to pm8916.dtsi in commit 38218822a72f ("arm64: dts: qcom: pm8916: Move default regulator "-supply"s") and add the now missing pm8916_codec supplies to msm8939-pm8916.dtsi as well. Signed-off-by: Stephan Gerhold --- arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi index 33e02f42f5e4..503c2dd5fe47 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi @@ -25,6 +25,12 @@ &mpss { pll-supply = <&pm8916_l7>; }; +&pm8916_codec { + vdd-cdc-io-supply = <&pm8916_l5>; + vdd-cdc-tx-rx-cx-supply = <&pm8916_l5>; + vdd-micbias-supply = <&pm8916_l13>; +}; + &rpm_requests { smd_rpm_regulators: regulators { compatible = "qcom,rpm-pm8916-regulators"; From patchwork Wed Jun 14 07:16:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 692692 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 74E04C001DD for ; Wed, 14 Jun 2023 07:17:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243313AbjFNHRM (ORCPT ); Wed, 14 Jun 2023 03:17:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243464AbjFNHQ2 (ORCPT ); Wed, 14 Jun 2023 03:16:28 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.84]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D5EE268A; Wed, 14 Jun 2023 00:16:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686726977; cv=none; d=strato.com; s=strato-dkim-0002; b=bEzKwn+50P4YOlrikEkWfuMJZQuy3ndxlaD2MNzus/io7TZDZKTcU2Oh0LEGh4zaBz SRwLwfTVYsS6DZmWPkVf5cEQsIietKXEdAekuMiM23TIft85bt2QB8HOs2J5ejApV3Dl rwnY6zLUF4ixxFSh2ony7SLk0+zUVANG6c+eDS1NrUxId5uJJEgNs+UxHNvQH416okzW JnxS9FtWqdndWjBlCvdKHBTHXuIduHgjtLo7rap5gQ0vNscu7W9VzwLaoK0H2H/ZoD4p 3EZMDcr+HMRwC1WIeyxHTMeM/0IyWVE2i1AATLxShHqIzI+FvEE390jZQ8EpZdHb0Rsq Eurg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1686726977; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=r7SgX1cnPFHFFUF629tLWSor9gaXRJcL/juQUpleFE8=; b=J0p+SwgOqKmEwyqBY8KrFOfLHtYspdF8yPwN2skhs+DO/tuXopvKdi0pH47TIPqJmI TOr5QnM1R1kOOw8EiN6I6xiWUB3qWeV+2QiAKkv//kaQIJ7pNMAlO0goRhtSj7ik3ToM NSDaTXGRXswl1ThYEY+9Qc/+s65lZaBy5K86t/6JdfMg18vtucq9xHHos+r3hJ3Uh+IS 45pH2Pqt1NtShoVPfhNuO36kdPpoqo3jtChXPlmVHLGkEefOXk1oVat1rA98zNII/znE +zYIC320ZzTRkj1DtrOKjfrxhm0elsfDwKm2bdY1RUzZw78oWPHmaE+4VveQJYLZ0bJM lcOg== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1686726977; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=r7SgX1cnPFHFFUF629tLWSor9gaXRJcL/juQUpleFE8=; b=ltpgPgSpQ4CJjhgYU8s+9v2xyEWoHKi4yW087gqKIzFL2ff0Cms+1Ez8tPs7ctvSaT xY/ytFnrB0QeixYtkm5wFD85tza477mZv0kG+ci4yniunm8CUOLtYP4bHLKAdvaTEUSk mNBPyFdQ8IMKMnKiX4n1++vHwCohoDWsUQHyuDtWLgEhb0jkgWZQSJ+uNvgptT2yACbj YWaI1NAU1ylWhpjkt0TN56LK7NbqiQthMQG3RBKSMpfj+/meG/bH/kwy4nANpzpKhyxk ayI5hBJB6M42d7HG8UrxlZHm+FAODQ3OHoUdX2FLPZQNNCZu0yBBPh8S6+PxkRfkVvfu rNFw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1686726977; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=r7SgX1cnPFHFFUF629tLWSor9gaXRJcL/juQUpleFE8=; b=V90qruhHNYzykL64jqlbBmawzvi66XRStgfYG5k7DtdFvc0L19iTXIpH8NNSsKGOam k1etbs1K0ocEXkFRWaBA== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn8u4xxmw==" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.5.3 DYNA|AUTH) with ESMTPSA id Z82ec2z5E7GHb2d (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 14 Jun 2023 09:16:17 +0200 (CEST) From: Stephan Gerhold Date: Wed, 14 Jun 2023 09:16:00 +0200 Subject: [PATCH 2/8] arm64: dts: qcom: msm8939: Disable lpass_codec by default MIME-Version: 1.0 Message-Id: <20230530-msm8939-regulators-v1-2-a3c3ac833567@gerhold.net> References: <20230530-msm8939-regulators-v1-0-a3c3ac833567@gerhold.net> In-Reply-To: <20230530-msm8939-regulators-v1-0-a3c3ac833567@gerhold.net> To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Stephan Gerhold X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Update for recent changes to msm8916.dtsi in commit a5cf21b14666 ("arm64: dts: qcom: msm8916: Disable audio codecs by default") and make lpass_codec disabled by default for devices that are not using the audio codec functionality inside MSM8939. Signed-off-by: Stephan Gerhold --- arch/arm64/boot/dts/qcom/apq8039-t2.dts | 4 ++++ arch/arm64/boot/dts/qcom/msm8939.dtsi | 1 + 2 files changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts index 2a39216ceef5..c8442242137a 100644 --- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts +++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts @@ -135,6 +135,10 @@ &lpass { status = "okay"; }; +&lpass_codec { + status = "okay"; +}; + &mdss { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939.dtsi b/arch/arm64/boot/dts/qcom/msm8939.dtsi index 3c1505b69a6b..895cafc11480 100644 --- a/arch/arm64/boot/dts/qcom/msm8939.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939.dtsi @@ -1608,6 +1608,7 @@ lpass_codec: audio-codec@771c000 { <&gcc GCC_CODEC_DIGCODEC_CLK>; clock-names = "ahbix-clk", "mclk"; #sound-dai-cells = <1>; + status = "disabled"; }; sdhc_1: mmc@7824900 { From patchwork Wed Jun 14 07:16:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 692694 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 A6B97EB64D9 for ; Wed, 14 Jun 2023 07:17:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234592AbjFNHRH (ORCPT ); Wed, 14 Jun 2023 03:17:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243462AbjFNHQ2 (ORCPT ); Wed, 14 Jun 2023 03:16:28 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.83]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3835F1FDD; Wed, 14 Jun 2023 00:16:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686726978; cv=none; d=strato.com; s=strato-dkim-0002; b=Ds9G89lxYkSZbNngFT2UU9u/oEkfYQNPTGRVABIg0mKoOekgoKoNgfjs+fDtALOmgQ R9UAkktWLnCIE9xZp/TsUafmVZQRDSgv76YHbRwWJtPEvY4jfknnJU79IFTNKlIH8MqJ 1+FDO66sXmY9TvYlWyLGkEe+UgIinyf89rbYg+U8GEjALveSYr+Q5I9VICehSXiXyXRS 4oYIyiai0gZKbHHNiI3wutLyOo6S4i9FrIrFacgpRgYL520kY6klrqcXNmsUdd7DW1oM +8X1exNW00yD2BAHJHcP7meGO4Eqph1iG+V0KmJ6QGyLdJeY4mVYNz9K03jJrG70eUAr wiog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1686726978; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=v8HUS+pZdhRpBsfa2DBFbPmZyCwAPxZBJXa80UK4EoA=; b=Zj5VJyjsJAYlu0SNJvBqCbABw9wRQeCeNuW+TlG9ypMg2pCi/RppYvsKbZ4JyqTL17 kExofKD2mrQgZSQxBU21L2YL02+/G9h/k0ypk/67soYpQ1gHxTHM4DULaPfBXLcGlAZC TQCUMEmLOXYtgYBJGrakDEf7k5PHirPnsel6K4WBpza1SH/ej4+H7PDPKEyV3wMRbnYu 83QyjSsYuu0FSZ3ExIaeQqntmwVBkFiB7GHYyYEanGQ1QNUC8g3PPl4eWHxMJ8mUTY7h 9XctjfZX68p+Lg9PGerOom5djrd6JcAwnt1gmqTgjAJXUFph/EQuyWd8EvPw98JE/Z0j gfEQ== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1686726978; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=v8HUS+pZdhRpBsfa2DBFbPmZyCwAPxZBJXa80UK4EoA=; b=QpdapDNpUVjlpgfLubLiG4XiqpnDFRRYfG2RlqmCz5qic2cdeQFLfyq1vUMrPraJfG 3mS8UAUU5LDPayeOA0rc6FU+z1OcZZzfvl3hoSS6oGOwEBMsOVwcgl398D3rmkJf0dRL IvQAyecI1yyWe5gm7rCxYPjadSu9CMxlTXOZz+NA4lOZTSwnpY7xqI0R6/e5ucjilqhy rlV69C97e/irRxYGjUGoBk47JPOeDpIBRA4xjP4cUitZDFcUmqTYb+eY2xapKCcsES1l 32CedLDQBh1Jy7J4SdgGeeRSHHvLs3Wlt0oFXWAzxXaNZnyioP3hfwbdj6BG9a2eNejB OStw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1686726978; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=v8HUS+pZdhRpBsfa2DBFbPmZyCwAPxZBJXa80UK4EoA=; b=gPU7OJBy/WyZyhF/LhtlyFTzuwYA4EhuL6vOvwhu/ElAbsdW3GXzH3zyGGaMtJY1tP IjAXXADKrlAvP5OMPoAQ== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn8u4xxmw==" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.5.3 DYNA|AUTH) with ESMTPSA id Z82ec2z5E7GHb2e (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 14 Jun 2023 09:16:17 +0200 (CEST) From: Stephan Gerhold Date: Wed, 14 Jun 2023 09:16:01 +0200 Subject: [PATCH 3/8] arm64: dts: qcom: msm8939-sony-tulip: Fix l10-l12 regulator voltages MIME-Version: 1.0 Message-Id: <20230530-msm8939-regulators-v1-3-a3c3ac833567@gerhold.net> References: <20230530-msm8939-regulators-v1-0-a3c3ac833567@gerhold.net> In-Reply-To: <20230530-msm8939-regulators-v1-0-a3c3ac833567@gerhold.net> To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Stephan Gerhold X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org msm8939-sony-xperia-kanuti-tulip.dts has several regulator voltages that do not quite seem to match what is used in the vendor kernel. In particular: - l10 is fixed at 2.8V [1, 2] - l11/l12 are 2.95V max [1] [1]: https://github.com/sonyxperiadev/kernel/blob/aosp/LA.BR.1.3.3_rb2.14/arch/arm/boot/dts/qcom/msm8939-regulator.dtsi [2]: https://github.com/sonyxperiadev/kernel/blob/aosp/LA.BR.1.3.3_rb2.14/arch/arm/boot/dts/qcom/msm8939-kanuti_tulip.dtsi#L671C1-L673 Fixes: f1134f738fad ("arm64: dts: qcom: Add msm8939 Sony Xperia M4 Aqua") Signed-off-by: Stephan Gerhold --- arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts index a9df8dab5481..dc5b8cd5b9f4 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts +++ b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts @@ -110,20 +110,20 @@ pm8916_l9: l9 { }; pm8916_l10: l10 { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; }; pm8916_l11: l11 { regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; + regulator-max-microvolt = <2950000>; regulator-system-load = <200000>; regulator-allow-set-load; }; pm8916_l12: l12 { regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; + regulator-max-microvolt = <2950000>; }; pm8916_l13: l13 { From patchwork Wed Jun 14 07:16:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 692693 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 13D6BEB64DD for ; Wed, 14 Jun 2023 07:17:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243141AbjFNHRK (ORCPT ); Wed, 14 Jun 2023 03:17:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38038 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243469AbjFNHQ3 (ORCPT ); Wed, 14 Jun 2023 03:16:29 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [85.215.255.80]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C5376268E; Wed, 14 Jun 2023 00:16:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686726978; cv=none; d=strato.com; s=strato-dkim-0002; b=EcE22T1SRQkJWwBvamYpD7K6oBeArzZaAA0KrfgBcbexFMw5bP3N9i3X8c7bV/fyFK V6cCsN4BonYNpcezaXhONh3tsO0NkYNYkFgU+03o1nlxC3Fyl84eUX24ZDy/nJz7OM7l Tna4ZmiOLD2lNOSQjaS9oD9c7Q+ZDq+IjI2V47zH0yr3UT0fLI+FdBAJIArgkuWXanZm haiqktXzCcFGKmziOlCJouVlCrIIWeB/ZheqmqggiA/8ftM2XaKA1pz8u2zGw8QWgxTZ mRvlMEtldcYe3OQeG9nVq9sVzv8GRncyFu8Xhx0TsR7O+S6NAZiYM/NMZvg6yvhuNlg+ t2vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1686726978; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=eAj6hVmQDmaa5jtLRmGV91szbVOhkquRc27tXxX5I7o=; b=W8Iq/InpT2nqSoyH47vH3wDXQ3jkGEIEq8iRZWVEw72OH7LGCX1mTIeMVQ4VQ5uI6D EcgW4GMO84TYJehqJRyzsNmkBh3YhFaSDbPHzyEKo0PGanxypd+PJ0l6TQ6M04chXvMg GhY9gXzioCWJAGpCCq8l2zxltyW99BLglbhO2OUSFfXwPHmoInn1fs3qmZey+51RB9mv 6FiIhb6YXAqYEcMJm5Ae2x1XphLiiWwEbyedaEQfchhAa33Ke6XetyBIjMmtjnBqDZRA 2tIbgdUBnrdeb+uwWHwZDoBPzUCFkgpXcYheCYOi13SkhDlsV5oF9M2rQrJe0aMD0Xtk RRvA== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1686726978; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=eAj6hVmQDmaa5jtLRmGV91szbVOhkquRc27tXxX5I7o=; b=EYYHHvZGHAXle8fbiaYjQ5p4AhjDD/vPqcCGPnH996yfm49UNZXdF8jKybpbHjhJPh kgxbVlN5INCBUTjHtXpO6TQsG55fhTYUvINBLudikPAnqN1n6ejVxcN7zLsUgAs5zZWB oJzGEfYnRMPAy0bbTgTKoAyVRmMauSyKx57m4L20CvKN8ZTdEr9GwYwwyvBNuTLQ+z00 YZEUeLVyzXGAbKMq7EDCYFSrDqXmbv3vVoYYeMkwdPhuPoyTK3g9VzIz33PZiJCV1Pv3 UMXKPx+aCeSTrj3zsABJWUasPf9tsc9u3FaEdLYYkp3r75m6+LDgIsORGOKv5C2jKNup V6EQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1686726978; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=eAj6hVmQDmaa5jtLRmGV91szbVOhkquRc27tXxX5I7o=; b=0LKYt3KzL1klfKmWt6U8X/1K9oHnqGUOHYdj/xG96CGTZkz2PW/EA59TmhWejfIcvO 1dvxdqXCxm/XdVU3WuCQ== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn8u4xxmw==" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.5.3 DYNA|AUTH) with ESMTPSA id Z82ec2z5E7GIb2g (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 14 Jun 2023 09:16:18 +0200 (CEST) From: Stephan Gerhold Date: Wed, 14 Jun 2023 09:16:03 +0200 Subject: [PATCH 5/8] arm64: dts: qcom: msm8939: Fix regulator constraints MIME-Version: 1.0 Message-Id: <20230530-msm8939-regulators-v1-5-a3c3ac833567@gerhold.net> References: <20230530-msm8939-regulators-v1-0-a3c3ac833567@gerhold.net> In-Reply-To: <20230530-msm8939-regulators-v1-0-a3c3ac833567@gerhold.net> To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Stephan Gerhold X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org The regulator constraints for the MSM8939 devices were originally taken from Qualcomm's msm-3.10 vendor device tree (for lack of better documentation). Unfortunately it turns out that Qualcomm's voltages are slightly off as well and do not match the voltage constraints applied by the RPM firmware. This means that we sometimes request a specific voltage but the RPM firmware actually applies a much lower or higher voltage. This is particularly critical for pm8916_l11 which is used as SD card VMMC regulator: The SD card can choose a voltage from the current range of 1.8 - 2.95V. If it chooses to run at 1.8V we pretend that this is fine but the RPM firmware will still silently end up configuring 2.95V. This can be easily reproduced with a multimeter or by checking the SPMI hardware registers of the regulator. Apply the same change as for MSM8916 in commit 355750828c55 ("arm64: dts: qcom: msm8916: Fix regulator constraints") and make the voltages match the actual "specified range" in the PM8916 Device Specification which is enforced by the RPM firmware. Signed-off-by: Stephan Gerhold --- arch/arm64/boot/dts/qcom/apq8039-t2.dts | 12 ++++++------ .../arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts index c8442242137a..ceae83b1480b 100644 --- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts +++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts @@ -164,13 +164,13 @@ &smd_rpm_regulators { vdd_l7-supply = <&pm8916_s4>; pm8916_s3: s3 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1300000>; + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1350000>; }; pm8916_s4: s4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2100000>; + regulator-min-microvolt = <1850000>; + regulator-max-microvolt = <2150000>; }; /* l1 is fixed to 1225000, but not connected in schematic */ @@ -201,7 +201,7 @@ pm8916_l7: l7 { }; pm8916_l8: l8 { - regulator-min-microvolt = <2850000>; + regulator-min-microvolt = <2900000>; regulator-max-microvolt = <2900000>; }; @@ -216,7 +216,7 @@ pm8916_l10: l10 { }; pm8916_l11: l11 { - regulator-min-microvolt = <1800000>; + regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts index 509abcdad287..2905dd8d4bf9 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts +++ b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts @@ -64,13 +64,13 @@ &smd_rpm_regulators { vdd_l7-supply = <&pm8916_s4>; pm8916_s3: s3 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1300000>; + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1350000>; }; pm8916_s4: s4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2100000>; + regulator-min-microvolt = <1850000>; + regulator-max-microvolt = <2150000>; }; pm8916_l2: l2 { @@ -99,7 +99,7 @@ pm8916_l7: l7 { }; pm8916_l8: l8 { - regulator-min-microvolt = <2850000>; + regulator-min-microvolt = <2900000>; regulator-max-microvolt = <2900000>; }; @@ -114,7 +114,7 @@ pm8916_l10: l10 { }; pm8916_l11: l11 { - regulator-min-microvolt = <1800000>; + regulator-min-microvolt = <2950000>; regulator-max-microvolt = <2950000>; regulator-system-load = <200000>; regulator-allow-set-load; From patchwork Wed Jun 14 07:16:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephan Gerhold X-Patchwork-Id: 692691 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 E564AC04A6A for ; Wed, 14 Jun 2023 07:17:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243327AbjFNHRO (ORCPT ); Wed, 14 Jun 2023 03:17:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38174 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243139AbjFNHQf (ORCPT ); Wed, 14 Jun 2023 03:16:35 -0400 Received: from mo4-p02-ob.smtp.rzone.de (mo4-p02-ob.smtp.rzone.de [81.169.146.170]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ED3092693; Wed, 14 Jun 2023 00:16:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686726979; cv=none; d=strato.com; s=strato-dkim-0002; b=iwL1ubNluX9p1lXtdbK++kLGzzjqaAPbdWwMj0ITOAp+jjmyDW9SqNlJSnBohlACbM DFhZJvbpGVc8YjA35c8wHrgc0CRZ/1DloPZ9WT0ZzSo0tW/AipaiKmTdpklWJWF9G1mC NL9lR3p9jviKtrfYNXwERUbmoJOxTfJZaRA/YCchwc7r270vdWewFXX4EU0Ywtzaelts DtaVxrPxjtb/WR3WRCF3ZN7rKlU24kyJ1WNszX/ywzAJ1CqI9hYJymV9UAXIux6irdwk iEhbtbDcdQ1pSsUcxYK88otoXA3pnpA370EwvewmiymntjPTv7T5hBEuBhHH5SOjMJKh 11NQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; t=1686726979; s=strato-dkim-0002; d=strato.com; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=uGcBvgux5Z42TfLlC6oP/lRzzRra2rIpJSo5SSIQARE=; b=QAyd7ml+X7KA6UR95iJRUNmhlo2OPsP21rId1ZWxNTQWIq0BBxoRgWUgzU4A+KUWa/ pawbeoqOfJLdmi7HT4SdAHLzKPU/avyOJnrNo7LsqTzb50qJSaLk23WMzgqaUTrPQHu3 b6+YpMHedqW7gxAY2vP0f8A6UCLo9cZo4uUMHrSCYpGAwmNMT+3nlqbDn3SKTnXf+q2M u1dldNQINKXnAlaADqZ//3AZd6BIuvGU3NJOruPdibR2p+QJHYHSSc4vocXWhWKyYcSz G+dBfnjIdBPU5OnEY5QtL9ww6fcV7N/P2i4dxDLmKzIRiSqOiYR6utpm06GTu7Q6Mn32 CrKg== ARC-Authentication-Results: i=1; strato.com; arc=none; dkim=none X-RZG-CLASS-ID: mo02 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; t=1686726979; s=strato-dkim-0002; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=uGcBvgux5Z42TfLlC6oP/lRzzRra2rIpJSo5SSIQARE=; b=jTybxx3kx2G+HjXjwbWFjt+Fj5qSSU2nU1aCFlFfVRfsSZkuWx1g3DmE+NwHiOIqYS X1I87ncP0YsXvNjzw1wdghBJz6TFfXlbJJNSqB57a2RjdEZNS6JLC4NKtitzrS5mr83Q 7dgFqqeDpZY/0DXkN1oS640yguqwI7P+qXttxdVVcK06bR04bd2PyQbOyoU/U+zg46s2 uUPx/noUNmcg9J9Y5Jb40iIj0kfebrtsXzaTqbBx33nFu8HdgStRNyg4RSp7UIHBk01a d6/+exd/xO+3xQPYnAuVFl5N7+oxmbAjLhXtOhvOixUZG6S9hCKfax0sOGPPcB2EkQE7 nqAw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; t=1686726979; s=strato-dkim-0003; d=gerhold.net; h=Cc:To:In-Reply-To:References:Message-Id:Subject:Date:From:Cc:Date: From:Subject:Sender; bh=uGcBvgux5Z42TfLlC6oP/lRzzRra2rIpJSo5SSIQARE=; b=wWEWAC6+dfatXLxehGDeTDodApVJH/1Mqe59rISM+bdC7n3DGGRppxHEtYoaQqYo41 y95MHMybR3UpiXcQfVDg== X-RZG-AUTH: ":P3gBZUipdd93FF5ZZvYFPugejmSTVR2nRPhVOQjVd4CteZ/7jYgS+mLFY+H0JAn8u4xxmw==" Received: from [192.168.244.3] by smtp.strato.de (RZmta 49.5.3 DYNA|AUTH) with ESMTPSA id Z82ec2z5E7GIb2i (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate); Wed, 14 Jun 2023 09:16:18 +0200 (CEST) From: Stephan Gerhold Date: Wed, 14 Jun 2023 09:16:05 +0200 Subject: [PATCH 7/8] arm64: dts: qcom: msm8939: Define regulator constraints next to usage MIME-Version: 1.0 Message-Id: <20230530-msm8939-regulators-v1-7-a3c3ac833567@gerhold.net> References: <20230530-msm8939-regulators-v1-0-a3c3ac833567@gerhold.net> In-Reply-To: <20230530-msm8939-regulators-v1-0-a3c3ac833567@gerhold.net> To: Bjorn Andersson Cc: Andy Gross , Konrad Dybcio , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Bryan O'Donoghue , Stephan Gerhold X-Mailer: b4 0.12.2 Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Right now each MSM8939 device has a huge block of regulator constraints with allowed voltages for each regulator. For lack of better documentation these voltages are often copied as-is from the vendor device tree, without much extra thought. Unfortunately, the voltages in the vendor device trees are often misleading or even wrong, e.g. because: - There is a large voltage range allowed and the actual voltage is only set somewhere hidden in some messy vendor driver. This is often the case for pm8916_{l14,l15,l16} because they have a broad range of 1.8-3.3V by default. - The voltage is actually wrong but thanks to the voltage constraints in the RPM firmware it still ends up applying the correct voltage. To have proper regulator constraints it is important to review them in context of the usage. The current setup in the MSM8939 device trees makes this quite hard because each device duplicates the standard voltages for components of the SoC and mixes those with minor device-specific additions and dummy voltages for completely unused regulators. The actual usage of the regulators for the SoC components is in msm8939-pm8916.dtsi, so it can and should also define the related voltage constraints. These are not board-specific but defined in the MSM8939/PM8916 specification. There is no documentation available for MSM8939 but in practice it's almost identical to MSM8916. Note that this commit does not make any functional change. All used regulators still have the same regulator constraints as before. Unused regulators do not have regulator constraints anymore because most of these were too broad or even entirely wrong. They should be added back with proper voltage constraints when there is an actual usage. The same changes were already made for MSM8916 in commit b0a8f16ae4a0 ("arm64: dts: qcom: msm8916: Define regulator constraints next to usage"). Signed-off-by: Stephan Gerhold --- arch/arm64/boot/dts/qcom/apq8039-t2.dts | 98 -------------------- arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi | 100 ++++++++++++++++----- .../dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts | 98 -------------------- 3 files changed, 80 insertions(+), 216 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/apq8039-t2.dts b/arch/arm64/boot/dts/qcom/apq8039-t2.dts index ceae83b1480b..40644c242fb7 100644 --- a/arch/arm64/boot/dts/qcom/apq8039-t2.dts +++ b/arch/arm64/boot/dts/qcom/apq8039-t2.dts @@ -158,104 +158,6 @@ &pm8916_gpios { "PM_GPIO4"; }; -&smd_rpm_regulators { - vdd_l1_l2_l3-supply = <&pm8916_s3>; - vdd_l4_l5_l6-supply = <&pm8916_s4>; - vdd_l7-supply = <&pm8916_s4>; - - pm8916_s3: s3 { - regulator-min-microvolt = <1250000>; - regulator-max-microvolt = <1350000>; - }; - - pm8916_s4: s4 { - regulator-min-microvolt = <1850000>; - regulator-max-microvolt = <2150000>; - }; - - /* l1 is fixed to 1225000, but not connected in schematic */ - - pm8916_l2: l2 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - }; - - pm8916_l4: l4 { - regulator-min-microvolt = <2050000>; - regulator-max-microvolt = <2050000>; - }; - - pm8916_l5: l5 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pm8916_l6: l6 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pm8916_l7: l7 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pm8916_l8: l8 { - regulator-min-microvolt = <2900000>; - regulator-max-microvolt = <2900000>; - }; - - pm8916_l9: l9 { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - pm8916_l10: l10 { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - pm8916_l11: l11 { - regulator-min-microvolt = <2950000>; - regulator-max-microvolt = <2950000>; - }; - - pm8916_l12: l12 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2950000>; - }; - - pm8916_l13: l13 { - regulator-min-microvolt = <3075000>; - regulator-max-microvolt = <3075000>; - }; - - pm8916_l14: l14 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - }; - - pm8916_l15: l15 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - }; - - pm8916_l16: l16 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - }; - - pm8916_l17: l17 { - regulator-min-microvolt = <2850000>; - regulator-max-microvolt = <2850000>; - }; - - pm8916_l18: l18 { - regulator-min-microvolt = <2700000>; - regulator-max-microvolt = <2700000>; - }; -}; - &sdhc_1 { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi index 3bede1a23603..12538211bc72 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8939-pm8916.dtsi @@ -40,32 +40,92 @@ &pm8916_codec { }; &rpm_requests { - smd_rpm_regulators: regulators { + pm8916_rpm_regulators: regulators { compatible = "qcom,rpm-pm8916-regulators"; + vdd_l1_l2_l3-supply = <&pm8916_s3>; + vdd_l4_l5_l6-supply = <&pm8916_s4>; + vdd_l7-supply = <&pm8916_s4>; /* pm8916_s1 is managed by rpmpd (MSM8939_VDDMDCX) */ /* pm8916_s2 is managed by rpmpd (MSM8939_VDDCX) */ - pm8916_s3: s3 {}; - pm8916_s4: s4 {}; + pm8916_s3: s3 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1350000>; + }; + pm8916_s4: s4 { + regulator-min-microvolt = <1850000>; + regulator-max-microvolt = <2150000>; + }; + + /* + * Some of the regulators are unused or managed by another + * processor (e.g. the modem). We should still define nodes for + * them to ensure the vote from the application processor can be + * dropped in case the regulators are already on during boot. + * + * The labels for these nodes are omitted on purpose because + * boards should configure a proper voltage before using them. + */ + l1 {}; + + pm8916_l2: l2 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + }; - pm8916_l1: l1 {}; - pm8916_l2: l2 {}; /* pm8916_l3 is managed by rpmpd (MSM8939_VDDMX) */ - pm8916_l4: l4 {}; - pm8916_l5: l5 {}; - pm8916_l6: l6 {}; - pm8916_l7: l7 {}; - pm8916_l8: l8 {}; - pm8916_l9: l9 {}; - pm8916_l10: l10 {}; - pm8916_l11: l11 {}; - pm8916_l12: l12 {}; - pm8916_l13: l13 {}; - pm8916_l14: l14 {}; - pm8916_l15: l15 {}; - pm8916_l16: l16 {}; - pm8916_l17: l17 {}; - pm8916_l18: l18 {}; + + l4 {}; + + pm8916_l5: l5 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8916_l6: l6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8916_l7: l7 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8916_l8: l8 { + regulator-min-microvolt = <2900000>; + regulator-max-microvolt = <2900000>; + }; + + pm8916_l9: l9 { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + }; + + l10 {}; + + pm8916_l11: l11 { + regulator-min-microvolt = <2950000>; + regulator-max-microvolt = <2950000>; + regulator-allow-set-load; + regulator-system-load = <200000>; + }; + + pm8916_l12: l12 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2950000>; + }; + + pm8916_l13: l13 { + regulator-min-microvolt = <3075000>; + regulator-max-microvolt = <3075000>; + }; + + l14 {}; + l15 {}; + l16 {}; + l17 {}; + l18 {}; }; }; diff --git a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts index 2905dd8d4bf9..8613cf93dac5 100644 --- a/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts +++ b/arch/arm64/boot/dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts @@ -58,104 +58,6 @@ usb_id_default: usb-id-default-state { }; }; -&smd_rpm_regulators { - vdd_l1_l2_l3-supply = <&pm8916_s3>; - vdd_l4_l5_l6-supply = <&pm8916_s4>; - vdd_l7-supply = <&pm8916_s4>; - - pm8916_s3: s3 { - regulator-min-microvolt = <1250000>; - regulator-max-microvolt = <1350000>; - }; - - pm8916_s4: s4 { - regulator-min-microvolt = <1850000>; - regulator-max-microvolt = <2150000>; - }; - - pm8916_l2: l2 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - }; - - pm8916_l4: l4 { - regulator-min-microvolt = <2050000>; - regulator-max-microvolt = <2050000>; - }; - - pm8916_l5: l5 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pm8916_l6: l6 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pm8916_l7: l7 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pm8916_l8: l8 { - regulator-min-microvolt = <2900000>; - regulator-max-microvolt = <2900000>; - }; - - pm8916_l9: l9 { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - pm8916_l10: l10 { - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2800000>; - }; - - pm8916_l11: l11 { - regulator-min-microvolt = <2950000>; - regulator-max-microvolt = <2950000>; - regulator-system-load = <200000>; - regulator-allow-set-load; - }; - - pm8916_l12: l12 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2950000>; - }; - - pm8916_l13: l13 { - regulator-min-microvolt = <3075000>; - regulator-max-microvolt = <3075000>; - }; - - pm8916_l14: l14 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - }; - - pm8916_l15: l15 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - }; - - pm8916_l16: l16 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - }; - - pm8916_l17: l17 { - regulator-min-microvolt = <2850000>; - regulator-max-microvolt = <2850000>; - }; - - pm8916_l18: l18 { - regulator-min-microvolt = <2700000>; - regulator-max-microvolt = <2700000>; - }; -}; - &sdhc_1 { status = "okay"; };