Received: by 2002:a05:6359:c8b:b0:c7:702f:21d4 with SMTP id go11csp1420371rwb; Wed, 28 Sep 2022 18:50:58 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4ujUYZ/ueO/X8PTbY2eQ7RhH43l4zl5Ne1o2EiWI3F490sudJPoXcLriVd7Kt6/dA2xZe+ X-Received: by 2002:a17:907:9493:b0:787:c346:19a4 with SMTP id dm19-20020a170907949300b00787c34619a4mr451502ejc.235.1664416258134; Wed, 28 Sep 2022 18:50:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1664416258; cv=none; d=google.com; s=arc-20160816; b=yJ8ULWAGuAdbJOwpODdvmPl/lB0jAm0hDcD9waG9e+ekbq0b18rblaJCM2WP0cs5dS SitqJYGWGYMTGUpxTmqCCVPAaUg10Vfdk7h57pwoffBDTBnVm8YW9gKsZOxm2rTre7Y0 9GA6ohI12icADNYdreFnYTQfCgDcur9XmhNCJTq4YEfllav93ueAi79nWAFn9vhO+PVn ZlcTooAzHJdZ5vVUJ58/ekwh8K+K+6ve0pFfIJRpkGYp2DTLBv+OR4c3hUweOHx+Fa91 tpaWOyZ89Xo/MsUvqhBwbF04tMQsCXdIUKnLWrdqQqefNHJiBufdH7Y8cUgzr2eGsvg6 xRUg== 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=taZCuPwBhsY8Kw9nE8S/okm+myAZhbbw1AHG39kmDuk=; b=ur24Z3xUIteHoisPNTsu7Nii3T/iynRA0DsKcxbEmWBtVyXkYH/Nlyro5KmUK4N8OR 5u0teFtfOz4EDO394wH0HbmOIyO0MRr4ZZZMjbhI5pLhfDzj0RPVENC+9naXPdrdcVrm EdNXCLiFeI3io595nb55I0Z0sWfrXxDW5iz+M8HWRsuIP7HSQZ7BxkKIZ8Yz46e7P0jz /oK+pbuQh/zmILMkJPHopTX+yBBD9uv7CukiZ0uZS4feJrCHapHWdRV4Tw7HaMoX+Wxq wQHDduTok3QYP7nZp9qbCDjLMfAsHi0u1kWCuruo1tVwu52AXcryR7uZ1CIFTfiTQqTj d8QQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=qb2GupGG; 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 b1-20020a170906038100b007721f88d3e0si6740926eja.554.2022.09.28.18.50.32; Wed, 28 Sep 2022 18:50:58 -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=qb2GupGG; 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 S234509AbiI2Bsa (ORCPT + 99 others); Wed, 28 Sep 2022 21:48:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55208 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233408AbiI2BsT (ORCPT ); Wed, 28 Sep 2022 21:48:19 -0400 Received: from mailgw01.mediatek.com (unknown [60.244.123.138]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3C9549F1A2; Wed, 28 Sep 2022 18:48:17 -0700 (PDT) X-UUID: 76f9646934ab4d3794de6a3c0a2dba79-20220929 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=taZCuPwBhsY8Kw9nE8S/okm+myAZhbbw1AHG39kmDuk=; b=qb2GupGGc0r+19RL5OKvvLeNss0IP4bMDU7OCTyqDhhPkbofM2u6ykvFzPatcGitWxwGcvDOE8ZBBrvdJdjRRP7l0oqtlI/8KZiqSQsFRDvggpzJX8heQHlp89vlCgTXv2LzJHfMAfLXSVH71fDF5w3A2Yh26yvGGaPjdB9zv/g=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.11,REQID:2803b7c9-8738-43ce-9394-8eb5948c6a62,IP:0,U RL:0,TC:0,Content:-5,EDM:0,RT:0,SF:0,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:-5 X-CID-META: VersionHash:39a5ff1,CLOUDID:9d915e07-1cee-4c38-b21b-a45f9682fdc0,B ulkID:nil,BulkQuantity:0,Recheck:0,SF:102,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0 X-UUID: 76f9646934ab4d3794de6a3c0a2dba79-20220929 Received: from mtkmbs11n1.mediatek.inc [(172.21.101.185)] by mailgw01.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 672598337; Thu, 29 Sep 2022 09:48:10 +0800 Received: from mtkmbs11n2.mediatek.inc (172.21.101.187) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Thu, 29 Sep 2022 09:48:08 +0800 Received: from localhost.localdomain (10.17.3.154) by mtkmbs11n2.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Thu, 29 Sep 2022 09:48:07 +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 v7 4/4] net: stmmac: add a parse for new property 'snps,clk-csr' Date: Thu, 29 Sep 2022 09:47:58 +0800 Message-ID: <20220929014758.12099-5-jianguo.zhang@mediatek.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220929014758.12099-1-jianguo.zhang@mediatek.com> References: <20220929014758.12099-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 Reviewed-by: AngeloGioacchino Del Regno --- 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