From patchwork Wed Jul 12 14:24:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: p.paillet@foss.st.com X-Patchwork-Id: 119228 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1201367vqm; Wed, 12 Jul 2023 07:47:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlFGO1rkwpo2lBSj/F4oJQfEChRZwk4It+N8OypP18jKcX2lyIlbGoujOECKFUJlpj2uCoLw X-Received: by 2002:a05:6512:3703:b0:4f8:7697:5207 with SMTP id z3-20020a056512370300b004f876975207mr12907815lfr.23.1689173221501; Wed, 12 Jul 2023 07:47:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689173221; cv=none; d=google.com; s=arc-20160816; b=mBctpfdh4elE51N6BIMfA+EMtbcKxw3/9DNqHsyPX6lzcGg+SB58J2qYTx+MhF90Jm HsdX/mJR9oHuQh4L02YmyD1JN0gAPJSQHJzoFIw2DAbt96EvCPgX6grj3h1ZYk0s0gEL XT1wjkgulOEqQGR/fR96IqAUEFFb8jTjRCLIFE6ATfKSAXQPCY1ZN/5JMlzWDETt7WhJ GpEoec9lRi3PomYtLvus7714QLOMZkP40eRn1Lk6vlT7eiL++zQ1ZOHmoedDs3hyuxaA 0ItLc6xWAQrwLgF+yBXeVR8gEmyFlDYZ3mRPcvuyhSkHCCTENADUBWu6HWmwOaqO6a4P c4eg== 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=tf52zjVbeZ9FyRb7xOYnVur943iT9URER5nDBPNhnZM=; fh=6UK39DZUibLO7FLoztLrDTRdT62TQPJinZ0fGeEKGK8=; b=IR8cBi741mOhd4F1mYacXICDIzjEyljmlaQphEfOTY/7nslcUjo3pHsm09oTnR/r9L tm7HLffRy9XUcQ0/dfDZTXH1AWV3/7bjhAmxgs2VaRJ+fK1lNy1dNS5AmfjrqQcDAYC+ +jZUyEOYWEx/cs7EZQBfdZcQTVlhHkf0edn3XwUfFRX3Q4I+B5eJCUwNotdrjehhIYhi KSQnA81ExPm4D5Us4P24gM/coUiqEsg3m8B/ZTDtfKwrfyugtsU1iBAG/PuV5r6pOlew bYnBhMbtkZ/zYscI9FeSmFpolJgx6oAIEMKwZKYGTtbO6Wt0QIGmqqEwtb9dxmSQTBkH uizA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@foss.st.com header.s=selector1 header.b=eMV3sUk9; 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=foss.st.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p7-20020a056402074700b0051dd1c4b760si4897132edy.630.2023.07.12.07.46.37; Wed, 12 Jul 2023 07:47:01 -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=@foss.st.com header.s=selector1 header.b=eMV3sUk9; 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=foss.st.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233216AbjGLOZw (ORCPT + 99 others); Wed, 12 Jul 2023 10:25:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232432AbjGLOZb (ORCPT ); Wed, 12 Jul 2023 10:25:31 -0400 Received: from mx07-00178001.pphosted.com (mx07-00178001.pphosted.com [185.132.182.106]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93FD71998; Wed, 12 Jul 2023 07:25:21 -0700 (PDT) Received: from pps.filterd (m0241204.ppops.net [127.0.0.1]) by mx07-00178001.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 36CCt4ES013152; Wed, 12 Jul 2023 16:24:39 +0200 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foss.st.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=selector1; bh=tf52zjVbeZ9FyRb7xOYnVur943iT9URER5nDBPNhnZM=; b=eMV3sUk9lrxX7s8pxd5xoEY9O0Gz34Zw6D4zWd6dKo6wyDZlLvERoctn9xHd1AQQ/CYL RIyv/Atfz0e2sSMjPBWuANfKadIDbtbQmHqUoS/gPl/ioQG1K6YwTsyZgMYTMHCYkQg6 Y78BHvg232myCIZ8AgafjLLfWfqCcAbBtH253/6Qmij1JFte+o7eoLyRAmKt9FV0NIYj rqbrUuMA7ux4G9csgynuYr/z7O77aFxpXbmQb1XRRRNm/Cx3pYkBlj4vIFRkA27qo6qG Uv1eMoHM1449I89l6Nw2mp/ZsjR0HxCQ5DFG0csdkXieT05FOPLZfR1n6CQdrt0RD3MQ tg== Received: from beta.dmz-eu.st.com (beta.dmz-eu.st.com [164.129.1.35]) by mx07-00178001.pphosted.com (PPS) with ESMTPS id 3rss5j28wv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Jul 2023 16:24:39 +0200 Received: from euls16034.sgp.st.com (euls16034.sgp.st.com [10.75.44.20]) by beta.dmz-eu.st.com (STMicroelectronics) with ESMTP id 108B810005B; Wed, 12 Jul 2023 16:24:39 +0200 (CEST) Received: from Webmail-eu.st.com (shfdag1node2.st.com [10.75.129.70]) by euls16034.sgp.st.com (STMicroelectronics) with ESMTP id 074B021BF65; Wed, 12 Jul 2023 16:24:39 +0200 (CEST) Received: from localhost (10.252.136.3) by SHFDAG1NODE2.st.com (10.75.129.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21; Wed, 12 Jul 2023 16:24:38 +0200 From: To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Maxime Coquelin , Alexandre Torgue , Russell King , Liam Girdwood , Mark Brown , Arnd Bergmann , Claudiu Beznea , Greg Kroah-Hartman , Fabrice Gasnier , Alexander Stein , Geert Uytterhoeven , , , , CC: , Etienne Carriere Subject: [PATCH 3/4] ARM: dts: stm32: add SCMI PMIC regulators on stm32mp135f-dk board Date: Wed, 12 Jul 2023 16:24:31 +0200 Message-ID: <20230712142432.1885162-4-p.paillet@foss.st.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230712142432.1885162-1-p.paillet@foss.st.com> References: <20230712142432.1885162-1-p.paillet@foss.st.com> MIME-Version: 1.0 X-Originating-IP: [10.252.136.3] X-ClientProxiedBy: EQNCAS1NODE4.st.com (10.75.129.82) To SHFDAG1NODE2.st.com (10.75.129.70) X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.205,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-07-12_09,2023-07-11_01,2023-05-22_02 X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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: INBOX X-GMAIL-THRID: 1771226499967057216 X-GMAIL-MSGID: 1771226499967057216 From: Etienne Carriere Since OP-TEE release tag 3.22.0, OP-TEE SCMI service for STM32MP13x SoC family exposes PMIC voltage regulators. This change defines them in the platform DTS file and removes the fixed regulators that were previously defined to abstract them before OP-TEE firmware was ready. Signed-off-by: Etienne Carriere Signed-off-by: Pascal Paillet --- arch/arm/boot/dts/st/stm32mp135f-dk.dts | 68 +++++++++++-------------- 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/arch/arm/boot/dts/st/stm32mp135f-dk.dts b/arch/arm/boot/dts/st/stm32mp135f-dk.dts index f0900ca672b5..eea740d097c7 100644 --- a/arch/arm/boot/dts/st/stm32mp135f-dk.dts +++ b/arch/arm/boot/dts/st/stm32mp135f-dk.dts @@ -9,6 +9,7 @@ #include #include #include +#include #include "stm32mp135.dtsi" #include "stm32mp13xf.dtsi" #include "stm32mp13-pinctrl.dtsi" @@ -65,45 +66,13 @@ led-blue { default-state = "off"; }; }; - - v3v3_sw: v3v3-sw { - compatible = "regulator-fixed"; - regulator-name = "v3v3_sw"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - vdd_adc: vdd-adc { - compatible = "regulator-fixed"; - regulator-name = "vdd_adc"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; - - vdd_sd: vdd-sd { - compatible = "regulator-fixed"; - regulator-name = "vdd_sd"; - regulator-min-microvolt = <2900000>; - regulator-max-microvolt = <2900000>; - regulator-always-on; - }; - - vdd_usb: vdd-usb { - compatible = "regulator-fixed"; - regulator-name = "vdd_usb"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-always-on; - }; }; &adc_1 { pinctrl-names = "default"; pinctrl-0 = <&adc1_usb_cc_pins_a>; - vdda-supply = <&vdd_adc>; - vref-supply = <&vdd_adc>; + vdda-supply = <&scmi_vdd_adc>; + vref-supply = <&scmi_vdd_adc>; status = "okay"; adc1: adc@0 { status = "okay"; @@ -195,6 +164,29 @@ &rtc { status = "okay"; }; +&scmi_regu { + scmi_vdd_adc: regulator@10 { + reg = ; + regulator-name = "vdd_adc"; + }; + scmi_vdd_usb: regulator@13 { + reg = ; + regulator-name = "vdd_usb"; + }; + scmi_vdd_sd: regulator@14 { + reg = ; + regulator-name = "vdd_sd"; + }; + scmi_v1v8_periph: regulator@15 { + reg = ; + regulator-name = "v1v8_periph"; + }; + scmi_v3v3_sw: regulator@19 { + reg = ; + regulator-name = "v3v3_sw"; + }; +}; + &sdmmc1 { pinctrl-names = "default", "opendrain", "sleep"; pinctrl-0 = <&sdmmc1_b4_pins_a &sdmmc1_clk_pins_a>; @@ -204,7 +196,7 @@ &sdmmc1 { disable-wp; st,neg-edge; bus-width = <4>; - vmmc-supply = <&vdd_sd>; + vmmc-supply = <&scmi_vdd_sd>; status = "okay"; }; @@ -321,7 +313,7 @@ &usbh_ehci { hub@1 { compatible = "usb424,2514"; reg = <1>; - vdd-supply = <&v3v3_sw>; + vdd-supply = <&scmi_v3v3_sw>; }; }; @@ -342,7 +334,7 @@ &usbphyc { }; &usbphyc_port0 { - phy-supply = <&vdd_usb>; + phy-supply = <&scmi_vdd_usb>; st,current-boost-microamp = <1000>; st,decrease-hs-slew-rate; st,tune-hs-dc-level = <2>; @@ -356,7 +348,7 @@ &usbphyc_port0 { }; &usbphyc_port1 { - phy-supply = <&vdd_usb>; + phy-supply = <&scmi_vdd_usb>; st,current-boost-microamp = <1000>; st,decrease-hs-slew-rate; st,tune-hs-dc-level = <2>;