diff options
Diffstat (limited to 'drivers/spi/spi-qup.c')
-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) | |||
498 | struct resource *res; | 498 | struct resource *res; |
499 | struct device *dev; | 499 | struct device *dev; |
500 | void __iomem *base; | 500 | void __iomem *base; |
501 | u32 max_freq, iomode; | 501 | u32 max_freq, iomode, num_cs; |
502 | int ret, irq, size; | 502 | int ret, irq, size; |
503 | 503 | ||
504 | dev = &pdev->dev; | 504 | dev = &pdev->dev; |
@@ -550,10 +550,11 @@ static int spi_qup_probe(struct platform_device *pdev) | |||
550 | } | 550 | } |
551 | 551 | ||
552 | /* use num-cs unless not present or out of range */ | 552 | /* use num-cs unless not present or out of range */ |
553 | if (of_property_read_u16(dev->of_node, "num-cs", | 553 | if (of_property_read_u32(dev->of_node, "num-cs", &num_cs) || |
554 | &master->num_chipselect) || | 554 | num_cs > SPI_NUM_CHIPSELECTS) |
555 | (master->num_chipselect > SPI_NUM_CHIPSELECTS)) | ||
556 | master->num_chipselect = SPI_NUM_CHIPSELECTS; | 555 | master->num_chipselect = SPI_NUM_CHIPSELECTS; |
556 | else | ||
557 | master->num_chipselect = num_cs; | ||
557 | 558 | ||
558 | master->bus_num = pdev->id; | 559 | master->bus_num = pdev->id; |
559 | master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP; | 560 | master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LOOP; |