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

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

Pull spi fixes from Mark Brown:
 "A small set of device specific fixes, the most major one is for the
  GXP driver which would probably have been confusing some callers with
  returning the length rather than 0 on successful writes"

* tag 'spi-fix-v6.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: spi-gxp: BUG: Correct spi write return value
  dt-bindings: spi: fsl-imx-cspi: Document missing entries
  spi: cs42l43: Remove spurious pm_runtime_disable
parents 5d959343 1a8196a9

Documentation/devicetree/bindings/spi/fsl-imx-cspi.yaml

+7 −0
Original line number Diff line number Diff line
@@ -22,6 +22,13 @@ properties: 
      - const: fsl,imx35-cspi

      - const: fsl,imx51-ecspi

      - const: fsl,imx53-ecspi

      - items:

          - enum:

              - fsl,imx25-cspi

              - fsl,imx50-cspi

              - fsl,imx51-cspi

              - fsl,imx53-cspi

          - const: fsl,imx35-cspi

      - items:

          - const: fsl,imx8mp-ecspi

          - const: fsl,imx6ul-ecspi

drivers/spi/spi-cs42l43.c

+0 −1
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ static int cs42l43_spi_probe(struct platform_device *pdev) 


	ret = devm_spi_register_controller(priv->dev, priv->ctlr);

	if (ret) {

		pm_runtime_disable(priv->dev);

		dev_err(priv->dev, "Failed to register SPI controller: %d\n", ret);

	}

drivers/spi/spi-gxp.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static ssize_t gxp_spi_write(struct gxp_spi_chip *chip, const struct spi_mem_op 
		return ret;

	}



	return write_len;

	return 0;

}



static int do_gxp_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op)