Unverified Commit d4f3a651 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/for-5.9' into spi-linus

parents 549738f1 45f0bbda

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -16725,6 +16725,13 @@ S: Maintained 
F:	Documentation/devicetree/bindings/gpio/snps,dw-apb-gpio.yaml

F:	drivers/gpio/gpio-dwapb.c









SYNOPSYS DESIGNWARE APB SSI DRIVER









M:	Serge Semin <fancer.lancer@gmail.com>









L:	linux-spi@vger.kernel.org









S:	Supported









F:	Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml









F:	drivers/spi/spi-dw*

















SYNOPSYS DESIGNWARE AXI DMAC DRIVER









M:	Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>









S:	Maintained
































drivers/spi/spi-fsl-dspi.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -1281,6 +1281,9 @@ static int dspi_probe(struct platform_device *pdev)







	if (!ctlr)









		return -ENOMEM;



















	spi_controller_set_devdata(ctlr, dspi);









	platform_set_drvdata(pdev, dspi);



















	dspi->pdev = pdev;









	dspi->ctlr = ctlr;


















@@ -1417,8 +1420,6 @@ static int dspi_probe(struct platform_device *pdev)







	if (dspi->devtype_data->trans_mode != DSPI_DMA_MODE)









		ctlr->ptp_sts_supported = true;



















	platform_set_drvdata(pdev, dspi);



















	ret = spi_register_controller(ctlr);









	if (ret != 0) {









		dev_err(&pdev->dev, "Problem registering DSPI ctlr\n");
































drivers/spi/spi-imx.c



+4
−1






























Original line number
Diff line number
Diff line







@@ -1707,7 +1707,7 @@ static int spi_imx_probe(struct platform_device *pdev)







	ret = spi_bitbang_start(&spi_imx->bitbang);









	if (ret) {









		dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);









		goto out_runtime_pm_put;









		goto out_bitbang_start;









	}



















	dev_info(&pdev->dev, "probed\n");








@@ -1717,6 +1717,9 @@ static int spi_imx_probe(struct platform_device *pdev)

















	return ret;



















out_bitbang_start:









	if (spi_imx->devtype_data->has_dmamode)









		spi_imx_sdma_exit(spi_imx);









out_runtime_pm_put:









	pm_runtime_dont_use_autosuspend(spi_imx->dev);









	pm_runtime_put_sync(spi_imx->dev);