[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <67f3c196833c427a489ca2c530d08987a6b5ee2a.1421412912.git.michal.simek@xilinx.com>
Date: Fri, 16 Jan 2015 13:55:14 +0100
From: Michal Simek <michal.simek@...inx.com>
To: linux-kernel@...r.kernel.org, monstr@...str.eu
Cc: Mark Brown <broonie@...nel.org>,
Sören Brinkmann <soren.brinkmann@...inx.com>,
linux-spi@...r.kernel.org, linux-arm-kernel@...ts.infradead.org
Subject: [PATCH] spi: xilinx: Use standard num-cs binding
Use standard num-cs binding property and setup
"xlnx,num-ss-bits" as deprecated.
Signed-off-by: Michal Simek <michal.simek@...inx.com>
---
drivers/spi/spi-xilinx.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/drivers/spi/spi-xilinx.c b/drivers/spi/spi-xilinx.c
index 79bd84f43430..30e5180195bb 100644
--- a/drivers/spi/spi-xilinx.c
+++ b/drivers/spi/spi-xilinx.c
@@ -338,8 +338,15 @@ static int xilinx_spi_probe(struct platform_device *pdev)
num_cs = pdata->num_chipselect;
bits_per_word = pdata->bits_per_word;
} else {
- of_property_read_u32(pdev->dev.of_node, "xlnx,num-ss-bits",
- &num_cs);
+ if (of_property_read_u32(pdev->dev.of_node, "num-cs",
+ &num_cs)) {
+ if (!of_property_read_u32(pdev->dev.of_node,
+ "xlnx,num-ss-bits",
+ &num_cs)) {
+ dev_err(&pdev->dev,
+ "property name 'xlnx,num-ss-bits' is deprecated.\n");
+ }
+ }
}
if (!num_cs) {
--
1.8.2.3
Content of type "application/pgp-signature" skipped
Powered by blists - more mailing lists