Commit 9f7fb8de authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "There are quite a few fixes that have accumilated since the merge
  window here, all driver specific and none super urgent, plus a new
  device ID for the Rockchip driver"

* tag 'spi-fix-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: mediatek: Avoid NULL pointer crash in interrupt
  spi: dt-bindings: Fix 'reg' child node schema
  spi: bcm-qspi: check for valid cs before applying chip select
  spi: uniphier: fix reference count leak in uniphier_spi_probe()
  spi: meson-spicc: add IRQ check in meson_spicc_probe
  spi: uniphier: Fix a bug that doesn't point to private data correctly
  spi: change clk_disable_unprepare to clk_unprepare
  spi: spi-rockchip: Add rk3568-spi compatible
  spi: stm32: make SPI_MASTER_MUST_TX flags only specific to STM32F4
  spi: stm32: remove inexistant variables in struct stm32_spi_cfg comment
  spi: stm32-qspi: Update spi registering
parents 9e155101 f83a96e5

Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml

+3 −2
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ properties: 
    minItems: 1

    maxItems: 256

    items:

      minimum: 0

      items:

        - minimum: 0

          maximum: 256

    description:

      Chip select used by the device.

drivers/spi/spi-bcm-qspi.c

+1 −1
Original line number Diff line number Diff line
@@ -585,7 +585,7 @@ static void bcm_qspi_chip_select(struct bcm_qspi *qspi, int cs) 
	u32 rd = 0;

	u32 wr = 0;



	if (qspi->base[CHIP_SELECT]) {

	if (cs >= 0 && qspi->base[CHIP_SELECT]) {

		rd = bcm_qspi_read(qspi, CHIP_SELECT, 0);

		wr = (rd & ~0xff) | (1 << cs);

		if (rd == wr)

drivers/spi/spi-meson-spicc.c

+5 −0
Original line number Diff line number Diff line
@@ -693,6 +693,11 @@ static int meson_spicc_probe(struct platform_device *pdev) 
	writel_relaxed(0, spicc->base + SPICC_INTREG);



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		ret = irq;

		goto out_master;

	}



	ret = devm_request_irq(&pdev->dev, irq, meson_spicc_irq,

			       0, NULL, spicc);

	if (ret) {

drivers/spi/spi-mt65xx.c

+1 −1
Original line number Diff line number Diff line
@@ -624,7 +624,7 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id) 
	else

		mdata->state = MTK_SPI_IDLE;



	if (!master->can_dma(master, master->cur_msg->spi, trans)) {

	if (!master->can_dma(master, NULL, trans)) {

		if (trans->rx_buf) {

			cnt = mdata->xfer_len / 4;

			ioread32_rep(mdata->base + SPI_RX_DATA_REG,

drivers/spi/spi-stm32-qspi.c

+17 −30
Original line number Diff line number Diff line
@@ -688,7 +688,7 @@ static int stm32_qspi_probe(struct platform_device *pdev) 
	struct resource *res;

	int ret, irq;



	ctrl = spi_alloc_master(dev, sizeof(*qspi));

	ctrl = devm_spi_alloc_master(dev, sizeof(*qspi));

	if (!ctrl)

		return -ENOMEM;
@@ -697,58 +697,46 @@ static int stm32_qspi_probe(struct platform_device *pdev) 


	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi");

	qspi->io_base = devm_ioremap_resource(dev, res);

	if (IS_ERR(qspi->io_base)) {

		ret = PTR_ERR(qspi->io_base);

		goto err_master_put;

	}

	if (IS_ERR(qspi->io_base))

		return PTR_ERR(qspi->io_base);



	qspi->phys_base = res->start;



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_mm");

	qspi->mm_base = devm_ioremap_resource(dev, res);

	if (IS_ERR(qspi->mm_base)) {

		ret = PTR_ERR(qspi->mm_base);

		goto err_master_put;

	}

	if (IS_ERR(qspi->mm_base))

		return PTR_ERR(qspi->mm_base);



	qspi->mm_size = resource_size(res);

	if (qspi->mm_size > STM32_QSPI_MAX_MMAP_SZ) {

		ret = -EINVAL;

		goto err_master_put;

	}

	if (qspi->mm_size > STM32_QSPI_MAX_MMAP_SZ)

		return -EINVAL;



	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		ret = irq;

		goto err_master_put;

	}

	if (irq < 0)

		return irq;



	ret = devm_request_irq(dev, irq, stm32_qspi_irq, 0,

			       dev_name(dev), qspi);

	if (ret) {

		dev_err(dev, "failed to request irq\n");

		goto err_master_put;

		return ret;

	}



	init_completion(&qspi->data_completion);

	init_completion(&qspi->match_completion);



	qspi->clk = devm_clk_get(dev, NULL);

	if (IS_ERR(qspi->clk)) {

		ret = PTR_ERR(qspi->clk);

		goto err_master_put;

	}

	if (IS_ERR(qspi->clk))

		return PTR_ERR(qspi->clk);



	qspi->clk_rate = clk_get_rate(qspi->clk);

	if (!qspi->clk_rate) {

		ret = -EINVAL;

		goto err_master_put;

	}

	if (!qspi->clk_rate)

		return -EINVAL;



	ret = clk_prepare_enable(qspi->clk);

	if (ret) {

		dev_err(dev, "can not enable the clock\n");

		goto err_master_put;

		return ret;

	}



	rstc = devm_reset_control_get_exclusive(dev, NULL);
@@ -784,7 +772,7 @@ static int stm32_qspi_probe(struct platform_device *pdev) 
	pm_runtime_enable(dev);

	pm_runtime_get_noresume(dev);



	ret = devm_spi_register_master(dev, ctrl);

	ret = spi_register_master(ctrl);

	if (ret)

		goto err_pm_runtime_free;
@@ -806,8 +794,6 @@ static int stm32_qspi_probe(struct platform_device *pdev) 
	stm32_qspi_dma_free(qspi);

err_clk_disable:

	clk_disable_unprepare(qspi->clk);

err_master_put:

	spi_master_put(qspi->ctrl);



	return ret;

}
@@ -817,6 +803,7 @@ static int stm32_qspi_remove(struct platform_device *pdev) 
	struct stm32_qspi *qspi = platform_get_drvdata(pdev);



	pm_runtime_get_sync(qspi->dev);

	spi_unregister_master(qspi->ctrl);

	/* disable qspi */

	writel_relaxed(0, qspi->io_base + QSPI_CR);

	stm32_qspi_dma_free(qspi);