projects
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d4f3a65
855a40c
)
Merge remote-tracking branch 'spi/for-5.10' into spi-next
author
Mark Brown
<broonie@kernel.org>
Fri, 9 Oct 2020 15:01:22 +0000
(16:01 +0100)
committer
Mark Brown
<broonie@kernel.org>
Fri, 9 Oct 2020 15:01:22 +0000
(16:01 +0100)
1
2
Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
patch
|
diff1
|
diff2
|
blob
|
history
drivers/spi/spi-cadence-quadspi.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/spi/spi-fsl-dspi.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/spi/spi-fsl-espi.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/spi/spi-imx.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/spi/spi-stm32.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Documentation/devicetree/bindings/spi/brcm,spi-bcm-qspi.txt
Simple merge
diff --cc
drivers/spi/spi-cadence-quadspi.c
Simple merge
diff --cc
drivers/spi/spi-fsl-dspi.c
Simple merge
diff --cc
drivers/spi/spi-fsl-espi.c
Simple merge
diff --cc
drivers/spi/spi-imx.c
index e38e5ad3c70680cbe620124bc91dc9f3d83acffc,5158c48bd4dbb414087e6333957b3ff8a7ed931a..060b1f5c9b048bbc85139d64b88586dd2bd88bec
---
1
/
drivers/spi/spi-imx.c
---
2
/
drivers/spi/spi-imx.c
+++ b/
drivers/spi/spi-imx.c
@@@
-1707,11
-1709,9
+1709,9
@@@
static int spi_imx_probe(struct platfor
ret = spi_bitbang_start(&spi_imx->bitbang);
if (ret) {
dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);
- goto out_
runtime_pm_pu
t;
+ goto out_
bitbang_star
t;
}
- dev_info(&pdev->dev, "probed\n");
-
pm_runtime_mark_last_busy(spi_imx->dev);
pm_runtime_put_autosuspend(spi_imx->dev);
diff --cc
drivers/spi/spi-stm32.c
Simple merge