Unverified Commit 19629ae4 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-5.16' of... 

Merge branch 'for-5.16' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.17

One small fix that didn't get sent separately.
parents 44ea6281 80bb73a9

Documentation/devicetree/bindings/spi/spi-rockchip.yaml

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ properties: 
              - rockchip,rk3328-spi

              - rockchip,rk3368-spi

              - rockchip,rk3399-spi

              - rockchip,rk3568-spi

              - rockchip,rv1126-spi

          - const: rockchip,rk3066-spi

drivers/spi/spi-armada-3700.c

+1 −1
Original line number Diff line number Diff line
@@ -901,7 +901,7 @@ static int a3700_spi_probe(struct platform_device *pdev) 
	return 0;



error_clk:

	clk_disable_unprepare(spi->clk);

	clk_unprepare(spi->clk);

error:

	spi_master_put(master);

out:

drivers/spi/spi-uniphier.c

+6 −5
Original line number Diff line number Diff line
@@ -767,12 +767,13 @@ static int uniphier_spi_probe(struct platform_device *pdev) 


static int uniphier_spi_remove(struct platform_device *pdev)

{

	struct uniphier_spi_priv *priv = platform_get_drvdata(pdev);

	struct spi_master *master = platform_get_drvdata(pdev);

	struct uniphier_spi_priv *priv = spi_master_get_devdata(master);



	if (priv->master->dma_tx)

		dma_release_channel(priv->master->dma_tx);

	if (priv->master->dma_rx)

		dma_release_channel(priv->master->dma_rx);

	if (master->dma_tx)

		dma_release_channel(master->dma_tx);

	if (master->dma_rx)

		dma_release_channel(master->dma_rx);



	clk_disable_unprepare(priv->clk);