From: "Leizhen (ThunderTown)" <thunder.leizhen@huawei.com> To: Philipp Zabel <p.zabel@pengutronix.de>, Wei Xu <xuwei5@hisilicon.com>, "Rob Herring" <robh+dt@kernel.org>, linux-arm-kernel <linux-arm-kernel@lists.infradead.org>, devicetree <devicetree@vger.kernel.org>, linux-kernel <linux-kernel@vger.kernel.org> Cc: Zhangfei Gao <zhangfei.gao@linaro.org>, Chen Feng <puck.chen@hisilicon.com>, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Subject: Re: [PATCH v2 1/3] reset: hisilicon: correct vendor prefix Date: Tue, 8 Dec 2020 19:29:47 +0800 [thread overview] Message-ID: <abdb7179-5187-b515-7a9d-5a4d13608e40@huawei.com> (raw) In-Reply-To: <07c0b7a0caf47ddef27e55e6d6887fa55305d9d5.camel@pengutronix.de> On 2020/12/8 17:25, Philipp Zabel wrote: > 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 <thunder.leizhen@huawei.com> >> Cc: Zhangfei Gao <zhangfei.gao@linaro.org> >> Cc: Chen Feng <puck.chen@hisilicon.com> >> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> >> --- >> 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. OK > >> 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"); Oh, thanks. I misunderstood your suggestion the other day. I'll fix it right away. > >> if (IS_ERR(rc->map)) { >> dev_err(dev, "failed to get hi3660,rst-syscon\n"); >> return PTR_ERR(rc->map); > > regards > Philipp > > . >
next prev parent reply other threads:[~2020-12-08 11:30 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-12-04 1:42 [PATCH v2 0/3] dt-bindings: reset: convert Hisilicon reset controller bindings to json-schema Zhen Lei 2020-12-04 1:42 ` [PATCH v2 1/3] reset: hisilicon: correct vendor prefix Zhen Lei 2020-12-07 23:08 ` Rob Herring 2020-12-08 2:16 ` Leizhen (ThunderTown) 2020-12-08 19:30 ` Rob Herring 2020-12-08 9:25 ` Philipp Zabel 2020-12-08 11:29 ` Leizhen (ThunderTown) [this message] 2020-12-04 1:42 ` [PATCH v2 2/3] dt-bindings: reset: correct vendor prefix hisi to hisilicon Zhen Lei 2020-12-04 1:42 ` [PATCH v2 3/3] dt-bindings: reset: convert Hisilicon reset controller bindings to json-schema Zhen Lei 2020-12-07 23:10 ` Rob Herring 2020-12-08 3:07 ` Leizhen (ThunderTown)
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=abdb7179-5187-b515-7a9d-5a4d13608e40@huawei.com \ --to=thunder.leizhen@huawei.com \ --cc=devicetree@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=manivannan.sadhasivam@linaro.org \ --cc=p.zabel@pengutronix.de \ --cc=puck.chen@hisilicon.com \ --cc=robh+dt@kernel.org \ --cc=xuwei5@hisilicon.com \ --cc=zhangfei.gao@linaro.org \ --subject='Re: [PATCH v2 1/3] reset: hisilicon: correct vendor prefix' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).