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: 5648411 Return-Path: X-Original-To: patchwork-linux-arm@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 8B687C058D for ; Fri, 16 Jan 2015 12:57:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C512F201B4 for ; Fri, 16 Jan 2015 12:57:22 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BF517200EC for ; Fri, 16 Jan 2015 12:57:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YC6RD-0000GS-Ju; Fri, 16 Jan 2015 12:55:43 +0000 Received: from mail-wg0-f53.google.com ([74.125.82.53]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YC6R8-000059-Ps for linux-arm-kernel@lists.infradead.org; Fri, 16 Jan 2015 12:55:39 +0000 Received: by mail-wg0-f53.google.com with SMTP id x13so20341737wgg.12 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=WirPIaOht4W6fwKAmSIs5W51azmR9jwKv51SVuf8T9RMJ53+xsU3TzF6ooDYVHPwqV GtPk1l3eNjFth+48oPnKongPG7zNh8vbLadd/Ane6rje7OEqMUNG1ZfCt3ln+P6RkSBs K48hwsFI22YjznvUxakDEq38IdkyNbdYD41jqF+1+ea35bU34DTVFYNlTc7dLFia4pbC S7DBq3Y+KQiMooNgdVlxnn0+Fdf3DqnNrgd2Pt2IqwZMunMf7RtJb9Duqy32YKccPD6v emakVsijaEk7HNR/+WQrtF/vgIHcCplh97+D43yS3rLOLRJxH/RH40CEribYLvzWMJgf nfoA== X-Gm-Message-State: ALoCoQlwil528bex3yGdPa3lIE8BIVWvQ6BUUegeFHwGyJLBgVnqlMPbrmpI8T2SPfu/BcIL0wOm 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 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 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150116_045539_032328_C28BD9F5 X-CRM114-Status: GOOD ( 12.69 ) X-Spam-Score: 3.3 (+++) Cc: Mark Brown , linux-arm-kernel@lists.infradead.org, =?UTF-8?q?S=C3=B6ren=20Brinkmann?= , linux-spi@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD,T_TVD_MIME_NO_HEADERS,UNPARSEABLE_RELAY autolearn=unavailable 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) {