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=-13.7 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 6E818C1B0E3 for ; Tue, 8 Dec 2020 09:26:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3D4B023A31 for ; Tue, 8 Dec 2020 09:26:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728937AbgLHJ0f convert rfc822-to-8bit (ORCPT ); Tue, 8 Dec 2020 04:26:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728946AbgLHJ03 (ORCPT ); Tue, 8 Dec 2020 04:26:29 -0500 Received: from metis.ext.pengutronix.de (metis.ext.pengutronix.de [IPv6:2001:67c:670:201:290:27ff:fe1d:cc33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8A012C061749 for ; Tue, 8 Dec 2020 01:25:49 -0800 (PST) Received: from lupine.hi.pengutronix.de ([2001:67c:670:100:3ad5:47ff:feaf:1a17] helo=lupine) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kmZFd-0004D0-NE; Tue, 08 Dec 2020 10:25:41 +0100 Received: from pza by lupine with local (Exim 4.92) (envelope-from ) id 1kmZFb-0004Fu-52; Tue, 08 Dec 2020 10:25:39 +0100 Message-ID: <07c0b7a0caf47ddef27e55e6d6887fa55305d9d5.camel@pengutronix.de> Subject: Re: [PATCH v2 1/3] reset: hisilicon: correct vendor prefix From: Philipp Zabel To: Zhen Lei , Wei Xu , Rob Herring , linux-arm-kernel , devicetree , linux-kernel Cc: Zhangfei Gao , Chen Feng , Manivannan Sadhasivam Date: Tue, 08 Dec 2020 10:25:39 +0100 In-Reply-To: <20201204014236.1158-2-thunder.leizhen@huawei.com> References: <20201204014236.1158-1-thunder.leizhen@huawei.com> <20201204014236.1158-2-thunder.leizhen@huawei.com> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8BIT User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 2001:67c:670:100:3ad5:47ff:feaf:1a17 X-SA-Exim-Mail-From: p.zabel@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: devicetree@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Hi Zhen, On Fri, 2020-12-04 at 09:42 +0800, Zhen Lei wrote: > The vendor prefix of "Hisilicon Limited" is "hisilicon", it is clearly > stated in "vendor-prefixes.yaml". > > Fixes: 1527058736fa ("reset: hisilicon: add reset-hi3660") > Fixes: 35ca8168133c ("arm64: dts: Add dts files for Hisilicon Hi3660 SoC") > Fixes: dd8c7b78c11b ("arm64: dts: Add devicetree for Hisilicon Hi3670 SoC") > Signed-off-by: Zhen Lei > Cc: Zhangfei Gao > Cc: Chen Feng > Cc: Manivannan Sadhasivam > --- > arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 4 ++-- > arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 2 +- > drivers/reset/hisilicon/reset-hi3660.c | 2 +- Please keep device tree patches and reset driver patch separate, as they were in v1. > 3 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi > index 49c19c6879f95ce..bfb1375426d2b58 100644 > --- a/arch/arm64/boot/dts/hisilicon/hi3660.dtsi > +++ b/arch/arm64/boot/dts/hisilicon/hi3660.dtsi > @@ -345,7 +345,7 @@ > crg_rst: crg_rst_controller { > compatible = "hisilicon,hi3660-reset"; > #reset-cells = <2>; > - hisi,rst-syscon = <&crg_ctrl>; > + hisilicon,rst-syscon = <&crg_ctrl>; > }; > > > @@ -376,7 +376,7 @@ > > iomcu_rst: reset { > compatible = "hisilicon,hi3660-reset"; > - hisi,rst-syscon = <&iomcu>; > + hisilicon,rst-syscon = <&iomcu>; > #reset-cells = <2>; > }; > > diff --git a/arch/arm64/boot/dts/hisilicon/hi3670.dtsi b/arch/arm64/boot/dts/hisilicon/hi3670.dtsi > index 85b0dfb35d6d396..5c5a5dc964ea848 100644 > --- a/arch/arm64/boot/dts/hisilicon/hi3670.dtsi > +++ b/arch/arm64/boot/dts/hisilicon/hi3670.dtsi > @@ -155,7 +155,7 @@ > compatible = "hisilicon,hi3670-reset", > "hisilicon,hi3660-reset"; > #reset-cells = <2>; > - hisi,rst-syscon = <&crg_ctrl>; > + hisilicon,rst-syscon = <&crg_ctrl>; > }; > > pctrl: pctrl@e8a09000 { > diff --git a/drivers/reset/hisilicon/reset-hi3660.c b/drivers/reset/hisilicon/reset-hi3660.c > index a7d4445924e558c..8f1953159a65b31 100644 > --- a/drivers/reset/hisilicon/reset-hi3660.c > +++ b/drivers/reset/hisilicon/reset-hi3660.c > @@ -83,7 +83,7 @@ static int hi3660_reset_probe(struct platform_device *pdev) > if (!rc) > return -ENOMEM; > > - rc->map = syscon_regmap_lookup_by_phandle(np, "hisi,rst-syscon"); > + rc->map = syscon_regmap_lookup_by_phandle(np, "hisilicon,rst-syscon"); This should fall back to the deprecated compatible, for example: rc->map = syscon_regmap_lookup_by_phandle(np, "hisilicon,rst-syscon"); if (PTR_ERR(rc->map) == -ENODEV) rc->map = syscon_regmap_lookup_by_phandle(np, "hisi,rst- syscon"); > if (IS_ERR(rc->map)) { > dev_err(dev, "failed to get hi3660,rst-syscon\n"); > return PTR_ERR(rc->map); regards Philipp