diff options
| author | Mark Brown <broonie@linaro.org> | 2013-06-26 11:21:02 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-06-26 11:21:02 -0400 |
| commit | 37553b9236d36cc9ca18f1e5633fda4ed48bc50d (patch) | |
| tree | a793cbf7738121db90810ed17f39dd544c7400c1 | |
| parent | 3d09da11b59ade74502b246782552f9cb1eb59bd (diff) | |
| parent | 5b547a75405184d54d148132b9e4600516c49c6e (diff) | |
Merge remote-tracking branch 'spi/topic/pl022' into spi-next
| -rw-r--r-- | drivers/spi/spi-pl022.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/spi/spi-pl022.c b/drivers/spi/spi-pl022.c index 371cc66f1a0e..3b246543282f 100644 --- a/drivers/spi/spi-pl022.c +++ b/drivers/spi/spi-pl022.c | |||
| @@ -2083,6 +2083,7 @@ pl022_platform_data_dt_get(struct device *dev) | |||
| 2083 | } | 2083 | } |
| 2084 | 2084 | ||
| 2085 | pd->bus_id = -1; | 2085 | pd->bus_id = -1; |
| 2086 | pd->enable_dma = 1; | ||
| 2086 | of_property_read_u32(np, "num-cs", &tmp); | 2087 | of_property_read_u32(np, "num-cs", &tmp); |
| 2087 | pd->num_chipselect = tmp; | 2088 | pd->num_chipselect = tmp; |
| 2088 | of_property_read_u32(np, "pl022,autosuspend-delay", | 2089 | of_property_read_u32(np, "pl022,autosuspend-delay", |