Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config.local/amd64/config.sonic
Original file line number Diff line number Diff line change
Expand Up @@ -166,8 +166,11 @@ CONFIG_SENSORS_INA3221=m
CONFIG_RTC_DRV_DS1307=m
CONFIG_SENSORS_TMP464=m
# For Nexthop
CONFIG_I2C_XILINX=m
CONFIG_PCI_STUB=y
CONFIG_SENSORS_ADM1266=m
CONFIG_SENSORS_TMP464=m
CONFIG_SPI_XILINX=m

CONFIG_AMD_MEM_ENCRYPT=n
# Unset X86_PAT according to Broadcom's requirement
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
From 61b8e5e26ebe493834f351e55a477575d6ae55c0 Mon Sep 17 00:00:00 2001
From: Domingo <domingo@nexthop.ai>
Date: Mon, 26 Jan 2026 23:39:29 +0000
Subject: [PATCH] Read i2c bus number from platform device id

This is similar to drivers/i2c/busses/i2c-pxa.c and drivers/i2c/busses/i2c-imx.c
---
drivers/i2c/busses/i2c-xiic.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c
index 1d68177241a6..e0737ad1897d 100644
--- a/drivers/i2c/busses/i2c-xiic.c
+++ b/drivers/i2c/busses/i2c-xiic.c
@@ -1262,6 +1262,7 @@ static int xiic_i2c_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, i2c);
i2c->adap = xiic_adapter;
i2c_set_adapdata(&i2c->adap, i2c);
+ i2c->adap.nr = pdev->id;
i2c->adap.dev.parent = &pdev->dev;
i2c->adap.dev.of_node = pdev->dev.of_node;
snprintf(i2c->adap.name, sizeof(i2c->adap.name),
@@ -1319,7 +1320,7 @@ static int xiic_i2c_probe(struct platform_device *pdev)
}

/* add i2c adapter to i2c tree */
- ret = i2c_add_adapter(&i2c->adap);
+ ret = i2c_add_numbered_adapter(&i2c->adap);
if (ret) {
xiic_deinit(i2c);
goto err_pm_disable;
--
2.43.0

25 changes: 25 additions & 0 deletions patches-sonic/0004-xilinx-spi-platform_get_irq_optional.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
From 7b32abed3ac9eb578e81cece63a508d7a24e2f7d Mon Sep 17 00:00:00 2001
From: Domingo <domingo@nexthop.ai>
Date: Mon, 2 Feb 2026 22:57:51 +0000
Subject: [PATCH] platform_get_irq_optional

---
drivers/spi/spi-xilinx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index f5e41813b958..e124d7e01c47 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -470,7 +470,7 @@ static int xilinx_spi_probe(struct platform_device *pdev)
xspi->bytes_per_word = bits_per_word / 8;
xspi->buffer_size = xilinx_spi_find_buffer_size(xspi);

- xspi->irq = platform_get_irq(pdev, 0);
+ xspi->irq = platform_get_irq_optional(pdev, 0);
if (xspi->irq < 0 && xspi->irq != -ENXIO) {
return xspi->irq;
} else if (xspi->irq >= 0) {
--
2.43.0

6 changes: 6 additions & 0 deletions patches-sonic/kconfig-inclusions
Comment thread
domingo-nexthop marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,12 @@ CONFIG_SPI_GPIO=m
CONFIG_SENSORS_INA3221=m
# For Nokia
CONFIG_RTC_DRV_DS1307=m
# For Nexthop
CONFIG_I2C_XILINX=m
CONFIG_PCI_STUB=y
CONFIG_SENSORS_ADM1266=m
CONFIG_SENSORS_TMP464=m
CONFIG_SPI_XILINX=m

[arm64]
# For enabling SDEI
Expand Down
2 changes: 2 additions & 0 deletions patches-sonic/series
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,8 @@ cisco-npu-disable-other-bars.patch
# Nexthop patches
0001-x86-CPU-AMD-Print-the-reason-for-the-last-reset.patch
0002-x86-CPU-AMD-Ignore-invalid-reset-reason-value.patch
0003-i2c-xiic-read-i2c-bus-number-from-platform-device-id.patch
0004-xilinx-spi-platform_get_irq_optional.patch

# Fix to avoid kernel panic on Kernel 6.1.94
# https://github.com/sonic-net/sonic-buildimage/issues/20901
Expand Down