From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_2 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A730CC433FE for ; Wed, 15 Sep 2021 12:51:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8E18B61186 for ; Wed, 15 Sep 2021 12:51:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233513AbhIOMwz (ORCPT ); Wed, 15 Sep 2021 08:52:55 -0400 Received: from mail.kernel.org ([198.145.29.99]:32892 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233139AbhIOMwx (ORCPT ); Wed, 15 Sep 2021 08:52:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id B796F600CD; Wed, 15 Sep 2021 12:51:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1631710295; bh=R2mEq52Tws4xcSHD4WedZOvyM/BuVJ85S/qpuGRFFEc=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=MVea30ZE5V+VQRC7xofSAiJUssHu1pKS/CPbmc3UblKwEtG70dkeFJ4HwtpF7cbaI XJN6tf5hkOsC4GZ124698NSU4i0oLRnB2I+NH02nmy+MT74Wnaeq7pspGbc4ab+RKb Udaq3AskbqaJe77dr6JKr0mbR7qRI7sr2tX5bw1/aqtY8aDokp0R3DxlV+WKg4hZqb Chlhc34G6yDAt19Obd3ITGTxZO7DRLBc/ss25OUlqoNa96TF19JFzdfQOn+Pi29eVv XHeL0lz57Ped+SSCnyHOUZyHSivYkRxarCzOgCPhzAEtUVmHypi56lwBm/EdIeQBb/ RcI0ROPq6k8aw== Date: Wed, 15 Sep 2021 14:51:31 +0200 From: Mauro Carvalho Chehab To: Wei Xu Cc: linuxarm@huawei.com, mauro.chehab@huawei.com, Rob Herring , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 1/2] arm64: dts: hisilicon: Add support for Hikey 970 PMIC Message-ID: <20210915145131.265502f6@coco.lan> In-Reply-To: <75bd73dc3a1a7a8d08eab60d4aab34e5feb2a000.1630583382.git.mchehab+huawei@kernel.org> References: <75bd73dc3a1a7a8d08eab60d4aab34e5feb2a000.1630583382.git.mchehab+huawei@kernel.org> X-Mailer: Claws Mail 4.0.0 (GTK+ 3.24.30; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Thu, 2 Sep 2021 13:55:23 +0200 Mauro Carvalho Chehab escreveu: > Add a device tree for the HiSilicon 6421v600 SPMI PMIC, used > on HiKey970 board. > > As we now have support for it, change the fixed regulators > used by the SD I/O to use the proper LDO supplies. Hi Wei, Gentile ping. Now that the drivers and the DT schema are already upstreamed, could you please merge those two patches? Thank you! Mauro > > Signed-off-by: Mauro Carvalho Chehab > --- > .../boot/dts/hisilicon/hi3670-hikey970.dts | 22 +---- > arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 2 +- > .../boot/dts/hisilicon/hikey970-pmic.dtsi | 86 +++++++++++++++++++ > 3 files changed, 90 insertions(+), 20 deletions(-) > create mode 100644 arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi > > diff --git a/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts b/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts > index d8abf442ee7e..7c32f5fd5cc5 100644 > --- a/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts > +++ b/arch/arm64/boot/dts/hisilicon/hi3670-hikey970.dts > @@ -12,6 +12,7 @@ > > #include "hi3670.dtsi" > #include "hikey970-pinctrl.dtsi" > +#include "hikey970-pmic.dtsi" > > / { > model = "HiKey970"; > @@ -39,23 +40,6 @@ memory@0 { > reg = <0x0 0x0 0x0 0x0>; > }; > > - sd_1v8: regulator-1v8 { > - compatible = "regulator-fixed"; > - regulator-name = "fixed-1.8V"; > - regulator-min-microvolt = <1800000>; > - regulator-max-microvolt = <1800000>; > - regulator-always-on; > - }; > - > - sd_3v3: regulator-3v3 { > - compatible = "regulator-fixed"; > - regulator-name = "fixed-3.3V"; > - regulator-min-microvolt = <3300000>; > - regulator-max-microvolt = <3300000>; > - regulator-boot-on; > - regulator-always-on; > - }; > - > wlan_en: wlan-en-1-8v { > compatible = "regulator-fixed"; > regulator-name = "wlan-en-regulator"; > @@ -402,8 +386,8 @@ &dwmmc1 { > pinctrl-0 = <&sd_pmx_func > &sd_clk_cfg_func > &sd_cfg_func>; > - vmmc-supply = <&sd_3v3>; > - vqmmc-supply = <&sd_1v8>; > + vmmc-supply = <&ldo16>; > + vqmmc-supply = <&ldo9>; > status = "okay"; > }; > > diff --git a/arch/arm64/boot/dts/hisilicon/hi3670.dtsi b/arch/arm64/boot/dts/hisilicon/hi3670.dtsi > index 20698cfd0637..636c8817df7e 100644 > --- a/arch/arm64/boot/dts/hisilicon/hi3670.dtsi > +++ b/arch/arm64/boot/dts/hisilicon/hi3670.dtsi > @@ -669,7 +669,7 @@ ufs: ufs@ff3c0000 { > interrupt-parent = <&gic>; > interrupts = ; > clocks = <&crg_ctrl HI3670_CLK_GATE_UFSIO_REF>, > - <&crg_ctrl HI3670_CLK_GATE_UFS_SUBSYS>; > + <&crg_ctrl HI3670_CLK_GATE_UFS_SUBSYS>; > clock-names = "ref_clk", "phy_clk"; > freq-table-hz = <0 0 > 0 0>; > diff --git a/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi b/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi > new file mode 100644 > index 000000000000..970047f2dabd > --- /dev/null > +++ b/arch/arm64/boot/dts/hisilicon/hikey970-pmic.dtsi > @@ -0,0 +1,86 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * dts file for Hi6421v600 SPMI PMIC used at the HiKey970 Development Board > + * > + * Copyright (C) 2020, Huawei Tech. Co., Ltd. > + */ > + > +#include > + > +/ { > + spmi: spmi@fff24000 { > + compatible = "hisilicon,kirin970-spmi-controller"; > + #address-cells = <2>; > + #size-cells = <0>; > + status = "okay"; > + reg = <0x0 0xfff24000 0x0 0x1000>; > + hisilicon,spmi-channel = <2>; > + > + pmic: pmic@0 { > + compatible = "hisilicon,hi6421-spmi"; > + reg = <0 SPMI_USID>; > + > + #interrupt-cells = <2>; > + interrupt-controller; > + gpios = <&gpio28 0 0>; > + > + regulators { > + #address-cells = <1>; > + #size-cells = <0>; > + > + ldo3: ldo3 { /* HDMI */ > + regulator-name = "ldo3"; > + regulator-min-microvolt = <1500000>; > + regulator-max-microvolt = <2000000>; > + regulator-boot-on; > + }; > + > + ldo4: ldo4 { /* 40 PIN */ > + regulator-name = "ldo4"; > + regulator-min-microvolt = <1725000>; > + regulator-max-microvolt = <1900000>; > + regulator-boot-on; > + }; > + > + ldo9: ldo9 { /* SDCARD I/O */ > + regulator-name = "ldo9"; > + regulator-min-microvolt = <1750000>; > + regulator-max-microvolt = <3300000>; > + regulator-boot-on; > + }; > + > + ldo15: ldo15 { /* UFS */ > + regulator-name = "ldo15"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3000000>; > + regulator-always-on; > + }; > + > + ldo16: ldo16 { /* SD */ > + regulator-name = "ldo16"; > + regulator-min-microvolt = <1800000>; > + regulator-max-microvolt = <3000000>; > + regulator-boot-on; > + }; > + > + ldo17: ldo17 { /* USB HUB */ > + regulator-name = "ldo17"; > + regulator-min-microvolt = <2500000>; > + regulator-max-microvolt = <3300000>; > + }; > + > + ldo33: ldo33 { /* PEX8606 */ > + regulator-name = "ldo33"; > + regulator-min-microvolt = <2500000>; > + regulator-max-microvolt = <3300000>; > + }; > + > + ldo34: ldo34 { /* GPS AUX IN VDD */ > + regulator-name = "ldo34"; > + regulator-min-microvolt = <2600000>; > + regulator-max-microvolt = <3300000>; > + }; > + }; > + }; > + }; > +}; Thanks, Mauro