Commit e0d16624 authored by Zhen Lei's avatar Zhen Lei Committed by Philipp Zabel
Browse files

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: 15270587 ("reset: hisilicon: add reset-hi3660")
Signed-off-by: default avatarZhen Lei <thunder.leizhen@huawei.com>
Cc: Zhangfei Gao <zhangfei.gao@linaro.org>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent def26913

drivers/reset/hisilicon/reset-hi3660.c

+7 −2
Original line number Diff line number Diff line
@@ -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);

	}