LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] spi: xilinx: Use standard num-cs binding
@ 2015-01-16 12:55 Michal Simek
  2015-02-12  9:45 ` Michal Simek
                   ` (2 more replies)
  0 siblings, 3 replies; 14+ messages in thread
From: Michal Simek @ 2015-01-16 12:55 UTC (permalink / raw)
  To: linux-kernel, monstr
  Cc: Mark Brown, Sören Brinkmann, linux-spi, linux-arm-kernel

[-- Attachment #1: Type: text/plain, Size: 953 bytes --]

Use standard num-cs binding property and setup
"xlnx,num-ss-bits" as deprecated.

Signed-off-by: Michal Simek <michal.simek@xilinx.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


[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

^ permalink raw reply	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2015-03-31 12:24 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-16 12:55 [PATCH] spi: xilinx: Use standard num-cs binding Michal Simek
2015-02-12  9:45 ` Michal Simek
     [not found] ` <CAHTX3dJRGhwo7FW+VJxfEJmx-9FdjFN5EnxG0RRDfMOm3=VU4A@mail.gmail.com>
2015-02-14  5:35   ` Mark Brown
2015-02-23 10:22     ` Michal Simek
2015-02-24 14:52       ` Mark Brown
2015-03-08 19:00 ` Mark Brown
2015-03-27 10:55   ` Michal Simek
2015-03-27 17:53     ` Mark Brown
2015-03-30  6:46       ` Michal Simek
2015-03-31  5:47         ` Mark Brown
2015-03-31  8:16           ` Michal Simek
2015-03-31 11:16             ` Mark Brown
2015-03-31 11:25               ` Michal Simek
2015-03-31 12:24                 ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).