From patchwork Tue Dec 8 12:46:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhen Lei X-Patchwork-Id: 339733 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp3663390jai; Tue, 8 Dec 2020 04:52:48 -0800 (PST) X-Google-Smtp-Source: ABdhPJyNJNU638b4CAnMnfhKDBWxgwRQIx6OWouSt4EY3X21P6wxTIGe+ho7+/LAuv2c3gXABW7G X-Received: by 2002:a17:906:3153:: with SMTP id e19mr23986965eje.17.1607431968474; Tue, 08 Dec 2020 04:52:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1607431968; cv=none; d=google.com; s=arc-20160816; b=ocyERfiUbdBYfrYzGOa8Ckd6+hoA3AjNDFwwZjPw5p1WAxJJv7mm7z5Ig+4FtRmoAz 0+6m80teSo2QHvVnofLwy1rGoUmO+XFp8Jmubh2ge8lELWDdYv3Uol3l/ji/dR613uq0 DHQZ8UhUP8RHpo3xAVGqbdwpX2/po81kxN6MF+tR5dn9+TrNQMVdFDuiKk7Gd9Oj/xTn xZN6ZL4KerHj5OXpIWogsgKHkonuiIC4FTv7pxkX6et4Mqr/TWtkQbiutBJPfYoCZf9s ZAHWwwoKWcPLwI2xG0aBQrYb/1T8Enz0VSWnIyhdCFDMGWRSKQx+xZHs0O8rGAK+8D1U Z2bw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=jvP6wMwlSviorpN5LqjtatZaQDn2ayW9LWdEfJBdEqc=; b=mQPtNb4yAR03CBBMpUzV2UJosYcNweu9b2dThdAG3Qc7oK44Fla9NSRJh0ijOJ0GnH Le7j2VOIx4L2w2diQiBBPjlLDc0zQdO1ochCK0Lp3e5o8z42vFpGVC+lIIvsf9jNCGDp M4ticHTxsg7RP6A4XC/EWF/gyCfUffBz56sIM66NFcBjfreGdluHgnRmTC/ZPHEP2srj gvSNBLqdjWRBpP6ORiaX0W8QBEdtbQTnJ8iA5LUBYv1+p2mYBJeBGpzprNoLYmHAKUzr 8xwzKVMVa2TRgCmWf/PwHET9jLn2nrWHbTGCHj0MIyGSc1hMq8uE1qAC3dlOPKIkdZmX k/HA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id m11si10059482edr.583.2020.12.08.04.52.48; Tue, 08 Dec 2020 04:52:48 -0800 (PST) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729287AbgLHMvZ (ORCPT + 6 others); Tue, 8 Dec 2020 07:51:25 -0500 Received: from szxga05-in.huawei.com ([45.249.212.191]:9037 "EHLO szxga05-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729266AbgLHMvZ (ORCPT ); Tue, 8 Dec 2020 07:51:25 -0500 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga05-in.huawei.com (SkyGuard) with ESMTP id 4Cr0QD2M2pzhnnK; Tue, 8 Dec 2020 20:50:12 +0800 (CST) Received: from thunder-town.china.huawei.com (10.174.177.9) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.487.0; Tue, 8 Dec 2020 20:50:33 +0800 From: Zhen Lei To: Philipp Zabel , Wei Xu , "Rob Herring" , linux-arm-kernel , devicetree , linux-kernel CC: Zhen Lei , Zhangfei Gao , Chen Feng , "Manivannan Sadhasivam" Subject: [PATCH v3 1/4] reset: hisilicon: correct vendor prefix Date: Tue, 8 Dec 2020 20:46:38 +0800 Message-ID: <20201208124641.1787-2-thunder.leizhen@huawei.com> X-Mailer: git-send-email 2.26.0.windows.1 In-Reply-To: <20201208124641.1787-1-thunder.leizhen@huawei.com> References: <20201208124641.1787-1-thunder.leizhen@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.174.177.9] X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org 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 Cc: Zhangfei Gao --- drivers/reset/hisilicon/reset-hi3660.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) -- 1.8.3 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); }