Commit c133687c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull spi fixes from Mark Brown:
 "One new device ID, plus a few fixes.

  The most substantial of the fixes is for the Cadence driver which in
  at least some instantiations requires transmit data to drive data
  through the IP"

* tag 'spi-fix-v6.19-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: intel-pci: Add support for Nova Lake SPI serial flash
  spi: spi-cadence: enable SPI_CONTROLLER_MUST_TX
  spi: hisi-kunpeng: Fixed the wrong debugfs node name in hisi_spi debugfs initialization
  spi: spi-sprd-adi: Fix double free in probe error path
parents 346c5583 caa32964

drivers/spi/spi-cadence.c

+1 −0
Original line number Diff line number Diff line
@@ -729,6 +729,7 @@ static int cdns_spi_probe(struct platform_device *pdev) 
	ctlr->unprepare_transfer_hardware = cdns_unprepare_transfer_hardware;

	ctlr->mode_bits = SPI_CPOL | SPI_CPHA;

	ctlr->bits_per_word_mask = SPI_BPW_MASK(8);

	ctlr->flags = SPI_CONTROLLER_MUST_TX;



	if (of_device_is_compatible(pdev->dev.of_node, "cix,sky1-spi-r1p6"))

		ctlr->bits_per_word_mask |= SPI_BPW_MASK(16) | SPI_BPW_MASK(32);

drivers/spi/spi-hisi-kunpeng.c

+1 −3
Original line number Diff line number Diff line
@@ -161,10 +161,8 @@ static const struct debugfs_reg32 hisi_spi_regs[] = { 
static int hisi_spi_debugfs_init(struct hisi_spi *hs)

{

	char name[32];

	struct spi_controller *host = dev_get_drvdata(hs->dev);



	struct spi_controller *host;



	host = container_of(hs->dev, struct spi_controller, dev);

	snprintf(name, 32, "hisi_spi%d", host->bus_num);

	hs->debugfs = debugfs_create_dir(name, NULL);

	if (IS_ERR(hs->debugfs))

drivers/spi/spi-intel-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ static const struct pci_device_id intel_spi_pci_ids[] = { 
	{ PCI_VDEVICE(INTEL, 0x54a4), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x5794), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x5825), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x6e24), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x7723), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x7a24), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x7aa4), (unsigned long)&cnl_info },

drivers/spi/spi-sprd-adi.c

+10 −23
Original line number Diff line number Diff line
@@ -528,7 +528,7 @@ static int sprd_adi_probe(struct platform_device *pdev) 
	pdev->id = of_alias_get_id(np, "spi");

	num_chipselect = of_get_child_count(np);



	ctlr = spi_alloc_host(&pdev->dev, sizeof(struct sprd_adi));

	ctlr = devm_spi_alloc_host(&pdev->dev, sizeof(struct sprd_adi));

	if (!ctlr)

		return -ENOMEM;
@@ -536,10 +536,8 @@ static int sprd_adi_probe(struct platform_device *pdev) 
	sadi = spi_controller_get_devdata(ctlr);



	sadi->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res);

	if (IS_ERR(sadi->base)) {

		ret = PTR_ERR(sadi->base);

		goto put_ctlr;

	}

	if (IS_ERR(sadi->base))

		return PTR_ERR(sadi->base);



	sadi->slave_vbase = (unsigned long)sadi->base +

			    data->slave_offset;
@@ -551,18 +549,15 @@ static int sprd_adi_probe(struct platform_device *pdev) 
	if (ret > 0 || (IS_ENABLED(CONFIG_HWSPINLOCK) && ret == 0)) {

		sadi->hwlock =

			devm_hwspin_lock_request_specific(&pdev->dev, ret);

		if (!sadi->hwlock) {

			ret = -ENXIO;

			goto put_ctlr;

		}

		if (!sadi->hwlock)

			return -ENXIO;

	} else {

		switch (ret) {

		case -ENOENT:

			dev_info(&pdev->dev, "no hardware spinlock supplied\n");

			break;

		default:

			dev_err_probe(&pdev->dev, ret, "failed to find hwlock id\n");

			goto put_ctlr;

			return dev_err_probe(&pdev->dev, ret, "failed to find hwlock id\n");

		}

	}
@@ -579,26 +574,18 @@ static int sprd_adi_probe(struct platform_device *pdev) 
	ctlr->transfer_one = sprd_adi_transfer_one;



	ret = devm_spi_register_controller(&pdev->dev, ctlr);

	if (ret) {

		dev_err(&pdev->dev, "failed to register SPI controller\n");

		goto put_ctlr;

	}

	if (ret)

		return dev_err_probe(&pdev->dev, ret, "failed to register SPI controller\n");



	if (sadi->data->restart) {

		ret = devm_register_restart_handler(&pdev->dev,

						    sadi->data->restart,

						    sadi);

		if (ret) {

			dev_err(&pdev->dev, "can not register restart handler\n");

			goto put_ctlr;

		}

		if (ret)

			return dev_err_probe(&pdev->dev, ret, "can not register restart handler\n");

	}



	return 0;



put_ctlr:

	spi_controller_put(ctlr);

	return ret;

}



static struct sprd_adi_data sc9860_data = {