diff options
| author | Mark Brown <broonie@kernel.org> | 2022-01-10 13:00:14 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-01-10 13:00:14 +0000 |
| commit | 19629ae482f1800b50a5bdf2504ac57171d2bb82 (patch) | |
| tree | 95adcf1a66c8308de172808d59e05f90a9a764f5 | |
| parent | 44ea62813f0ab3d718de480504f4dfd0bdd01858 (diff) | |
| parent | 80bb73a9fbcde4ecc55e12f10c73fabbe68a24d1 (diff) | |
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.
| -rw-r--r-- | Documentation/devicetree/bindings/spi/spi-rockchip.yaml | 1 | ||||
| -rw-r--r-- | drivers/spi/spi-armada-3700.c | 2 | ||||
| -rw-r--r-- | drivers/spi/spi-uniphier.c | 11 |
3 files changed, 8 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/spi/spi-rockchip.yaml b/Documentation/devicetree/bindings/spi/spi-rockchip.yaml index 7f987e79337c..52a78a2e362e 100644 --- a/Documentation/devicetree/bindings/spi/spi-rockchip.yaml +++ b/Documentation/devicetree/bindings/spi/spi-rockchip.yaml @@ -33,6 +33,7 @@ properties: - rockchip,rk3328-spi - rockchip,rk3368-spi - rockchip,rk3399-spi + - rockchip,rk3568-spi - rockchip,rv1126-spi - const: rockchip,rk3066-spi diff --git a/drivers/spi/spi-armada-3700.c b/drivers/spi/spi-armada-3700.c index 46feafe4e201..d8cc4b270644 100644 --- a/drivers/spi/spi-armada-3700.c +++ b/drivers/spi/spi-armada-3700.c @@ -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: diff --git a/drivers/spi/spi-uniphier.c b/drivers/spi/spi-uniphier.c index 8900e51e1a1c..342ee8d2c476 100644 --- a/drivers/spi/spi-uniphier.c +++ b/drivers/spi/spi-uniphier.c @@ -767,12 +767,13 @@ out_master_put: 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); |