From: Zhen Lei <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: Zhen Lei <thunder.leizhen@huawei.com>,
Zhangfei Gao <zhangfei.gao@linaro.org>,
Chen Feng <puck.chen@hisilicon.com>,
"Manivannan Sadhasivam" <manivannan.sadhasivam@linaro.org>
Subject: [PATCH v3 1/4] reset: hisilicon: correct vendor prefix
Date: Tue, 8 Dec 2020 20:46:38 +0800 [thread overview]
Message-ID: <20201208124641.1787-2-thunder.leizhen@huawei.com> (raw)
In-Reply-To: <20201208124641.1787-1-thunder.leizhen@huawei.com>
The vendor prefix of "Hisilicon Limited" is "hisilicon", it is clearly
stated in "vendor-prefixes.yaml".
For backward compatibility reasons fall back to the deprecated compatible
if the new one failed.
Fixes: 1527058736fa ("reset: hisilicon: add reset-hi3660")
Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Cc: Zhangfei Gao <zhangfei.gao@linaro.org>
---
drivers/reset/hisilicon/reset-hi3660.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/reset/hisilicon/reset-hi3660.c b/drivers/reset/hisilicon/reset-hi3660.c
index a7d4445924e558c..965f5ceba7d8f4d 100644
--- a/drivers/reset/hisilicon/reset-hi3660.c
+++ b/drivers/reset/hisilicon/reset-hi3660.c
@@ -83,9 +83,14 @@ 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 (rc->map == ERR_PTR(-ENODEV)) {
+ /* fall back to the deprecated compatible */
+ 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");
+ dev_err(dev, "failed to get hisilicon,rst-syscon\n");
return PTR_ERR(rc->map);
}
--
1.8.3
next prev parent reply other threads:[~2020-12-08 12:51 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 12:46 [PATCH v3 0/4] dt-bindings: reset: convert Hisilicon reset controller bindings to json-schema Zhen Lei
2020-12-08 12:46 ` Zhen Lei [this message]
2020-12-08 12:46 ` [PATCH v3 2/4] arm64: dts: correct vendor prefix hisi to hisilicon Zhen Lei
2021-01-26 8:53 ` Wei Xu
2021-01-26 22:23 ` Arnd Bergmann
2021-01-27 0:42 ` Wei Xu
2021-01-28 14:08 ` Arnd Bergmann
2021-01-29 1:02 ` Wei Xu
2021-01-29 1:55 ` Wei Xu
2021-01-27 1:21 ` Leizhen (ThunderTown)
2020-12-08 12:46 ` [PATCH v3 3/4] dt-bindings: reset: " Zhen Lei
2020-12-10 14:01 ` Rob Herring
2020-12-08 12:46 ` [PATCH v3 4/4] dt-bindings: reset: convert Hisilicon reset controller bindings to json-schema Zhen Lei
2020-12-10 14:02 ` Rob Herring
2020-12-10 15:06 ` [PATCH v3 0/4] " Philipp Zabel
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=20201208124641.1787-2-thunder.leizhen@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 \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®