Commit c644920c authored by Duanqiang Wen's avatar Duanqiang Wen Committed by Jakub Kicinski

net: txgbe: fix i2c dev name cannot match clkdev

txgbe clkdev shortened clk_name, so i2c_dev info_name
also need to shorten. Otherwise, i2c_dev cannot initialize
clock.

Fixes: e30cef00 ("net: txgbe: fix clk_name exceed MAX_DEV_ID limits")
Signed-off-by: default avatarDuanqiang Wen <duanqiangwen@net-swift.com>
Link: https://lore.kernel.org/r/20240402021843.126192-1-duanqiangwen@net-swift.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 22c5e0bc
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
#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;
...@@ -571,8 +573,8 @@ static int txgbe_clock_register(struct txgbe *txgbe) ...@@ -571,8 +573,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), "i2c_dw.%d", snprintf(clk_name, sizeof(clk_name), "%s.%d",
pci_dev_id(pdev)); TXGBE_I2C_CLK_DEV_NAME, 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))
...@@ -634,7 +636,7 @@ static int txgbe_i2c_register(struct txgbe *txgbe) ...@@ -634,7 +636,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 = "i2c_designware"; info.name = TXGBE_I2C_CLK_DEV_NAME;
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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment