[PATCH] spi: sh-msiof: request and set cs-gpio direction to output

[PATCH] spi: sh-msiof: request and set cs-gpio direction to output

[Ulrich Hecht]

Required for the CS signal to actually be visible to the device.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 drivers/spi/spi-sh-msiof.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index a7934ab..d4b5772 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -536,15 +536,35 @@ static int sh_msiof_spi_setup(struct spi_device *spi)
 				  !!(spi->mode & SPI_LSB_FIRST),
 				  !!(spi->mode & SPI_CS_HIGH));
 
-	if (spi->cs_gpio >= 0)
-		gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
+	if (spi->cs_gpio >= 0 && !spi_get_ctldata(spi)) {
+		int status = gpio_request(spi->cs_gpio, dev_name(&spi->dev));
+
+		if (status)
+			return status;
 
+		status = gpio_direction_output(spi->cs_gpio,
+					       !(spi->mode & SPI_CS_HIGH));
+		if (status) {
+			gpio_free(spi->cs_gpio);
+			return status;
+		}
+
+		spi_set_ctldata(spi, (void *)spi->cs_gpio);
+	}
 
 	pm_runtime_put(&p->pdev->dev);
 
 	return 0;
 }
 
+static void sh_msiof_spi_cleanup(struct spi_device *spi)
+{
+	if (spi->cs_gpio >= 0)
+		gpio_free(spi->cs_gpio);
+
+	spi_set_ctldata(spi, NULL);
+}
+
 static int sh_msiof_prepare_message(struct spi_master *master,
 				    struct spi_message *msg)
 {
@@ -1232,6 +1252,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
 	master->dev.of_node = pdev->dev.of_node;
 	master->num_chipselect = p->info->num_chipselect;
 	master->setup = sh_msiof_spi_setup;
+	master->cleanup = sh_msiof_spi_cleanup;
 	master->prepare_message = sh_msiof_prepare_message;
 	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 32);
 	master->auto_runtime_pm = true;
-- 
2.7.4

[PATCH] spi: sh-msiof: request and set cs-gpio direction to output

[Ulrich Hecht]

Required for the CS signal to actually be visible to the device.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
 drivers/spi/spi-sh-msiof.c | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
index a7934ab..d4b5772 100644
--- a/drivers/spi/spi-sh-msiof.c
+++ b/drivers/spi/spi-sh-msiof.c
@@ -536,15 +536,35 @@ static int sh_msiof_spi_setup(struct spi_device *spi)
 				  !!(spi->mode & SPI_LSB_FIRST),
 				  !!(spi->mode & SPI_CS_HIGH));
 
-	if (spi->cs_gpio >= 0)
-		gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
+	if (spi->cs_gpio >= 0 && !spi_get_ctldata(spi)) {
+		int status = gpio_request(spi->cs_gpio, dev_name(&spi->dev));
+
+		if (status)
+			return status;
 
+		status = gpio_direction_output(spi->cs_gpio,
+					       !(spi->mode & SPI_CS_HIGH));
+		if (status) {
+			gpio_free(spi->cs_gpio);
+			return status;
+		}
+
+		spi_set_ctldata(spi, (void *)spi->cs_gpio);
+	}
 
 	pm_runtime_put(&p->pdev->dev);
 
 	return 0;
 }
 
+static void sh_msiof_spi_cleanup(struct spi_device *spi)
+{
+	if (spi->cs_gpio >= 0)
+		gpio_free(spi->cs_gpio);
+
+	spi_set_ctldata(spi, NULL);
+}
+
 static int sh_msiof_prepare_message(struct spi_master *master,
 				    struct spi_message *msg)
 {
@@ -1232,6 +1252,7 @@ static int sh_msiof_spi_probe(struct platform_device *pdev)
 	master->dev.of_node = pdev->dev.of_node;
 	master->num_chipselect = p->info->num_chipselect;
 	master->setup = sh_msiof_spi_setup;
+	master->cleanup = sh_msiof_spi_cleanup;
 	master->prepare_message = sh_msiof_prepare_message;
 	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(8, 32);
 	master->auto_runtime_pm = true;
-- 
2.7.4

--
To unsubscribe from this list: send the line "unsubscribe linux-spi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] spi: sh-msiof: request and set cs-gpio direction to output

[Geert Uytterhoeven]

Hi Ulrich,

On Mon, Jul 18, 2016 at 10:57 AM, Ulrich Hecht
<ulrich.hecht+renesas@gmail.com> wrote:
> Required for the CS signal to actually be visible to the device.
>
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>

Thanks, I can confirm this indeed makes cs-gpios work with MSIOF on
Koelsch, hence
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>

> ---
>  drivers/spi/spi-sh-msiof.c | 25 +++++++++++++++++++++++--
>  1 file changed, 23 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
> index a7934ab..d4b5772 100644
> --- a/drivers/spi/spi-sh-msiof.c
> +++ b/drivers/spi/spi-sh-msiof.c
> @@ -536,15 +536,35 @@ static int sh_msiof_spi_setup(struct spi_device *spi)

Is there any specific reason you don't do this in .probe(), like spi-efm32
does?

>                                   !!(spi->mode & SPI_LSB_FIRST),
>                                   !!(spi->mode & SPI_CS_HIGH));
>
> -       if (spi->cs_gpio >= 0)
> -               gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
> +       if (spi->cs_gpio >= 0 && !spi_get_ctldata(spi)) {
> +               int status = gpio_request(spi->cs_gpio, dev_name(&spi->dev));

devm_gpio_request()...

> +
> +               if (status)
> +                       return status;
>
> +               status = gpio_direction_output(spi->cs_gpio,
> +                                              !(spi->mode & SPI_CS_HIGH));
> +               if (status) {
> +                       gpio_free(spi->cs_gpio);
> +                       return status;
> +               }

... or even better, devm_gpio_request_one(), as it allows configuring direction
and initial level in one go.

> +
> +               spi_set_ctldata(spi, (void *)spi->cs_gpio);
> +       }

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH] spi: sh-msiof: request and set cs-gpio direction to output

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 2464 bytes --]

