From patchwork Fri Jan 16 12:55:14 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Simek X-Patchwork-Id: 5648351 Return-Path: X-Original-To: patchwork-linux-spi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 02E03C058D for ; Fri, 16 Jan 2015 12:55:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 52324201B4 for ; Fri, 16 Jan 2015 12:55:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ABAD1201C0 for ; Fri, 16 Jan 2015 12:55:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752110AbbAPMzT (ORCPT ); Fri, 16 Jan 2015 07:55:19 -0500 Received: from mail-we0-f178.google.com ([74.125.82.178]:53714 "EHLO mail-we0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751858AbbAPMzS (ORCPT ); Fri, 16 Jan 2015 07:55:18 -0500 Received: by mail-we0-f178.google.com with SMTP id p10so20062515wes.9 for ; Fri, 16 Jan 2015 04:55:16 -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 :content-type; bh=KqNiltx32S7WL8V+3NlaFAaQ0sAA30FhtDBTy/6rxn8=; b=fNNsUA9J+GD/53mNm5uuyLXsLqar3eIRX5FK7IYs05PhsNb5hodZbwHlVzSMn6cS0o oPy16amDhdWU5QtUcqJZ6eHLJwq7sL/dDTLDoiNNK3Bc5PsoAjk3k+NtKADNAlsWzk7o KfBI7/qTI1YBQDZmbDNLsXp67hUKggp1wNuMGuvYOAX925wc17jZ60L50/EqJBol/SPy 7Xfa/Qzh2Srf9YM6vR5fMfg6mTEwCJccud5bBnYOFfhS6ihGiLs+NYx6jt7tgbFd54VO Uri7b0h7uOvW5KFj/dG2UZLrMvMKrL9kVvdbmaI//WecmgddbK9gF5UKYoewz7RwAj7k YCwQ== X-Gm-Message-State: ALoCoQlMhsHBi7sv12WfvpR9Z8xVJNFzZKqfgf+ynvqmk1gEhtRFmzI+oz+B2cxX3pxKoSr1h/lD X-Received: by 10.194.175.202 with SMTP id cc10mr29270838wjc.27.1421412916795; Fri, 16 Jan 2015 04:55:16 -0800 (PST) Received: from localhost (nat-35.starnet.cz. [178.255.168.35]) by mx.google.com with ESMTPSA id fo2sm2917424wib.10.2015.01.16.04.55.15 (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Fri, 16 Jan 2015 04:55:16 -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: [PATCH] spi: xilinx: Use standard num-cs binding Date: Fri, 16 Jan 2015 13:55:14 +0100 Message-Id: <67f3c196833c427a489ca2c530d08987a6b5ee2a.1421412912.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=-4.2 required=5.0 tests=BAYES_00, MIME_HEADER_CTYPE_ONLY, MIME_NO_TEXT, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, T_TVD_MIME_EPI, T_TVD_MIME_NO_HEADERS, 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(-) -- 1.8.2.3 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) {