reset: hisilicon: correct vendor prefix
authorZhen Lei <thunder.leizhen@huawei.com>
Tue, 8 Dec 2020 12:46:38 +0000 (20:46 +0800)
committerPhilipp Zabel <p.zabel@pengutronix.de>
Fri, 8 Jan 2021 12:00:59 +0000 (13:00 +0100)
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>
drivers/reset/hisilicon/reset-hi3660.c

index a7d4445924e558c10cf3db3b2269d6bcf322acb0..965f5ceba7d8f4da82b41753f786c4d9df206917 100644 (file)
@@ -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);
        }