tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'spi-fix-v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi

Pull spi fixes from Mark Brown:
"A few small driver specific fixes and device ID updates for SPI.

The Apple change flags the driver as being compatible with the core's
GPIO chip select support, fixing support for some systems"

* tag 'spi-fix-v6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: omap2-mcspi: Fix the IS_ERR() bug for devm_clk_get_optional_enabled()
spi: intel: Add Panther Lake SPI controller support
spi: apple: Set use_gpio_descriptors to true
spi: mpc52xx: Add cancel_work_sync before module remove

Linus Torvalds b60500e9 35b7b337

+7 -3
+1
drivers/spi/spi-apple.c
··· 493 493 ctlr->prepare_message = apple_spi_prepare_message; 494 494 ctlr->set_cs = apple_spi_set_cs; 495 495 ctlr->transfer_one = apple_spi_transfer_one; 496 + ctlr->use_gpio_descriptors = true; 496 497 ctlr->auto_runtime_pm = true; 497 498 498 499 pm_runtime_set_active(&pdev->dev);
+2
drivers/spi/spi-intel-pci.c
··· 86 86 { PCI_VDEVICE(INTEL, 0xa324), (unsigned long)&cnl_info }, 87 87 { PCI_VDEVICE(INTEL, 0xa3a4), (unsigned long)&cnl_info }, 88 88 { PCI_VDEVICE(INTEL, 0xa823), (unsigned long)&cnl_info }, 89 + { PCI_VDEVICE(INTEL, 0xe323), (unsigned long)&cnl_info }, 90 + { PCI_VDEVICE(INTEL, 0xe423), (unsigned long)&cnl_info }, 89 91 { }, 90 92 }; 91 93 MODULE_DEVICE_TABLE(pci, intel_spi_pci_ids);
+1
drivers/spi/spi-mpc52xx.c
··· 520 520 struct mpc52xx_spi *ms = spi_controller_get_devdata(host); 521 521 int i; 522 522 523 + cancel_work_sync(&ms->work); 523 524 free_irq(ms->irq0, ms); 524 525 free_irq(ms->irq1, ms); 525 526
+3 -3
drivers/spi/spi-omap2-mcspi.c
··· 1561 1561 } 1562 1562 1563 1563 mcspi->ref_clk = devm_clk_get_optional_enabled(&pdev->dev, NULL); 1564 - if (mcspi->ref_clk) 1565 - mcspi->ref_clk_hz = clk_get_rate(mcspi->ref_clk); 1566 - else 1564 + if (IS_ERR(mcspi->ref_clk)) 1567 1565 mcspi->ref_clk_hz = OMAP2_MCSPI_MAX_FREQ; 1566 + else 1567 + mcspi->ref_clk_hz = clk_get_rate(mcspi->ref_clk); 1568 1568 ctlr->max_speed_hz = mcspi->ref_clk_hz; 1569 1569 ctlr->min_speed_hz = mcspi->ref_clk_hz >> 15; 1570 1570