From patchwork Mon Jan 30 06:35:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Sae X-Patchwork-Id: 50146 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2036986wrn; Sun, 29 Jan 2023 22:40:25 -0800 (PST) X-Google-Smtp-Source: AMrXdXuGzMfxz8YnW222oJ19S2Mc1tFXL++k2gcagYMv2qvP/OeXkby7hNL30Wa7E9wa5M19Ufwg X-Received: by 2002:a17:907:ca07:b0:86e:cb6c:4462 with SMTP id uk7-20020a170907ca0700b0086ecb6c4462mr45840420ejc.36.1675060825350; Sun, 29 Jan 2023 22:40:25 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675060825; cv=none; d=google.com; s=arc-20160816; b=xwwl+sggs6zWbvCmpTqmJwtLmZx37dqBWB2cbLevmz/zFRg+Rx37yBrpQy/uasAsqx F7wmi9i7YuuwNczseoXNoHBnENro+7PNsDAyVVYbqfMTv2noaFVu265u3ktIvTquestQ F1K1AJQnv1nyBdUIXHtF2jXO9eiWOuXdD1nAcrN6i7zohWJlQk3A5OB6gpIZ6aE/ljys avl91Z1T7kSKOHPZ9sfKiCkyZ+gtaWpGbprF3XKTBNZi200fTdY+8YmZXT8mBATTeVxv M07BgLU7P8qEbOSvegnV29g9HA8bkoUDKcDPo4GmMYTgxlw4t5d6OmVDZVJs24Xa0Qvd 9ElA== 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=nnUkqvwkCVtromwbPVj6rcRTlU9tko/1FuUy/9+myKk=; b=LHuAz5nvA/SGpUph1TZlpXrd1O8UjbPyGYxs//MC+FmXhUXxgHOPF8XW+JAs2bm7KX 4IEdD6yuxaeQ42ujGhptNLt+iemJz8b39GfF5zo/clCKGCOLKdmr7idxTQ+QC0otMhxY Z/6eQTR8Q4QTlO+qMEBiJ8OG3ALQR7CovBqUn5pavH6MPuXEpYgQFcblMlyCyVWqFRJ0 1KHcc5tLvU9C+mmMxjHwOf/LH4mLdBnoJ670YWo1JV5Sdaj9mdBebURB+cIQOT49NsE0 KVGre9Y/pE7K510UTZ+puWS1nRgjTL6DI7JgBrYY7x0kYrPoFFPxJ8wa0Ax3GPEu7Dme aKMA== ARC-Authentication-Results: i=1; mx.google.com; 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=fail (p=NONE sp=NONE dis=NONE) header.from=motor-comm.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v9-20020a170906380900b007c18e1ecaf5si14933859ejc.654.2023.01.29.22.40.01; Sun, 29 Jan 2023 22:40:25 -0800 (PST) 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; 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=fail (p=NONE sp=NONE dis=NONE) header.from=motor-comm.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235779AbjA3GgM (ORCPT + 99 others); Mon, 30 Jan 2023 01:36:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49094 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229653AbjA3GgD (ORCPT ); Mon, 30 Jan 2023 01:36:03 -0500 Received: from out28-169.mail.aliyun.com (out28-169.mail.aliyun.com [115.124.28.169]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1D63E1ABD5; Sun, 29 Jan 2023 22:36:01 -0800 (PST) X-Alimail-AntiSpam: AC=CONTINUE;BC=0.08887874|-1;CH=green;DM=|CONTINUE|false|;DS=CONTINUE|ham_system_inform|0.0211176-0.234236-0.744646;FP=0|0|0|0|0|-1|-1|-1;HT=ay29a033018047204;MF=frank.sae@motor-comm.com;NM=1;PH=DS;RN=18;RT=18;SR=0;TI=SMTPD_---.R4fCYMm_1675060555; Received: from sun-VirtualBox..(mailfrom:Frank.Sae@motor-comm.com fp:SMTPD_---.R4fCYMm_1675060555) by smtp.aliyun-inc.com; Mon, 30 Jan 2023 14:35:57 +0800 From: Frank Sae To: Peter Geis , Andrew Lunn , Heiner Kallweit , Russell King , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Rob Herring , Krzysztof Kozlowski , yanhong.wang@starfivetech.com Cc: xiaogang.fan@motor-comm.com, fei.zhang@motor-comm.com, hua.sun@motor-comm.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Frank , devicetree@vger.kernel.org Subject: [PATCH net-next v3 4/5] net: phy: Add dts support for Motorcomm yt8531s gigabit ethernet phy Date: Mon, 30 Jan 2023 14:35:38 +0800 Message-Id: <20230130063539.3700-5-Frank.Sae@motor-comm.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230130063539.3700-1-Frank.Sae@motor-comm.com> References: <20230130063539.3700-1-Frank.Sae@motor-comm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756428579769853441?= X-GMAIL-MSGID: =?utf-8?q?1756428579769853441?= Add dts support for Motorcomm yt8531s gigabit ethernet phy. Change yt8521_probe to support clk config of yt8531s. Becase yt8521_probe does the things which yt8531s is needed, so removed yt8531s function. This patch has been verified on AM335x platform with yt8531s board. Signed-off-by: Frank Sae Reviewed-by: Andrew Lunn --- drivers/net/phy/motorcomm.c | 51 ++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 24 deletions(-) diff --git a/drivers/net/phy/motorcomm.c b/drivers/net/phy/motorcomm.c index 4a5ca846adeb..ee9cd72758d6 100644 --- a/drivers/net/phy/motorcomm.c +++ b/drivers/net/phy/motorcomm.c @@ -258,8 +258,6 @@ #define YT8531_SCR_CLK_SRC_CLOCK_FROM_DIGITAL 3 #define YT8531_SCR_CLK_SRC_REF_25M 4 #define YT8531_SCR_CLK_SRC_SSC_25M 5 -#define YT8531S_SYNCE_CFG_REG 0xA012 -#define YT8531S_SCR_SYNCE_ENABLE BIT(6) /* Extended Register end */ @@ -858,7 +856,32 @@ static int yt8521_probe(struct phy_device *phydev) return -EINVAL; } } else if (phydev->drv->phy_id == PHY_ID_YT8531S) { - return 0; + switch (freq) { + case YTPHY_DTS_OUTPUT_CLK_DIS: + mask = YT8531_SCR_SYNCE_ENABLE; + val = 0; + break; + case YTPHY_DTS_OUTPUT_CLK_25M: + mask = YT8531_SCR_SYNCE_ENABLE | + YT8531_SCR_CLK_SRC_MASK | + YT8531_SCR_CLK_FRE_SEL_125M; + val = YT8531_SCR_SYNCE_ENABLE | + FIELD_PREP(YT8531_SCR_CLK_SRC_MASK, + YT8531_SCR_CLK_SRC_REF_25M); + break; + case YTPHY_DTS_OUTPUT_CLK_125M: + mask = YT8531_SCR_SYNCE_ENABLE | + YT8531_SCR_CLK_SRC_MASK | + YT8531_SCR_CLK_FRE_SEL_125M; + val = YT8531_SCR_SYNCE_ENABLE | + YT8531_SCR_CLK_FRE_SEL_125M | + FIELD_PREP(YT8531_SCR_CLK_SRC_MASK, + YT8531_SCR_CLK_SRC_PLL_125M); + break; + default: + phydev_warn(phydev, "Freq err:%u\n", freq); + return -EINVAL; + } } else { phydev_warn(phydev, "PHY id err\n"); return -EINVAL; @@ -868,26 +891,6 @@ static int yt8521_probe(struct phy_device *phydev) val); } -/** - * yt8531s_probe() - read chip config then set suitable polling_mode - * @phydev: a pointer to a &struct phy_device - * - * returns 0 or negative errno code - */ -static int yt8531s_probe(struct phy_device *phydev) -{ - int ret; - - /* Disable SyncE clock output by default */ - ret = ytphy_modify_ext_with_lock(phydev, YT8531S_SYNCE_CFG_REG, - YT8531S_SCR_SYNCE_ENABLE, 0); - if (ret < 0) - return ret; - - /* same as yt8521_probe */ - return yt8521_probe(phydev); -} - /** * ytphy_utp_read_lpa() - read LPA then setup lp_advertising for utp * @phydev: a pointer to a &struct phy_device @@ -1970,7 +1973,7 @@ static struct phy_driver motorcomm_phy_drvs[] = { PHY_ID_MATCH_EXACT(PHY_ID_YT8531S), .name = "YT8531S Gigabit Ethernet", .get_features = yt8521_get_features, - .probe = yt8531s_probe, + .probe = yt8521_probe, .read_page = yt8521_read_page, .write_page = yt8521_write_page, .get_wol = ytphy_get_wol,