| From | Greg Kroah-Hartman <> | Subject | [PATCH 3.19 64/75] spi: qup: Fix cs-num DT property parsing | Date | Fri, 10 Apr 2015 15:19:30 +0200 |
| |
3.19-stable review patch. If anyone has any objections, please let me know.
------------------
From: "Ivan T. Ivanov" <iivanov@mm-sol.com>
commit 12cb89e37a0c25fae7a0f1d2e4985558db9d0b13 upstream.
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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- drivers/spi/spi-qup.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
--- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c @@ -489,7 +489,7 @@ static int spi_qup_probe(struct platform 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 } /* 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;
|