diff options
| author | Ivan T. Ivanov <iivanov@mm-sol.com> | 2015-03-06 17:26:17 +0200 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2015-04-16 20:13:12 -0400 |
| commit | 7cc582d4ae5dd15351fdb9cd7e0e34462b09c2f9 (patch) | |
| tree | b5426b23a409c476b193f849427bfa25bde49a04 | |
| parent | c280422c2775755ffd3ca1c078ae3acb52752e25 (diff) | |
| download | lwn-7cc582d4ae5dd15351fdb9cd7e0e34462b09c2f9.tar.gz lwn-7cc582d4ae5dd15351fdb9cd7e0e34462b09c2f9.zip | |
spi: qup: Fix cs-num DT property parsing
[ Upstream commit 12cb89e37a0c25fae7a0f1d2e4985558db9d0b13 ]
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
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -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 9f83d2950748..6976f8aa8562 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -489,7 +489,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; @@ -541,10 +541,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; |