Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp279587rwb; Wed, 28 Sep 2022 02:34:37 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ZtlPEnPOtnl7xYH8BTNH8cuGNAwe+7Wt1C5WzBJ58a2drTc4cIHsxVuXm1+gyx3wMnOi6 X-Received: by 2002:a63:5a5e:0:b0:434:b739:206f with SMTP id k30-20020a635a5e000000b00434b739206fmr28386157pgm.82.1664357677549; Wed, 28 Sep 2022 02:34:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664357677; cv=none; d=google.com; s=arc-20160816; b=ydJlo3ivrcf/O/c7FHNxeGyHEXXiwvNlMYgFqMqETN7Isl4Fi4lUSzm8fS2+SF7DQB yG7Wi91GbzejMRaMSS5vV4XGcMGAYJxlzCN8VMF3P2FiJ5ajMHNRsEBRE26eyCAaxYbt RZCm4gCM+cylygEu/1MqYAw0i4eZ43dAHn7QOU2Vev6mnTRT++LmuR3HauJ4bj3cybT7 HRpPqzDcjg2oldNBZo5JKlhQhax9CnQ6L5DDb7JdZwFBFGLbZ6wYuCNFEvKcqY1/hWaI WRAprcXY4mKGPER1xjqTj0WzeuxHSCH1JhZPuphGQnYjNAlanQY95bWzxof+3QLNy78m c+dw== 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 :dkim-signature; bh=KwoK02CzcRXYuVBHLmRnxHj3TbaimYu3fl7cDpF224A=; b=luT8FOPGeqHmsSYBJ9wzJDaj2GDKVlq5KeKfDbz78GC4h0d6wdGDgrBP4wyOhe+Y90 tLLSjhKKyNJq2qfVsiT9Obov98b+/7cDTwrPodJKOfGXzvW+jXES2lCm8xyN4B4J1rkS flDYO//PWUPSaRs4WiUhEiSgHytuwhdYPvLDXyLTCho5PS/wLwiba3qc2VaI7/N0tEum dbIAeloeQsVJJkgk5eo89eaKekx6A8XRyVbeCaciSqVrP4i6mydQnYpVj5mflGruu0WS QqLAZuWWyU7bo/8nTh/GBuLBvVGXyMfnIp6gmrLWajYK2ggaVbk3FhLxPIDS3s3zN49c RWpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=VupbKGWf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u3-20020a17090282c300b0017a08290efbsi328000plz.558.2022.09.28.02.34.26; Wed, 28 Sep 2022 02:34:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=VupbKGWf; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233791AbiI1JXu (ORCPT + 99 others); Wed, 28 Sep 2022 05:23:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47890 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233772AbiI1JX2 (ORCPT ); Wed, 28 Sep 2022 05:23:28 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2FF033A8; Wed, 28 Sep 2022 02:23:24 -0700 (PDT) X-UUID: ca94991a3169433ab2f563849a67495a-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=KwoK02CzcRXYuVBHLmRnxHj3TbaimYu3fl7cDpF224A=; b=VupbKGWfQIiW+MIkboqnozd2aW6VGkWTLU68IpC/O0JF+Dj8ke4IZfFMiS/oxJCGeKonO+M2Q6Wt49Zo0egI4bIaYcRYUeAb0aqy1qi+CV3wT0V+Yx60Me2lBCz9sUDtk16kYTIMv1AonJw7ui86Exq58pklkp3HHIKBbBKTfEk=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.11,REQID:d72c560b-e2c4-449e-a358-91fba0b6adf5,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:d72c560b-e2c4-449e-a358-91fba0b6adf5,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:c8c95ba3-dc04-435c-b19b-71e131a5fc35,B ulkID:220928172321I7K5884V,BulkQuantity:0,Recheck:0,SF:38|28|17|19|48|823| 824,TC:nil,Content:0,EDM:-3,IP:nil,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil, COL:0 X-UUID: ca94991a3169433ab2f563849a67495a-20220928 Received: from mtkcas10.mediatek.inc [(172.21.101.39)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1304923521; Wed, 28 Sep 2022 17:23:18 +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:23:17 +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:23:15 +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: [resend PATCH v6 4/4] net: stmmac: add a parse for new property 'snps,clk-csr' Date: Wed, 28 Sep 2022 17:23:08 +0800 Message-ID: <20220928092308.26019-5-jianguo.zhang@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220928092308.26019-1-jianguo.zhang@mediatek.com> References: <20220928092308.26019-1-jianguo.zhang@mediatek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-MTK: N X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, SPF_PASS,UNPARSEABLE_RELAY,URIBL_CSS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 legacy case Signed-off-by: Jianguo Zhang --- drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c | 3 ++- 1 file changed, 2 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..3db6cb0b6124 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c @@ -444,7 +444,8 @@ 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