[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20201207230821.GA1015860@robh.at.kernel.org>
Date: Mon, 7 Dec 2020 17:08:21 -0600
From: Rob Herring <robh@...nel.org>
To: Zhen Lei <thunder.leizhen@...wei.com>
Cc: Philipp Zabel <p.zabel@...gutronix.de>,
Wei Xu <xuwei5@...ilicon.com>,
linux-arm-kernel <linux-arm-kernel@...ts.infradead.org>,
devicetree <devicetree@...r.kernel.org>,
linux-kernel <linux-kernel@...r.kernel.org>,
Zhangfei Gao <zhangfei.gao@...aro.org>,
Chen Feng <puck.chen@...ilicon.com>,
Manivannan Sadhasivam <manivannan.sadhasivam@...aro.org>
Subject: Re: [PATCH v2 1/3] reset: hisilicon: correct vendor prefix
On Fri, Dec 04, 2020 at 09:42:34AM +0800, Zhen Lei wrote:
> The vendor prefix of "Hisilicon Limited" is "hisilicon", it is clearly
> stated in "vendor-prefixes.yaml".
Yes, but you can't fix this as changing it breaks compability between
DTBs and kernels.
hisi has to be documented and marked 'deprecated'.
>
> 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@...wei.com>
> Cc: Zhangfei Gao <zhangfei.gao@...aro.org>
> Cc: Chen Feng <puck.chen@...ilicon.com>
> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@...aro.org>
> ---
> arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 4 ++--
> arch/arm64/boot/dts/hisilicon/hi3670.dtsi | 2 +-
> drivers/reset/hisilicon/reset-hi3660.c | 2 +-
> 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@...09000 {
> 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");
> if (IS_ERR(rc->map)) {
> dev_err(dev, "failed to get hi3660,rst-syscon\n");
> return PTR_ERR(rc->map);
> --
> 1.8.3
>
>
Powered by blists - more mailing lists