From patchwork Fri Aug 3 14:30:39 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 1271081 Return-Path: X-Original-To: patchwork-spi-devel-general@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by patchwork2.kernel.org (Postfix) with ESMTP id BFFD3DF25A for ; Fri, 3 Aug 2012 14:30:56 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=sfs-ml-3.v29.ch3.sourceforge.com) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1SxIu0-0003hr-54; Fri, 03 Aug 2012 14:30:56 +0000 Received: from sog-mx-2.v43.ch3.sourceforge.com ([172.29.43.192] helo=mx.sourceforge.net) by sfs-ml-3.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1SxItz-0003hj-Gj for spi-devel-general@lists.sourceforge.net; Fri, 03 Aug 2012 14:30:55 +0000 Received-SPF: pass (sog-mx-2.v43.ch3.sourceforge.com: domain of free-electrons.com designates 88.190.12.23 as permitted sender) client-ip=88.190.12.23; envelope-from=maxime.ripard@free-electrons.com; helo=mail.free-electrons.com; Received: from mail.free-electrons.com ([88.190.12.23]) by sog-mx-2.v43.ch3.sourceforge.com with esmtp (Exim 4.76) id 1SxIty-0007vF-SH for spi-devel-general@lists.sourceforge.net; Fri, 03 Aug 2012 14:30:55 +0000 Received: by mail.free-electrons.com (Postfix, from userid 106) id 532062C1; Fri, 3 Aug 2012 16:30:19 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-3.1 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 shortcircuit=no autolearn=ham version=3.3.1 Received: from localhost (col31-4-88-188-83-94.fbx.proxad.net [88.188.83.94]) by mail.free-electrons.com (Postfix) with ESMTPSA id 4DFCE15E; Fri, 3 Aug 2012 16:30:12 +0200 (CEST) From: Maxime Ripard To: marex@denx.de Subject: [PATCH] SPI: MXS: Allow to pass the SPI master bus number from the device tree Date: Fri, 3 Aug 2012 16:30:39 +0200 Message-Id: <1344004239-22868-1-git-send-email-maxime.ripard@free-electrons.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343076052-27312-1-git-send-email-marex@denx.de> References: <1343076052-27312-1-git-send-email-marex@denx.de> X-Spam-Score: -0.8 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. -1.5 SPF_CHECK_PASS SPF reports sender host as permitted sender for sender-domain -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record 0.8 AWL AWL: From: address is in the auto white-list X-Headers-End: 1SxIty-0007vF-SH Cc: fabio.estevam@freescale.com, cjb@laptop.org, broonie@opensource.wolfsonmicro.com, attila@kinali.ch, spi-devel-general@lists.sourceforge.net, shawn.guo@linaro.org, b29396@freescale.com, linux-arm-kernel@lists.infradead.org X-BeenThere: spi-devel-general@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux SPI core/device drivers discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: spi-devel-general-bounces@lists.sourceforge.net If you don't do it, the bus number will be a bogus value, possibly used for device file names in drivers like spidev. Signed-off-by: Maxime Ripard --- drivers/spi/spi-mxs.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/spi/spi-mxs.c b/drivers/spi/spi-mxs.c index d6a80a1..d6a73ef 100644 --- a/drivers/spi/spi-mxs.c +++ b/drivers/spi/spi-mxs.c @@ -527,6 +527,15 @@ static int __devinit mxs_spi_probe(struct platform_device *pdev) if (!master) return -ENOMEM; + if (pdev->id != -1) + master->bus_num = pdev->id; + if (np) { + unsigned long prop; + + of_property_read_u32(np, "cell-index", &prop); + master->bus_num = prop; + } + master->transfer_one_message = mxs_spi_transfer_one; master->setup = mxs_spi_setup; master->cleanup = mxs_spi_cleanup;