From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CA6B3C32771 for ; Wed, 28 Sep 2022 09:11:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233560AbiI1JLo (ORCPT ); Wed, 28 Sep 2022 05:11:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43830 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233157AbiI1JLU (ORCPT ); Wed, 28 Sep 2022 05:11:20 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE6E26583E; Wed, 28 Sep 2022 02:11:14 -0700 (PDT) X-UUID: 24d95711adb845d893db5c7773fbffa7-20220928 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=YsMjo12w8koHdR4QXO2+wONVhzxLBlLGOX92rbAP98k=; b=l0ttKZPsYJlfnkIMDd6v4jSaW17mW5wup/EOd+iLZoeFLJnogzno8jYgjWj/L4boXTvEYyYVz+O3H09HUIbTpSZj3ke+Jtkn9MlKbVnF4qiVJw1E0qQsklk7zW7ZsWK6XG6xtw3iDvPC0GCAFOjt67BNR7zgnhuaDOnbdrLXVjQ=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.11,REQID:e184917f-0514-485e-b92b-608e3f54ff38,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Release_Ham,ACTIO N:release,TS:90 X-CID-INFO: VERSION:1.1.11,REQID:e184917f-0514-485e-b92b-608e3f54ff38,IP:0,URL :0,TC:0,Content:-5,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Spam_GS981B3D,ACTIO N:quarantine,TS:90 X-CID-META: VersionHash:39a5ff1,CLOUDID:eb5b5ba3-dc04-435c-b19b-71e131a5fc35,B ulkID:220928171109OUVC8NVB,BulkQuantity:1,Recheck:0,SF:38|28|17|19|48|823| 824,TC:nil,Content:0,EDM:-3,IP:nil,URL:0,File:nil,Bulk:40,QS:nil,BEC:nil,C OL:0 X-UUID: 24d95711adb845d893db5c7773fbffa7-20220928 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 919894323; Wed, 28 Sep 2022 17:11:09 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Wed, 28 Sep 2022 17:11:07 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 28 Sep 2022 17:11:05 +0800 From: Jianguo Zhang To: "David S . Miller" , Rob Herring , Krzysztof Kozlowski , AngeloGioacchino Del Regno CC: Eric Dumazet , Jakub Kicinski , Paolo Abeni , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , Maxime Coquelin , "Matthias Brugger" , Biao Huang , , , , , , , Jianguo Zhang Subject: [PATCH v6 4/4] net: stmmac: add a parse for new property 'snps,clk-csr' Date: Wed, 28 Sep 2022 17:10:52 +0800 Message-ID: <20220928091052.18490-5-jianguo.zhang@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928091052.18490-1-jianguo.zhang@mediatek.com> References: <20220928091052.18490-1-jianguo.zhang@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Parse new property 'snps,clk-csr' firstly because the new property is documented in binding file, if failed, fall back to old property 'clk_csr' for out-of-tree case Signed-off-by: Jianguo Zhang --- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index 9f5cac4000da..4c60a89460c8 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -444,7 +444,9 @@ stmmac_probe_config_dt(struct platform_device *pdev, u8 *mac) * or get clk_csr from device tree. */ plat->clk_csr = -1; - of_property_read_u32(np, "clk_csr", &plat->clk_csr); + if (of_property_read_u32(np, "snps,clk-csr", &plat->clk_csr)) + of_property_read_u32(np, "clk_csr", &plat->clk_csr); + /* "snps,phy-addr" is not a standard property. Mark it as deprecated * and warn of its use. Remove this when phy node support is added. -- 2.25.1