From patchwork Mon Apr 22 08:41:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duanqiang Wen X-Patchwork-Id: 13637920 X-Patchwork-Delegate: kuba@kernel.org Received: from bg1.exmail.qq.com (bg1.exmail.qq.com [114.132.62.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A93324317E for ; Mon, 22 Apr 2024 08:41:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=114.132.62.65 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713775269; cv=none; b=L0UcJ4cs4OOZLwf4NCQTu9oJ4axpoPrFpPy+NXbwIWq/eEDoTenylHXSc2DJeLMxfmNaKfZXTDpnfVyGR+DmkaDvmPlZMqi4YsUMnlesKwPttS5NA33oGEOG0mfFcnHeEG7rfroaWJHq9Cb5JFERkv/msabRmSfnaK6IPpZcssI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713775269; c=relaxed/simple; bh=I1Bbhjv99D66yQavwsjwUHBSY/MWqXj1gjpu2LigkXw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=UDoiiAKShk4lqI3Ag/kRD3BdTi/RXmBbPcLtcNCFy1nDGC5XIfDre1QJgnspSrmZThsitjEOw5TrnxSQT7zLkahpLijLZYb0/K+xsGTBmz1IpZ2XZ3DcS3PhcvX737m0KR3pQXWS0FLodDf/LmgbBOJ+25eJg7TA75LAvWOjWUg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=net-swift.com; spf=pass smtp.mailfrom=net-swift.com; arc=none smtp.client-ip=114.132.62.65 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=net-swift.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=net-swift.com X-QQ-mid: bizesmtpsz14t1713775170tr5ned X-QQ-Originating-IP: n7mOI99YXCKbj17sHLTzx1a1pkbxmg6x/OKGN2Qpn48= Received: from localhost.trustnetic.com ( [125.119.247.132]) by bizesmtp.qq.com (ESMTP) with id ; Mon, 22 Apr 2024 16:39:28 +0800 (CST) X-QQ-SSF: 01400000000000E0E000000A0000000 X-QQ-FEAT: +ynUkgUhZJlE9UcmWaex+sOHoBEXhg9pDYtJOg01MfhpoxTWJLqwvS3oznYEx iLF6dGmQh+ZzUofBVln60a9epkkhhG6lrztOA0SxUYwzQhXTOm19WvnuZEkKZ5UenceCxml 2FZOTyyMm/F2zveinD99wwTvHvUI45dgNrfLW1FpQobTVggaUNTiVbHBMYawlUE8RfX5tBr DYwjNwY5Evgo0DQagiwod2Hr181ebUyS+pMQweF2SrgWUPNi2kb/3i8L/rhlNZPWbKojmlY MdomNpLBKM/0TXL78yOmFNtqCAhTWydoVBSwJvYlmIqy4TrbWcFSqX8H2iGzGGi+SAdWnvs 0OQOWHdSgIb1HXcs/jtfyz8t6dPWUCWnjKLFD2nr+PIxoOmnRCvO0O5XdYMrGpktg52eQyu jZbDtNw010I= X-QQ-GoodBg: 2 X-BIZMAIL-ID: 15245128689296459886 From: Duanqiang Wen To: netdev@vger.kernel.org, jiawenwu@trustnetic.com, mengyuanlou@net-swift.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, maciej.fijalkowski@intel.com, andrew@lunn.ch Cc: Duanqiang Wen Subject: [PATCH net 1/2] Revert "net: txgbe: fix i2c dev name cannot match clkdev" Date: Mon, 22 Apr 2024 16:41:08 +0800 Message-Id: <20240422084109.3201-1-duanqiangwen@net-swift.com> X-Mailer: git-send-email 2.27.0 Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtpsz:net-swift.com:qybglogicsvrsz:qybglogicsvrsz3a-1 X-Patchwork-Delegate: kuba@kernel.org This reverts commit c644920ce9220d83e070f575a4df711741c07f07. when register i2c dev, txgbe shorten "i2c_designware" to "i2c_dw", will cause this i2c dev can't match platfom driver i2c_designware_platform. Signed-off-by: Duanqiang Wen Reviewed-by: Jacob Keller --- drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c index 2fa511227eac..5b5d5e4310d1 100644 --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c @@ -20,8 +20,6 @@ #include "txgbe_phy.h" #include "txgbe_hw.h" -#define TXGBE_I2C_CLK_DEV_NAME "i2c_dw" - static int txgbe_swnodes_register(struct txgbe *txgbe) { struct txgbe_nodes *nodes = &txgbe->nodes; @@ -573,8 +571,8 @@ static int txgbe_clock_register(struct txgbe *txgbe) char clk_name[32]; struct clk *clk; - snprintf(clk_name, sizeof(clk_name), "%s.%d", - TXGBE_I2C_CLK_DEV_NAME, pci_dev_id(pdev)); + snprintf(clk_name, sizeof(clk_name), "i2c_dw.%d", + pci_dev_id(pdev)); clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, 156250000); if (IS_ERR(clk)) @@ -636,7 +634,7 @@ static int txgbe_i2c_register(struct txgbe *txgbe) info.parent = &pdev->dev; info.fwnode = software_node_fwnode(txgbe->nodes.group[SWNODE_I2C]); - info.name = TXGBE_I2C_CLK_DEV_NAME; + info.name = "i2c_designware"; info.id = pci_dev_id(pdev); info.res = &DEFINE_RES_IRQ(pdev->irq); From patchwork Mon Apr 22 08:41:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Duanqiang Wen X-Patchwork-Id: 13637919 X-Patchwork-Delegate: kuba@kernel.org Received: from smtpbgeu2.qq.com (smtpbgeu2.qq.com [18.194.254.142]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0DC934317E for ; Mon, 22 Apr 2024 08:40:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=18.194.254.142 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713775260; cv=none; b=jsAyy+Nesf7j5gnrgjAm87NuF7UFgR6u11BZGefuKmsC3gQhvkzArsSVZYKvC2OJY4j5FuVwf0gFjuhf3Ycm1LbXq0WCdNZTyp+Zj7uYpqaVTf5h+QSVzYjsziCd5NzL5yTl2g29kIOdqGCaSexqNzPEw+9fKkNB95dORx3W8lk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713775260; c=relaxed/simple; bh=JSjGj7t12vbRXL/ImSzG7oFk/QOs/rlr23VJkj1Qzjs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=u/UcesM7JaxHxZZSCtwv1qPmaPnaeZh/W8Tf9eqP0T2AQXZoQKkbhs7C9+Olod61tTG+cl1JTzYeNtXdw+RYYgiMa9Ywcib7HsLnwCy7cNxQjB/QK1oJscgLV3+ijuo5PXISvfmCDcMKnn1l3q8soX0Lik7MKgHdjdeySbrbEGs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=net-swift.com; spf=pass smtp.mailfrom=net-swift.com; arc=none smtp.client-ip=18.194.254.142 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=net-swift.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=net-swift.com X-QQ-mid: bizesmtpsz14t1713775175tcw75u X-QQ-Originating-IP: uCtwqRzNKKvBtq3S85o3aQ9w8K8JZsbF3DRnMT5v1dE= Received: from localhost.trustnetic.com ( [125.119.247.132]) by bizesmtp.qq.com (ESMTP) with id ; Mon, 22 Apr 2024 16:39:34 +0800 (CST) X-QQ-SSF: 01400000000000E0E000000A0000000 X-QQ-FEAT: k8Irs33ik7sJFl8qwdx94UeAvZoMK4BVI/g4UXEus3kmLJZGwXYfpTrPwuZ1C JzE+f6Kul9lZ2IyZTa/H6uPGwOfnU20FsmXGqrlHaktUmTd98CzlbYm0rGxwMpglESJDoju Hz7b7IRfHuY80kPth0xjQUkJxVSC0vWO3blkrpdr0DsS7ovfeJJfG4ec6Ll88QLIh26FHyw 3RJ8QJ64t7LPRO58Nj3DRPnWMIJVaWsTpzq9mNIgpdcTfEcfnyMzYzR/hDzPtIKYcMMoA9Y d1adr/yISVQkIFdn0yjfdW3YAuGwn6Xs7ryHx9L/nFXOUCufhAjVAn0pRZGvIqk3wH7g9zk eA/YO1wHltbM6SN1QB924Jfi65lyOPLFDSsew/ahD2RP25WFJPtu7KAmPMyxUNAUnhRIA/o TpZCnehDp4g= X-QQ-GoodBg: 2 X-BIZMAIL-ID: 15554260163409569988 From: Duanqiang Wen To: netdev@vger.kernel.org, jiawenwu@trustnetic.com, mengyuanlou@net-swift.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, maciej.fijalkowski@intel.com, andrew@lunn.ch Cc: Duanqiang Wen Subject: [PATCH net 2/2] Revert "net: txgbe: fix clk_name exceed MAX_DEV_ID limits" Date: Mon, 22 Apr 2024 16:41:09 +0800 Message-Id: <20240422084109.3201-2-duanqiangwen@net-swift.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20240422084109.3201-1-duanqiangwen@net-swift.com> References: <20240422084109.3201-1-duanqiangwen@net-swift.com> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtpsz:net-swift.com:qybglogicsvrsz:qybglogicsvrsz3a-1 X-Patchwork-Delegate: kuba@kernel.org This reverts commit e30cef001da259e8df354b813015d0e5acc08740. commit 99f4570cfba1 ("clkdev: Update clkdev id usage to allow for longer names") can fix clk_name exceed MAX_DEV_ID limits, so this commit is meaningless. Signed-off-by: Duanqiang Wen Reviewed-by: Jacob Keller --- drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c index 5b5d5e4310d1..93295916b1d2 100644 --- a/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c +++ b/drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c @@ -571,7 +571,7 @@ static int txgbe_clock_register(struct txgbe *txgbe) char clk_name[32]; struct clk *clk; - snprintf(clk_name, sizeof(clk_name), "i2c_dw.%d", + snprintf(clk_name, sizeof(clk_name), "i2c_designware.%d", pci_dev_id(pdev)); clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, 156250000);