]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
spi: amd: Set correct bus number in ACPI probe path
authorKrishnamoorthi M <krishnamoorthi.m@amd.com>
Thu, 7 May 2026 18:00:51 +0000 (23:30 +0530)
committerMark Brown <broonie@kernel.org>
Mon, 11 May 2026 00:29:12 +0000 (09:29 +0900)
On platforms where the HID2 SPI controller (AMDI0063) is enumerated via
ACPI instead of PCI, amd_spi_probe() unconditionally sets bus_num to 0,
while the PCI probe path assigns bus_num 2 for HID2 controller.

Align the ACPI probe path to use the same bus number so that userspace
and SPI client drivers see a consistent bus assignment regardless of the
enumeration method.

Fixes: b644c2776652 ("spi: spi_amd: Add PCI-based driver for AMD HID2 SPI controller")
Cc: stable@vger.kernel.org # v6.16+
Signed-off-by: Krishnamoorthi M <krishnamoorthi.m@amd.com>
Link: https://patch.msgid.link/20260507180051.4158674-1-krishnamoorthi.m@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
drivers/spi/spi-amd.c

index 4d1dce4f497406b17a8ea1f09f9040789e6795c0..71a6e5c475b0377251a0bbcfae2062bd06389edc 100644 (file)
@@ -868,7 +868,7 @@ static int amd_spi_probe(struct platform_device *pdev)
        dev_dbg(dev, "io_remap_address: %p\n", amd_spi->io_remap_addr);
 
        amd_spi->version = (uintptr_t)device_get_match_data(dev);
-       host->bus_num = 0;
+       host->bus_num = (amd_spi->version == AMD_HID2_SPI) ? 2 : 0;
 
        return amd_spi_probe_common(dev, host);
 }