aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/spi/spi-xilinx.c14
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index a9b99a997f91..0b23408d357c 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -353,17 +353,9 @@ static int xilinx_spi_probe(struct platform_device *pdev)
353 if (pdata) { 353 if (pdata) {
354 num_cs = pdata->num_chipselect; 354 num_cs = pdata->num_chipselect;
355 bits_per_word = pdata->bits_per_word; 355 bits_per_word = pdata->bits_per_word;
356 } 356 } else {
357 357 of_property_read_u32(pdev->dev.of_node, "xlnx,num-ss-bits",
358 if (pdev->dev.of_node) { 358 &num_cs);
359 const __be32 *prop;
360 int len;
361
362 /* number of slave select bits is required */
363 prop = of_get_property(pdev->dev.of_node, "xlnx,num-ss-bits",
364 &len);
365 if (prop && len >= sizeof(*prop))
366 num_cs = __be32_to_cpup(prop);
367 } 359 }
368 360
369 if (!num_cs) { 361 if (!num_cs) {