lkml.org 
[lkml]   [2017]   [Apr]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 1/2] spi: atmel: factorize reusable code for SPI controller init
From
Date
Le 12/04/2017 à 09:05, Quentin Schulz a écrit :
> The SPI controller configuration during the init can be reused, for the
> resume function for example.
>
> Let's move this configuration to a separate function.
>
> Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com>

Okay:
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>

> ---
> drivers/spi/spi-atmel.c | 35 +++++++++++++++++++++--------------
> 1 file changed, 21 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/spi/spi-atmel.c b/drivers/spi/spi-atmel.c
> index 0e7712b..247d920 100644
> --- a/drivers/spi/spi-atmel.c
> +++ b/drivers/spi/spi-atmel.c
> @@ -1464,6 +1464,25 @@ static int atmel_spi_gpio_cs(struct platform_device *pdev)
> return 0;
> }
>
> +static void atmel_spi_init(struct atmel_spi *as)
> +{
> + spi_writel(as, CR, SPI_BIT(SWRST));
> + spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */
> + if (as->caps.has_wdrbt) {
> + spi_writel(as, MR, SPI_BIT(WDRBT) | SPI_BIT(MODFDIS)
> + | SPI_BIT(MSTR));
> + } else {
> + spi_writel(as, MR, SPI_BIT(MSTR) | SPI_BIT(MODFDIS));
> + }
> +
> + if (as->use_pdc)
> + spi_writel(as, PTCR, SPI_BIT(RXTDIS) | SPI_BIT(TXTDIS));
> + spi_writel(as, CR, SPI_BIT(SPIEN));
> +
> + if (as->fifo_size)
> + spi_writel(as, CR, SPI_BIT(FIFOEN));
> +}
> +
> static int atmel_spi_probe(struct platform_device *pdev)
> {
> struct resource *regs;
> @@ -1572,26 +1591,14 @@ static int atmel_spi_probe(struct platform_device *pdev)
>
> as->spi_clk = clk_get_rate(clk);
>
> - spi_writel(as, CR, SPI_BIT(SWRST));
> - spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */
> - if (as->caps.has_wdrbt) {
> - spi_writel(as, MR, SPI_BIT(WDRBT) | SPI_BIT(MODFDIS)
> - | SPI_BIT(MSTR));
> - } else {
> - spi_writel(as, MR, SPI_BIT(MSTR) | SPI_BIT(MODFDIS));
> - }
> -
> - if (as->use_pdc)
> - spi_writel(as, PTCR, SPI_BIT(RXTDIS) | SPI_BIT(TXTDIS));
> - spi_writel(as, CR, SPI_BIT(SPIEN));
> -
> as->fifo_size = 0;
> if (!of_property_read_u32(pdev->dev.of_node, "atmel,fifo-size",
> &as->fifo_size)) {
> dev_info(&pdev->dev, "Using FIFO (%u data)\n", as->fifo_size);
> - spi_writel(as, CR, SPI_BIT(FIFOEN));
> }
>
> + atmel_spi_init(as);
> +
> pm_runtime_set_autosuspend_delay(&pdev->dev, AUTOSUSPEND_TIMEOUT);
> pm_runtime_use_autosuspend(&pdev->dev);
> pm_runtime_set_active(&pdev->dev);
>


--
Nicolas Ferre

\
 
 \ /
  Last update: 2017-04-12 10:40    [W:0.087 / U:1.340 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site