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=-21.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 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 B579EC432BE for ; Mon, 26 Jul 2021 08:16:50 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7F67C60BBB for ; Mon, 26 Jul 2021 08:16:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7F67C60BBB Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=hisilicon.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:References:Subject:CC:To: MIME-Version:From:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=TBj+ctft9CKNrYvHlxUl0dNBSPIWflDEvZv/0qwWVUc=; b=4p2ji0rMTod+b3 5lnLmkgbigZWxR5anNLohOhTgc/gW6NVA71dkXus2WIuph85UYQ6fFiABTtMjXjIrsW0dCKzapaBR T2CCFH5JS7x9PZaohBZlUDoozAEOG046KZ3+wW/DPZ1vWUbdp37gQpyhA1GBhPm1761T7jiWPeklH X2wVHEuz9aIdkh5A/sZZnufjmEalpb2BXBNVBqIXFEaKtUifT1LxXwPIbgOphQcahgrkPgwCkkmCe ik5egu9B8EBs02GLSO5b9rtrF/RwM0vVZSu0peH1JVC5d1XlDuDiQBAGZcwhdNzDv8Eewa0SLdtPq YRKMxeGMJ9BU1IKdAKkQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m7vgh-00A6M5-7u; Mon, 26 Jul 2021 08:10:11 +0000 Received: from szxga01-in.huawei.com ([45.249.212.187]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m7vgc-00A6KQ-3g for linux-arm-kernel@lists.infradead.org; Mon, 26 Jul 2021 08:10:08 +0000 Received: from dggeme758-chm.china.huawei.com (unknown [172.30.72.55]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4GYCDs0lYvzZsrC; Mon, 26 Jul 2021 16:06:37 +0800 (CST) Received: from [10.40.166.221] (10.40.166.221) by dggeme758-chm.china.huawei.com (10.3.19.104) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2176.2; Mon, 26 Jul 2021 16:10:03 +0800 Message-ID: <60FE6DDA.8080904@hisilicon.com> Date: Mon, 26 Jul 2021 16:10:02 +0800 From: Wei Xu User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Mauro Carvalho Chehab , Greg Kroah-Hartman CC: , , Rob Herring , Rob Herring , , , , "xuwei (O)" Subject: Re: [PATCH 1/2] dts: hisilicon: add support for the PMIC found on Hikey 970 References: <4a3583dd683512c2a4a138e88d4c889e51bf48e8.1627116285.git.mchehab+huawei@kernel.org> <60FE20AC.3050400@hisilicon.com> <20210726081812.54431189@coco.lan> <60FE57B5.2010603@hisilicon.com> <20210726094344.0a415bd0@coco.lan> In-Reply-To: <20210726094344.0a415bd0@coco.lan> X-Originating-IP: [10.40.166.221] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To dggeme758-chm.china.huawei.com (10.3.19.104) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210726_011006_565356_36B98EB2 X-CRM114-Status: GOOD ( 27.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Mauro, On 2021/7/26 15:43, Mauro Carvalho Chehab wrote: > Em Mon, 26 Jul 2021 14:35:33 +0800 > Wei Xu escreveu: > >> Hi Mauro, >> >> On 2021/7/26 14:19, Mauro Carvalho Chehab wrote: >>> Em Mon, 26 Jul 2021 10:40:44 +0800 >>> Wei Xu escreveu: >>> >>>> Hi Mauro, >>>> >>>> On 2021/7/24 16:55, Mauro Carvalho Chehab wrote: >>>>> 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. >>>>> >>>>> Signed-off-by: Mauro Carvalho Chehab >>>>> --- >>>>> .../boot/dts/hisilicon/hi3670-hikey970.dts | 22 +---- >>>>> .../boot/dts/hisilicon/hikey970-pmic.dtsi | 86 +++++++++++++++++++ >>>>> 2 files changed, 89 insertions(+), 19 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/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"; >>>> >>>> Should this be "hisilicon,hi6421-pmic" which is already in the binding document "mfd/hi6421.txt"? >>>> Others are OK to me. >>> >>> No. >>> >>> hisilicon,hi6421-pmic is used by this driver >>> drivers/mfd/hi6421-pmic-core.c >>> >>> which provides support for the Hi6421 variants that don't use a MIPI >>> SPMI bus. >>> >>> The "hisilicon,hi6421-spmi" compatible is for the new driver: >>> drivers/mfd/hi6421-spmi-pmic.c >>> >>> And it is defined at: >>> Documentation/devicetree/bindings/mfd/hisilicon,hi6421-spmi-pmic.yaml >>> >>> Both DT bindings and the driver were promoted from staging on this patch: >>> >>> https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git/commit/?h=staging-next&id=9bd9e0de1cf5b89c4854be505ac0a418ddcc01bf >> >> Got it. Thanks for your kind explanation! >> So I am fine with this patch. >> Do you need my ack now or later I can merge it once it is out of staging. > > Whatever works best for you and Greg. > > It should be noticed that the driver should be out of staging for v5.15-rc1 > (as the patch moving it out of staging was already merged at Greg's tree). > This patch is needed by the PCI driver patchset I'm currently working, > so the best would be if this patch could also be merged for v5.15-rc1 > (either via HiSilicon tree or via staging tree). > > I suspect that having your ack and merging this via staging would work > best, as this would ensure that both changes will be merged upstream > at the same time. > > But, as I said, it is up to you both ;-) Got it. To avoid dependency, I think it is better to be merged by Greg's tree. So for this patch, Reviewed-by: Wei Xu Best Regards, Wei > > Thanks, > Mauro > . > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel