From patchwork Thu Mar 5 13:10:30 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 5945891 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 955AD9F373 for ; Thu, 5 Mar 2015 13:10:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CF4C620381 for ; Thu, 5 Mar 2015 13:10:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EF42E20380 for ; Thu, 5 Mar 2015 13:10:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754675AbbCENKi (ORCPT ); Thu, 5 Mar 2015 08:10:38 -0500 Received: from mail-qg0-f52.google.com ([209.85.192.52]:36029 "EHLO mail-qg0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753342AbbCENKh (ORCPT ); Thu, 5 Mar 2015 08:10:37 -0500 Received: by qgdz107 with SMTP id z107so4960310qgd.3 for ; Thu, 05 Mar 2015 05:10:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=WHrv7DO066iEpBEgkbCzWtKNR3aacxfpU0Njt7k87CM=; b=BFJOfdOWhUngJnkIrUIs9w3xobrcZ7A/uJF8hPKD3S7GANdnVpmiqWZ8ixPL80e2ZW 0P9xhe0iXYRnbSTfRbywDGa4haJql4WNJk56qICOg6VG5O7wdgt0GmKZVbAz/uK/GZWi +TJgCLeM4L6pR368oyAb6Yf/KR7rxM7Csz+Hcm9JEwNzT14W1oWfTNCFu1DFtkfFuq2i j49qakqAP4SeWYbHtLTnaWqDo2zfMyNIoic5lAgNIKY64LEXvT/MV8tS0uvv4zQW6ehj JZCzGn5fIm50VBJ4CpAf/Ph0MWWRMBJVm4osAsqxZMBIU6sGA5tU789uiIFMKTqADIMD /ddg== X-Gm-Message-State: ALoCoQk8a2pPq/2wtDaxzKn8+339Ar0PG4xC+nvaQpNViv0vQTSmC4mdoTzYWsmqsxUm8gAu47zP X-Received: by 10.140.19.82 with SMTP id 76mr11769107qgg.19.1425561037167; Thu, 05 Mar 2015 05:10:37 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by mx.google.com with ESMTPSA id g69sm2300933qkh.18.2015.03.05.05.10.34 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Thu, 05 Mar 2015 05:10:35 -0800 (PST) From: Michal Simek To: linux-kernel@vger.kernel.org, monstr@monstr.eu Cc: Mark Brown , =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-spi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [RESENT PATCH] spi: xilinx: Use standard num-cs binding Date: Thu, 5 Mar 2015 14:10:30 +0100 Message-Id: <1777fd49a103237c7ac0ebca434b33509e1b843f.1425561027.git.michal.simek@xilinx.com> X-Mailer: git-send-email 1.8.2.3 Sender: linux-spi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-spi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use standard num-cs binding property and setup "xlnx,num-ss-bits" as deprecated. Signed-off-by: Michal Simek --- 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 133f53a9c1d4..69313407b690 100644 --- a/drivers/spi/spi-xilinx.c +++ b/drivers/spi/spi-xilinx.c @@ -374,8 +374,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) {