| From e0a6db52cb3aec40459466bcfe054f326dcb2bd0 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 22 Apr 2024 16:41:08 +0800 |
| Subject: Revert "net: txgbe: fix i2c dev name cannot match clkdev" |
| |
| From: Duanqiang Wen <duanqiangwen@net-swift.com> |
| |
| [ Upstream commit 8d6bf83f6740ba52a59e25dad360e1e87ef47666 ] |
| |
| 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 <duanqiangwen@net-swift.com> |
| Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> |
| Link: https://lore.kernel.org/r/20240422084109.3201-1-duanqiangwen@net-swift.com |
| Signed-off-by: Jakub Kicinski <kuba@kernel.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 8cddc9ddb3392..29997e4b2d6ca 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; |
| @@ -558,8 +556,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)) |
| @@ -621,7 +619,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); |
| -- |
| 2.43.0 |
| |
