diff options
| author | Zhen Lei <thunder.leizhen@huawei.com> | 2020-12-08 20:46:38 +0800 |
|---|---|---|
| committer | Philipp Zabel <p.zabel@pengutronix.de> | 2021-01-08 13:00:59 +0100 |
| commit | e0d1662443ee0ee275bb5a8ab4c53d0739313290 (patch) | |
| tree | 8ce383e4bb467a320317c44b16d12ae3918269ec | |
| parent | def26913b66fd94e431afecf28e09c08e8c02a35 (diff) | |
| download | linux-e0d1662443ee0ee275bb5a8ab4c53d0739313290.tar.bz2 | |
reset: hisilicon: correct vendor prefix
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>
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
| -rw-r--r-- | drivers/reset/hisilicon/reset-hi3660.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/reset/hisilicon/reset-hi3660.c b/drivers/reset/hisilicon/reset-hi3660.c index a7d4445924e5..965f5ceba7d8 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); } |