From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753526AbdDLIkR (ORCPT ); Wed, 12 Apr 2017 04:40:17 -0400 Received: from esa2.microchip.iphmx.com ([68.232.149.84]:31665 "EHLO esa2.microchip.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753457AbdDLIkO (ORCPT ); Wed, 12 Apr 2017 04:40:14 -0400 X-IronPort-AV: E=Sophos;i="5.37,189,1488870000"; d="scan'208";a="1369172" Subject: Re: [PATCH 1/2] spi: atmel: factorize reusable code for SPI controller init To: Quentin Schulz , References: <20170412070520.29621-1-quentin.schulz@free-electrons.com> CC: , , , From: Nicolas Ferre Organization: microchip Message-ID: Date: Wed, 12 Apr 2017 10:40:23 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170412070520.29621-1-quentin.schulz@free-electrons.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 Okay: Acked-by: Nicolas Ferre > --- > 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