Skip to content

Commit 9ed22ae

Browse files
committed
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
2 parents 5d95934 + 1a8196a commit 9ed22ae

File tree

3 files changed

+8
-2
lines changed

3 files changed

+8
-2
lines changed

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ properties:
2222
- const: fsl,imx35-cspi
2323
- const: fsl,imx51-ecspi
2424
- const: fsl,imx53-ecspi
25+
- items:
26+
- enum:
27+
- fsl,imx25-cspi
28+
- fsl,imx50-cspi
29+
- fsl,imx51-cspi
30+
- fsl,imx53-cspi
31+
- const: fsl,imx35-cspi
2532
- items:
2633
- const: fsl,imx8mp-ecspi
2734
- const: fsl,imx6ul-ecspi

drivers/spi/spi-cs42l43.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ static int cs42l43_spi_probe(struct platform_device *pdev)
256256

257257
ret = devm_spi_register_controller(priv->dev, priv->ctlr);
258258
if (ret) {
259-
pm_runtime_disable(priv->dev);
260259
dev_err(priv->dev, "Failed to register SPI controller: %d\n", ret);
261260
}
262261

drivers/spi/spi-gxp.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ static ssize_t gxp_spi_write(struct gxp_spi_chip *chip, const struct spi_mem_op
194194
return ret;
195195
}
196196

197-
return write_len;
197+
return 0;
198198
}
199199

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

0 commit comments

Comments
 (0)