On Mon, Jul 18, 2016 at 02:09:03PM +0200, Geert Uytterhoeven wrote:
> Hi Ulrich,
> 
> On Mon, Jul 18, 2016 at 10:57 AM, Ulrich Hecht
> <ulrich.hecht+renesas@gmail.com> wrote:
> > Required for the CS signal to actually be visible to the device.
> >
> > Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> 
> Thanks, I can confirm this indeed makes cs-gpios work with MSIOF on
> Koelsch, hence
> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>

This one doesn't show up in renesas-drivers. What about V2?

Thanks!

> 
> > ---
> >  drivers/spi/spi-sh-msiof.c | 25 +++++++++++++++++++++++--
> >  1 file changed, 23 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
> > index a7934ab..d4b5772 100644
> > --- a/drivers/spi/spi-sh-msiof.c
> > +++ b/drivers/spi/spi-sh-msiof.c
> > @@ -536,15 +536,35 @@ static int sh_msiof_spi_setup(struct spi_device *spi)
> 
> Is there any specific reason you don't do this in .probe(), like spi-efm32
> does?
> 
> >                                   !!(spi->mode & SPI_LSB_FIRST),
> >                                   !!(spi->mode & SPI_CS_HIGH));
> >
> > -       if (spi->cs_gpio >= 0)
> > -               gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
> > +       if (spi->cs_gpio >= 0 && !spi_get_ctldata(spi)) {
> > +               int status = gpio_request(spi->cs_gpio, dev_name(&spi->dev));
> 
> devm_gpio_request()...
> 
> > +
> > +               if (status)
> > +                       return status;
> >
> > +               status = gpio_direction_output(spi->cs_gpio,
> > +                                              !(spi->mode & SPI_CS_HIGH));
> > +               if (status) {
> > +                       gpio_free(spi->cs_gpio);
> > +                       return status;
> > +               }
> 
> ... or even better, devm_gpio_request_one(), as it allows configuring direction
> and initial level in one go.
> 
> > +
> > +               spi_set_ctldata(spi, (void *)spi->cs_gpio);
> > +       }
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH] spi: sh-msiof: request and set cs-gpio direction to output

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 2554 bytes --]

On Mon, Jul 18, 2016 at 02:09:03PM +0200, Geert Uytterhoeven wrote:
> Hi Ulrich,
> 
> On Mon, Jul 18, 2016 at 10:57 AM, Ulrich Hecht
> <ulrich.hecht+renesas-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> > Required for the CS signal to actually be visible to the device.
> >
> > Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> 
> Thanks, I can confirm this indeed makes cs-gpios work with MSIOF on
> Koelsch, hence
> Tested-by: Geert Uytterhoeven <geert+renesas-gXvu3+zWzMSzQB+pC5nmwQ@public.gmane.org>

This one doesn't show up in renesas-drivers. What about V2?

Thanks!

> 
> > ---
> >  drivers/spi/spi-sh-msiof.c | 25 +++++++++++++++++++++++--
> >  1 file changed, 23 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/spi/spi-sh-msiof.c b/drivers/spi/spi-sh-msiof.c
> > index a7934ab..d4b5772 100644
> > --- a/drivers/spi/spi-sh-msiof.c
> > +++ b/drivers/spi/spi-sh-msiof.c
> > @@ -536,15 +536,35 @@ static int sh_msiof_spi_setup(struct spi_device *spi)
> 
> Is there any specific reason you don't do this in .probe(), like spi-efm32
> does?
> 
> >                                   !!(spi->mode & SPI_LSB_FIRST),
> >                                   !!(spi->mode & SPI_CS_HIGH));
> >
> > -       if (spi->cs_gpio >= 0)
> > -               gpio_set_value(spi->cs_gpio, !(spi->mode & SPI_CS_HIGH));
> > +       if (spi->cs_gpio >= 0 && !spi_get_ctldata(spi)) {
> > +               int status = gpio_request(spi->cs_gpio, dev_name(&spi->dev));
> 
> devm_gpio_request()...
> 
> > +
> > +               if (status)
> > +                       return status;
> >
> > +               status = gpio_direction_output(spi->cs_gpio,
> > +                                              !(spi->mode & SPI_CS_HIGH));
> > +               if (status) {
> > +                       gpio_free(spi->cs_gpio);
> > +                       return status;
> > +               }
> 
> ... or even better, devm_gpio_request_one(), as it allows configuring direction
> and initial level in one go.
> 
> > +
> > +               spi_set_ctldata(spi, (void *)spi->cs_gpio);
> > +       }
> 
> Gr{oetje,eeting}s,
> 
>                         Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]