MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-12 04:15:21 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "net: txgbe: fix i2c dev name cannot match clkdev"

Browse Source 
[ Upstream commit 8d6bf83f67 ]

This reverts commit c644920ce9.
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>
This commit is contained in:
Duanqiang Wen 2024-04-22 16:41:08 +08:00 committed by Greg Kroah-Hartman
parent 39cfce7516
commit d6a2007376
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
View File

@ -20,8 +20,6 @@
#include "txgbe_phy.h" #include "txgbe_phy.h"
#include "txgbe_hw.h" #include "txgbe_hw.h"
#define TXGBE_I2C_CLK_DEV_NAME "i2c_dw"
static int txgbe_swnodes_register(struct txgbe *txgbe) static int txgbe_swnodes_register(struct txgbe *txgbe)
{ {
struct txgbe_nodes *nodes = &txgbe->nodes; struct txgbe_nodes *nodes = &txgbe->nodes;
@ -553,8 +551,8 @@ static int txgbe_clock_register(struct txgbe *txgbe)
char clk_name[32]; char clk_name[32];
struct clk *clk; struct clk *clk;
snprintf(clk_name, sizeof(clk_name), "%s.%d", snprintf(clk_name, sizeof(clk_name), "i2c_dw.%d",
TXGBE_I2C_CLK_DEV_NAME, pci_dev_id(pdev)); pci_dev_id(pdev));
clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, 156250000); clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, 156250000);
if (IS_ERR(clk)) if (IS_ERR(clk))
@ -616,7 +614,7 @@ static int txgbe_i2c_register(struct txgbe *txgbe)
info.parent = &pdev->dev; info.parent = &pdev->dev;
info.fwnode = software_node_fwnode(txgbe->nodes.group[SWNODE_I2C]); 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.id = pci_dev_id(pdev);
info.res = &DEFINE_RES_IRQ(pdev->irq); info.res = &DEFINE_RES_IRQ(pdev->irq);