From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: Re: [PATCH v2] spi/imx: Fix spi-imx when the hardware SPI chipselects are used Date: Thu, 15 Sep 2011 15:01:08 -0600 Message-ID: <20110915210108.GG3523@ponder.secretlab.ca> References: <1316111337-13485-1-git-send-email-fabio.estevam@freescale.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Cc: shawn.guo@freescale.com, spi-devel-general@lists.sourceforge.net, kernel@pengutronix.de, linux-arm-kernel@lists.infradead.org To: Fabio Estevam Return-path: Content-Disposition: inline In-Reply-To: <1316111337-13485-1-git-send-email-fabio.estevam@freescale.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=m.gmane.org@lists.infradead.org List-Id: linux-spi.vger.kernel.org On Thu, Sep 15, 2011 at 03:28:57PM -0300, Fabio Estevam wrote: > commit 22a85e4cd51 (spi/imx: add device tree probe support) broke spi-imx usage > when the SPI chipselect is the one internal to the controller. > > On a mx31pdk board the following error is seen: > > Registering mxc_nand as whole device > ------------[ cut here ]------------ > WARNING: at drivers/gpio/gpiolib.c:101 gpio_ensure_requested+0x4c/0xf4() > autorequest GPIO-0 > Modules linked in: > [] (unwind_backtrace+0x0/0xf4) from [] (warn_slowpath_common+0x4c/0x64) > [] (warn_slowpath_common+0x4c/0x64) from [] (warn_slowpath_fmt+0x30/0x40) > [] (warn_slowpath_fmt+0x30/0x40) from [] (gpio_ensure_requested+0x4c/0xf4) > [] (gpio_ensure_requested+0x4c/0xf4) from [] (gpio_direction_output+0xa0/0x138) > [] (gpio_direction_output+0xa0/0x138) from [] (spi_imx_setup+0x38/0x4c) > [] (spi_imx_setup+0x38/0x4c) from [] (spi_setup+0x38/0x50) > [] (spi_setup+0x38/0x50) from [] (spi_add_device+0x94/0x124) > [] (spi_add_device+0x94/0x124) from [] (spi_new_device+0x74/0xac) > [] (spi_new_device+0x74/0xac) from [] (spi_match_master_to_boardinfo+0x20/0x40) > [] (spi_match_master_to_boardinfo+0x20/0x40) from [] (spi_register_master+0xb0/0x104) > [] (spi_register_master+0xb0/0x104) from [] (spi_bitbang_start+0x104/0x17c) > [] (spi_bitbang_start+0x104/0x17c) from [] (spi_imx_probe+0x2fc/0x404) > [] (spi_imx_probe+0x2fc/0x404) from [] (platform_drv_probe+0x18/0x1c) > [] (platform_drv_probe+0x18/0x1c) from [] (driver_probe_device+0x78/0x174) > [] (driver_probe_device+0x78/0x174) from [] (__driver_attach+0x8c/0x90) > [] (__driver_attach+0x8c/0x90) from [] (bus_for_each_dev+0x60/0x8c) > [] (bus_for_each_dev+0x60/0x8c) from [] (bus_add_driver+0xa0/0x288) > [] (bus_add_driver+0xa0/0x288) from [] (driver_register+0x78/0x18c) > [] (driver_register+0x78/0x18c) from [] (do_one_initcall+0x34/0x178) > [] (do_one_initcall+0x34/0x178) from [] (kernel_init+0x74/0x118) > [] (kernel_init+0x74/0x118) from [] (kernel_thread_exit+0x0/0x8) > ---[ end trace 759f924b30fd5a44 ]--- > > Fix this issue by using the original chip select logic and make spi-imx to work again. > > Tested on a mx31pdk that uses the hardware SPI chipselect pins and also > on a mx27pdk that uses GPIO as SPI chipselect. > > Signed-off-by: Fabio Estevam > --- > Changes since v1: > - Fix the logic for the internal chip select case and > keep the usage of of_get_named_gpio for getting the cs_gpio > > drivers/spi/spi-imx.c | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c > index 8ac6542..d917fa3 100644 > --- a/drivers/spi/spi-imx.c > +++ b/drivers/spi/spi-imx.c > @@ -784,11 +784,13 @@ static int __devinit spi_imx_probe(struct platform_device *pdev) > > for (i = 0; i < master->num_chipselect; i++) { > int cs_gpio = of_get_named_gpio(np, "cs-gpios", i); > - if (cs_gpio < 0) > + if (cs_gpio < 0) { > cs_gpio = mxc_platform_info->chipselect[i]; > + spi_imx->chipselect[i] = cs_gpio; > + } > if (cs_gpio < 0) > continue; > - spi_imx->chipselect[i] = cs_gpio; > + It looks like the removal of this line will break DT users. Perhaps the spi_imx->chipselect[i] line should just be moved before the 'if (cp_gpio < 0)' line. g. > ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME); > if (ret) { > while (i > 0) { > -- > 1.7.1 > >