mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-28 13:22:57 +00:00
net: txgbe: fix i2c dev name cannot match clkdev
commitc644920ce9
upstream. txgbe clkdev shortened clk_name, so i2c_dev info_name also need to shorten. Otherwise, i2c_dev cannot initialize clock. Fixes:e30cef001d
("net: txgbe: fix clk_name exceed MAX_DEV_ID limits") Signed-off-by: Duanqiang Wen <duanqiangwen@net-swift.com> Link: https://lore.kernel.org/r/20240402021843.126192-1-duanqiangwen@net-swift.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
093aff4191
commit
4c74b4267d
1 changed files with 5 additions and 3 deletions
|
@ -20,6 +20,8 @@
|
|||
#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;
|
||||
|
@ -556,8 +558,8 @@ static int txgbe_clock_register(struct txgbe *txgbe)
|
|||
char clk_name[32];
|
||||
struct clk *clk;
|
||||
|
||||
snprintf(clk_name, sizeof(clk_name), "i2c_dw.%d",
|
||||
pci_dev_id(pdev));
|
||||
snprintf(clk_name, sizeof(clk_name), "%s.%d",
|
||||
TXGBE_I2C_CLK_DEV_NAME, pci_dev_id(pdev));
|
||||
|
||||
clk = clk_register_fixed_rate(NULL, clk_name, NULL, 0, 156250000);
|
||||
if (IS_ERR(clk))
|
||||
|
@ -619,7 +621,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 = "i2c_designware";
|
||||
info.name = TXGBE_I2C_CLK_DEV_NAME;
|
||||
info.id = pci_dev_id(pdev);
|
||||
|
||||
info.res = &DEFINE_RES_IRQ(pdev->irq);
|
||||
|
|
Loading…
Reference in a new issue