diff options
| author |   Ivan T. Ivanov <iivanov@mm-sol.com> | 2015-03-06 17:26:17 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2015-03-07 11:00:51 +0000 |
| commit | 12cb89e37a0c25fae7a0f1d2e4985558db9d0b13 (patch) | |
| tree | 72b9375edd2701f478e14f61ac1733e75e5246d2 /drivers/spi | |
| parent | Linux 4.0-rc1 (diff) | |
| download | linux-dev-12cb89e37a0c25fae7a0f1d2e4985558db9d0b13.tar.xz linux-dev-12cb89e37a0c25fae7a0f1d2e4985558db9d0b13.zip | |
spi: qup: Fix cs-num DT property parsing
num-cs is 32 bit property, don't read just upper 16 bits.
Fixes: 4a8573abe965 (spi: qup: Remove chip select function)
Signed-off-by: Ivan T. Ivanov <iivanov@mm-sol.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable@vger.kernel.org
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/spi-qup.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index ff9cdbdb6672..2b2c359f5a50 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -498,7 +498,7 @@ static int spi_qup_probe(struct platform_device *pdev) struct resource *res; struct device *dev; void __iomem *base; - u32 max_freq, iomode; + u32 max_freq, iomode, num_cs; int ret, irq, size; dev = &pdev->dev; @@ -550,10 +550,11 @@ static int spi_qup_probe(struct platform_device *pdev) } /* use num-cs unless not present or out of range */ - if (of_property_read_u16(dev->of_node, "num-cs", - &master->num_chipselect) || - (master->num_chipselect > SPI_NUM_CHIPSELECTS)) + if (of_property_read_u32(dev->of_node, "num-cs", &num_cs) || + num_cs > SPI_NUM_CHIPSELECTS) master->num_chipselect = SPI_NUM_CHIPSELECTS; + else + master->num_chipselect = num_cs; master->bus_num = pdev->id; master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP; |