Skip to content

Commit 788bc43

Browse files
committed
Merge branch 'microchip-lan865x-fix-probing-issues'
Stefan Wahren says: ==================== microchip: lan865x: Fix probing issues Recently I setup a customer i.MX93 board which contains a LAN8651 chip. During this process I discovered some probing related issues. ==================== Link: https://patch.msgid.link/20250827115341.34608-1-wahrenst@gmx.net Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2 parents 0704a3d + ca47c44 commit 788bc43

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

drivers/net/ethernet/microchip/lan865x/lan865x.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -423,13 +423,16 @@ static void lan865x_remove(struct spi_device *spi)
423423
free_netdev(priv->netdev);
424424
}
425425

426-
static const struct spi_device_id spidev_spi_ids[] = {
426+
static const struct spi_device_id lan865x_ids[] = {
427427
{ .name = "lan8650" },
428+
{ .name = "lan8651" },
428429
{},
429430
};
431+
MODULE_DEVICE_TABLE(spi, lan865x_ids);
430432

431433
static const struct of_device_id lan865x_dt_ids[] = {
432434
{ .compatible = "microchip,lan8650" },
435+
{ .compatible = "microchip,lan8651" },
433436
{ /* Sentinel */ }
434437
};
435438
MODULE_DEVICE_TABLE(of, lan865x_dt_ids);
@@ -441,7 +444,7 @@ static struct spi_driver lan865x_driver = {
441444
},
442445
.probe = lan865x_probe,
443446
.remove = lan865x_remove,
444-
.id_table = spidev_spi_ids,
447+
.id_table = lan865x_ids,
445448
};
446449
module_spi_driver(lan865x_driver);
447450

drivers/net/ethernet/oa_tc6.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1249,7 +1249,8 @@ struct oa_tc6 *oa_tc6_init(struct spi_device *spi, struct net_device *netdev)
12491249

12501250
/* Set the SPI controller to pump at realtime priority */
12511251
tc6->spi->rt = true;
1252-
spi_setup(tc6->spi);
1252+
if (spi_setup(tc6->spi) < 0)
1253+
return NULL;
12531254

12541255
tc6->spi_ctrl_tx_buf = devm_kzalloc(&tc6->spi->dev,
12551256
OA_TC6_CTRL_SPI_BUF_SIZE,

0 commit comments

Comments
 (0)