projects
/
platform
/
upstream
/
kernel-adaptation-pc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f4e9758
237ce46
)
Merge remote-tracking branch 'spi/topic/sirf' into spi-next
author
Mark Brown
<broonie@linaro.org>
Wed, 26 Jun 2013 15:21:04 +0000
(16:21 +0100)
committer
Mark Brown
<broonie@linaro.org>
Wed, 26 Jun 2013 15:21:04 +0000
(16:21 +0100)
1
2
drivers/spi/spi-sirf.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/spi/spi-sirf.c
index
e262736
,
e00b437
..
fc20bcf
---
1
/
drivers/spi/spi-sirf.c
---
2
/
drivers/spi/spi-sirf.c
+++ b/
drivers/spi/spi-sirf.c
@@@
-554,15
-540,8
+538,10
@@@
static int spi_sirfsoc_probe(struct pla
sspi->bitbang.txrx_bufs = spi_sirfsoc_transfer;
sspi->bitbang.master->setup = spi_sirfsoc_setup;
master->bus_num = pdev->id;
+ master->bits_per_word_mask = SPI_BPW_MASK(8) | SPI_BPW_MASK(12) |
+ SPI_BPW_MASK(16) | SPI_BPW_MASK(32);
sspi->bitbang.master->dev.of_node = pdev->dev.of_node;
- sspi->p = pinctrl_get_select_default(&pdev->dev);
- ret = IS_ERR(sspi->p);
- if (ret)
- goto free_master;
-
sspi->clk = clk_get(&pdev->dev, NULL);
if (IS_ERR(sspi->clk)) {
ret = -EINVAL;