linux-spi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] spi: xilinx: Use standard num-cs binding
@ 2015-01-16 12:55 Michal Simek
       [not found] ` <67f3c196833c427a489ca2c530d08987a6b5ee2a.1421412912.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
       [not found] ` <CAHTX3dJRGhwo7FW+VJxfEJmx-9FdjFN5EnxG0RRDfMOm3=VU4A@mail.gmail.com>
  0 siblings, 2 replies; 14+ messages in thread
From: Michal Simek @ 2015-01-16 12:55 UTC (permalink / raw)
  To: linux-kernel-u79uwXL29TY76Z2rM5mHXA,
	monstr-pSz03upnqPeHXe+LvDLADg
  Cc: Mark Brown, Sören Brinkmann,
	linux-spi-u79uwXL29TY76Z2rM5mHXA,
	linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r

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

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

Signed-off-by: Michal Simek <michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
---

 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 related	[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
     [not found] ` <67f3c196833c427a489ca2c530d08987a6b5ee2a.1421412912.git.michal.simek-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
2015-02-12  9:45   ` Michal Simek
2015-03-08 19:00   ` Mark Brown
2015-03-27 10:55     ` Michal Simek
     [not found]       ` <2a81c738-f7e2-4387-b04c-05c9892ba8e4-reflc3kr++MPoeFrVf1fn+hlVc3/7hDbVaz/vdPVXQ4@public.gmane.org>
2015-03-27 17:53         ` Mark Brown
     [not found]           ` <20150327175318.GG1743-GFdadSzt00ze9xe1eoZjHA@public.gmane.org>
2015-03-30  6:46             ` Michal Simek
     [not found]               ` <1bd88fda-314c-496a-ba8b-e9292f9c411b-neA4ZlFjCT3bHPOQ8RbMe2YJ4DzVTqeXkX/xN29GLwg@public.gmane.org>
2015-03-31  5:47                 ` Mark Brown
2015-03-31  8:16                   ` Michal Simek
     [not found]                     ` <74214fc9-e5e4-42db-bd85-51ed02975388-reflc3kr++MPoeFrVf1fn+hlVc3/7hDbVaz/vdPVXQ4@public.gmane.org>
2015-03-31 11:16                       ` Mark Brown
2015-03-31 11:25                         ` Michal Simek
     [not found]                           ` <98b110d7-f875-4bd5-98de-47641ac2134c-reflc3kr++MPoeFrVf1fn+hlVc3/7hDbVaz/vdPVXQ4@public.gmane.org>
2015-03-31 12:24                             ` Mark Brown
     [not found] ` <CAHTX3dJRGhwo7FW+VJxfEJmx-9FdjFN5EnxG0RRDfMOm3=VU4A@mail.gmail.com>
     [not found]   ` <CAHTX3dJRGhwo7FW+VJxfEJmx-9FdjFN5EnxG0RRDfMOm3=VU4A-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-02-14  5:35     ` Mark Brown
2015-02-23 10:22       ` Michal Simek
     [not found]         ` <54EAFF4A.1080605-pSz03upnqPeHXe+LvDLADg@public.gmane.org>
2015-02-24 14:52           ` 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).