* [PATCH] spi: mediatek: single device does not require cs_gpios
@ 2015-11-05 5:50 Nicolas Boichat
2015-11-05 9:16 ` Andy Shevchenko
0 siblings, 1 reply; 3+ messages in thread
From: Nicolas Boichat @ 2015-11-05 5:50 UTC (permalink / raw)
To: Mark Brown
Cc: Leilk Liu, Matthias Brugger, linux-spi, linux-kernel,
linux-arm-kernel, linux-mediatek
When only one device is present, it is not necessary to specify
cs_gpios, as the CS line can be controlled by the hardware
module.
Without this patch, older device tree bindings used before
37457607 "spi: mediatek: mt8173 spi multiple devices support"
would cause a panic on boot. This fixes the crash, and
re-introduces backward compatibility.
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
---
Applies on top of broonie/spi.git topic/mtk. Thanks!
drivers/spi/spi-mt65xx.c | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
index 563954a..f694031 100644
--- a/drivers/spi/spi-mt65xx.c
+++ b/drivers/spi/spi-mt65xx.c
@@ -410,7 +410,7 @@ static int mtk_spi_setup(struct spi_device *spi)
if (!spi->controller_data)
spi->controller_data = (void *)&mtk_default_chip_info;
- if (mdata->dev_comp->need_pad_sel)
+ if (mdata->dev_comp->need_pad_sel && spi->cs_gpio >= 0)
gpio_direction_output(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
return 0;
@@ -632,13 +632,23 @@ static int mtk_spi_probe(struct platform_device *pdev)
goto err_put_master;
}
- for (i = 0; i < master->num_chipselect; i++) {
- ret = devm_gpio_request(&pdev->dev, master->cs_gpios[i],
- dev_name(&pdev->dev));
- if (ret) {
- dev_err(&pdev->dev,
- "can't get CS GPIO %i\n", i);
- goto err_put_master;
+ if (!master->cs_gpios && master->num_chipselect > 1) {
+ dev_err(&pdev->dev,
+ "cs_gpios not specified and num_chipselect > 1\n");
+ ret = -EINVAL;
+ goto err_put_master;
+ }
+
+ if (master->cs_gpios) {
+ for (i = 0; i < master->num_chipselect; i++) {
+ ret = devm_gpio_request(&pdev->dev,
+ master->cs_gpios[i],
+ dev_name(&pdev->dev));
+ if (ret) {
+ dev_err(&pdev->dev,
+ "can't get CS GPIO %i\n", i);
+ goto err_put_master;
+ }
}
}
}
--
2.6.0.rc2.230.g3dd15c0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] spi: mediatek: single device does not require cs_gpios
2015-11-05 5:50 [PATCH] spi: mediatek: single device does not require cs_gpios Nicolas Boichat
@ 2015-11-05 9:16 ` Andy Shevchenko
2015-11-05 10:33 ` Nicolas Boichat
0 siblings, 1 reply; 3+ messages in thread
From: Andy Shevchenko @ 2015-11-05 9:16 UTC (permalink / raw)
To: Nicolas Boichat
Cc: Mark Brown, Leilk Liu, Matthias Brugger, linux-spi, linux-kernel,
linux-arm Mailing List, linux-mediatek
On Thu, Nov 5, 2015 at 7:50 AM, Nicolas Boichat <drinkcat@chromium.org> wrote:
> When only one device is present, it is not necessary to specify
> cs_gpios, as the CS line can be controlled by the hardware
> module.
>
> Without this patch, older device tree bindings used before
> 37457607 "spi: mediatek: mt8173 spi multiple devices support"
> would cause a panic on boot. This fixes the crash, and
> re-introduces backward compatibility.
>
> Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>
> ---
>
> Applies on top of broonie/spi.git topic/mtk. Thanks!
>
> drivers/spi/spi-mt65xx.c | 26 ++++++++++++++++++--------
> 1 file changed, 18 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
> index 563954a..f694031 100644
> --- a/drivers/spi/spi-mt65xx.c
> +++ b/drivers/spi/spi-mt65xx.c
> @@ -410,7 +410,7 @@ static int mtk_spi_setup(struct spi_device *spi)
> if (!spi->controller_data)
> spi->controller_data = (void *)&mtk_default_chip_info;
>
> - if (mdata->dev_comp->need_pad_sel)
> + if (mdata->dev_comp->need_pad_sel && spi->cs_gpio >= 0)
gpio_is_valid() ?
> gpio_direction_output(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
>
> return 0;
> @@ -632,13 +632,23 @@ static int mtk_spi_probe(struct platform_device *pdev)
> goto err_put_master;
> }
>
> - for (i = 0; i < master->num_chipselect; i++) {
> - ret = devm_gpio_request(&pdev->dev, master->cs_gpios[i],
> - dev_name(&pdev->dev));
> - if (ret) {
> - dev_err(&pdev->dev,
> - "can't get CS GPIO %i\n", i);
> - goto err_put_master;
> + if (!master->cs_gpios && master->num_chipselect > 1) {
> + dev_err(&pdev->dev,
> + "cs_gpios not specified and num_chipselect > 1\n");
> + ret = -EINVAL;
> + goto err_put_master;
> + }
> +
> + if (master->cs_gpios) {
> + for (i = 0; i < master->num_chipselect; i++) {
> + ret = devm_gpio_request(&pdev->dev,
> + master->cs_gpios[i],
> + dev_name(&pdev->dev));
> + if (ret) {
> + dev_err(&pdev->dev,
> + "can't get CS GPIO %i\n", i);
> + goto err_put_master;
> + }
> }
> }
> }
> --
> 2.6.0.rc2.230.g3dd15c0
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-spi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] spi: mediatek: single device does not require cs_gpios
2015-11-05 9:16 ` Andy Shevchenko
@ 2015-11-05 10:33 ` Nicolas Boichat
0 siblings, 0 replies; 3+ messages in thread
From: Nicolas Boichat @ 2015-11-05 10:33 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Mark Brown, Leilk Liu, Matthias Brugger, linux-spi, linux-kernel,
linux-arm Mailing List, linux-mediatek
On Thu, Nov 5, 2015 at 5:16 PM, Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
> On Thu, Nov 5, 2015 at 7:50 AM, Nicolas Boichat <drinkcat@chromium.org> wrote:
[...]
>> diff --git a/drivers/spi/spi-mt65xx.c b/drivers/spi/spi-mt65xx.c
>> index 563954a..f694031 100644
>> --- a/drivers/spi/spi-mt65xx.c
>> +++ b/drivers/spi/spi-mt65xx.c
>> @@ -410,7 +410,7 @@ static int mtk_spi_setup(struct spi_device *spi)
>> if (!spi->controller_data)
>> spi->controller_data = (void *)&mtk_default_chip_info;
>>
>> - if (mdata->dev_comp->need_pad_sel)
>> + if (mdata->dev_comp->need_pad_sel && spi->cs_gpio >= 0)
>
> gpio_is_valid() ?
Yes, thanks! Will fix in next round. (there is a few other ones in
driver/spi/* that should probably be fixed too...)
Best,
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-11-05 10:33 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-11-05 5:50 [PATCH] spi: mediatek: single device does not require cs_gpios Nicolas Boichat
2015-11-05 9:16 ` Andy Shevchenko
2015-11-05 10:33 ` Nicolas Boichat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).