Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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>

authored by

Duanqiang Wen and committed by
Jakub Kicinski
8d6bf83f 04816dc9

+3 -5
+3 -5
drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c
··· 20 20 #include "txgbe_phy.h" 21 21 #include "txgbe_hw.h" 22 22 23 - #define TXGBE_I2C_CLK_DEV_NAME "i2c_dw" 24 - 25 23 static int txgbe_swnodes_register(struct txgbe *txgbe) 26 24 { 27 25 struct txgbe_nodes *nodes = &txgbe->nodes; ··· 571 573 char clk_name[32]; 572 574 struct clk *clk; 573 575 574 - snprintf(clk_name, sizeof(clk_name), "%s.%d", 575 - TXGBE_I2C_CLK_DEV_NAME, pci_dev_id(pdev)); 576 + snprintf(clk_name, sizeof(clk_name), "i2c_dw.%d", 577 + pci_dev_id(pdev)); 576 578 577 579 clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, 156250000); 578 580 if (IS_ERR(clk)) ··· 634 636 635 637 info.parent = &pdev->dev; 636 638 info.fwnode = software_node_fwnode(txgbe->nodes.group[SWNODE_I2C]); 637 - info.name = TXGBE_I2C_CLK_DEV_NAME; 639 + info.name = "i2c_designware"; 638 640 info.id = pci_dev_id(pdev); 639 641 640 642 info.res = &DEFINE_RES_IRQ(pdev->irq);