Skip to content

Commit 8d6bf83

Browse files
Duanqiang Wenkuba-moo
authored andcommitted
Revert "net: txgbe: fix i2c dev name cannot match clkdev"
This reverts commit c644920. 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 <[email protected]> Reviewed-by: Jacob Keller <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 04816dc commit 8d6bf83

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
#include "txgbe_phy.h"
2121
#include "txgbe_hw.h"
2222

23-
#define TXGBE_I2C_CLK_DEV_NAME "i2c_dw"
24-
2523
static int txgbe_swnodes_register(struct txgbe *txgbe)
2624
{
2725
struct txgbe_nodes *nodes = &txgbe->nodes;
@@ -573,8 +571,8 @@ static int txgbe_clock_register(struct txgbe *txgbe)
573571
char clk_name[32];
574572
struct clk *clk;
575573

576-
snprintf(clk_name, sizeof(clk_name), "%s.%d",
577-
TXGBE_I2C_CLK_DEV_NAME, pci_dev_id(pdev));
574+
snprintf(clk_name, sizeof(clk_name), "i2c_dw.%d",
575+
pci_dev_id(pdev));
578576

579577
clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, 156250000);
580578
if (IS_ERR(clk))
@@ -636,7 +634,7 @@ static int txgbe_i2c_register(struct txgbe *txgbe)
636634

637635
info.parent = &pdev->dev;
638636
info.fwnode = software_node_fwnode(txgbe->nodes.group[SWNODE_I2C]);
639-
info.name = TXGBE_I2C_CLK_DEV_NAME;
637+
info.name = "i2c_designware";
640638
info.id = pci_dev_id(pdev);
641639

642640
info.res = &DEFINE_RES_IRQ(pdev->irq);

0 commit comments

Comments
 (0)