From patchwork Mon Jul 26 22:59:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anatolij Gustschin X-Patchwork-Id: 114365 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o6QN0G87024139 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Mon, 26 Jul 2010 23:00:52 GMT Received: from localhost ([127.0.0.1] helo=sfs-ml-2.v29.ch3.sourceforge.com) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OdWeb-0005TT-NG; Mon, 26 Jul 2010 23:00:13 +0000 Received: from sfi-mx-3.v28.ch3.sourceforge.com ([172.29.28.123] helo=mx.sourceforge.net) by sfs-ml-2.v29.ch3.sourceforge.com with esmtp (Exim 4.69) (envelope-from ) id 1OdWeZ-0005TK-U4 for spi-devel-general@lists.sourceforge.net; Mon, 26 Jul 2010 23:00:11 +0000 X-ACL-Warn: Received: from mail-out.m-online.net ([212.18.0.10]) by sfi-mx-3.v28.ch3.sourceforge.com with esmtp (Exim 4.69) id 1OdWeX-0005Hi-JN for spi-devel-general@lists.sourceforge.net; Mon, 26 Jul 2010 23:00:11 +0000 Received: from frontend1.mail.m-online.net (unknown [192.168.8.180]) by mail-out.m-online.net (Postfix) with ESMTP id 6E6971C002D0; Tue, 27 Jul 2010 01:00:03 +0200 (CEST) X-Auth-Info: RzZoFFBB3npf/IllD3cP0PfXoaaXZ95We+V/7w7WWww= Received: from localhost (p4FE3F5B0.dip.t-dialin.net [79.227.245.176]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA id 3CAF61C000F7; Tue, 27 Jul 2010 01:00:03 +0200 (CEST) From: Anatolij Gustschin To: spi-devel-general@lists.sourceforge.net Date: Tue, 27 Jul 2010 00:59:38 +0200 Message-Id: <1280185178-5002-1-git-send-email-agust@denx.de> X-Mailer: git-send-email 1.7.0.4 X-Spam-Score: 0.0 (/) X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. _SUMMARY_ X-Headers-End: 1OdWeX-0005Hi-JN Cc: David Brownell , Anatolij Gustschin Subject: [spi-devel-general] [PATCH] spi/mpc5121: register spi child devices of spi node 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Mon, 26 Jul 2010 23:00:53 +0000 (UTC) diff --git a/drivers/spi/mpc512x_psc_spi.c b/drivers/spi/mpc512x_psc_spi.c index c8d69fc..39e5faf 100644 --- a/drivers/spi/mpc512x_psc_spi.c +++ b/drivers/spi/mpc512x_psc_spi.c @@ -27,6 +27,7 @@ #include #include #include +#include #include struct mpc512x_psc_spi { @@ -511,6 +512,7 @@ static int __devinit mpc512x_psc_spi_of_probe(struct of_device *op, const u32 *regaddr_p; u64 regaddr64, size64; s16 id = -1; + int ret; regaddr_p = of_get_address(op->dev.of_node, 0, &size64, NULL); if (!regaddr_p) { @@ -533,8 +535,14 @@ static int __devinit mpc512x_psc_spi_of_probe(struct of_device *op, id = *psc_nump; } - return mpc512x_psc_spi_do_probe(&op->dev, (u32) regaddr64, (u32) size64, + ret = mpc512x_psc_spi_do_probe(&op->dev, (u32) regaddr64, (u32) size64, irq_of_parse_and_map(op->dev.of_node, 0), id); + + if (!ret) + of_register_spi_devices(dev_get_drvdata(&op->dev), + op->dev.of_node); + + return ret; } static int __devexit mpc512x_psc_spi_of_remove(struct of_device *op)