Commit 6ad15494 authored by Duanqiang Wen's avatar Duanqiang Wen
Browse files

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

mainline inclusion
from mainline-v6.9-rc6
commit 8d6bf83f6740ba52a59e25dad360e1e87ef47666
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9IP8F
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=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: default avatarDuanqiang Wen <duanqiangwen@net-swift.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Link: https://lore.kernel.org/r/20240422084109.3201-1-duanqiangwen@net-swift.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3b21c128

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

+3 −5
Original line number Diff line number Diff line
@@ -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);