Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Zhen Lei and committed by
Philipp Zabel
e0d16624 def26913

+7 -2
+7 -2
drivers/reset/hisilicon/reset-hi3660.c
··· 83 83 if (!rc) 84 84 return -ENOMEM; 85 85 86 - rc->map = syscon_regmap_lookup_by_phandle(np, "hisi,rst-syscon"); 86 + rc->map = syscon_regmap_lookup_by_phandle(np, "hisilicon,rst-syscon"); 87 + if (rc->map == ERR_PTR(-ENODEV)) { 88 + /* fall back to the deprecated compatible */ 89 + rc->map = syscon_regmap_lookup_by_phandle(np, 90 + "hisi,rst-syscon"); 91 + } 87 92 if (IS_ERR(rc->map)) { 88 - dev_err(dev, "failed to get hi3660,rst-syscon\n"); 93 + dev_err(dev, "failed to get hisilicon,rst-syscon\n"); 89 94 return PTR_ERR(rc->map); 90 95 } 91 96