Unverified Commit 797622d7 authored by Alban Bedel's avatar Alban Bedel Committed by Mark Brown
Browse files

spi: ath79: Simplify ath79_spi_chipselect() 



First of all this callback was slightly misused to setup the clock
polarity at the beginning of a transfer. Beside being at the wrong
place, it is also useless as only SPI mode 1 is supported. Instead
just make sure the base value used for IOC is suitable to start a
transfer by clearing the clock and data bits during the controller
setup.

This also remove the last direct usage of the GPIO API, so we can
remove the direct dependency on GPIOLIB.

Signed-off-by: default avatarAlban Bedel <albeu@free.fr>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a666f261

drivers/spi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ config SPI_ALTERA 


config SPI_ATH79

	tristate "Atheros AR71XX/AR724X/AR913X SPI controller driver"

	depends on ATH79 && GPIOLIB

	depends on ATH79

	select SPI_BITBANG

	help

	  This enables support for the SPI controller present on the

drivers/spi/spi-ath79.c

+9 −31
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/spi_bitbang.h>

#include <linux/bitops.h>

#include <linux/gpio/consumer.h>

#include <linux/clk.h>

#include <linux/err.h>
@@ -67,28 +66,6 @@ static void ath79_spi_chipselect(struct spi_device *spi, int is_active) 
{

	struct ath79_spi *sp = ath79_spidev_to_sp(spi);

	int cs_high = (spi->mode & SPI_CS_HIGH) ? is_active : !is_active;



	if (is_active) {

		/* set initial clock polarity */

		if (spi->mode & SPI_CPOL)

			sp->ioc_base |= AR71XX_SPI_IOC_CLK;

		else

			sp->ioc_base &= ~AR71XX_SPI_IOC_CLK;



		ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);

	}



	if (spi->cs_gpiod) {

		/*

		 * SPI chipselect is normally active-low, but

		 * inversion semantics are handled by gpiolib.

		 *

		 * FIXME: is this ever used? The driver doesn't

		 * set SPI_MASTER_GPIO_SS so this callback should not

		 * get called if a CS GPIO is found by the SPI core.

		 */

		gpiod_set_value_cansleep(spi->cs_gpiod, is_active);

	} else {

	u32 cs_bit = AR71XX_SPI_IOC_CS(spi->chip_select);



	if (cs_high)
@@ -99,8 +76,6 @@ static void ath79_spi_chipselect(struct spi_device *spi, int is_active) 
	ath79_spi_wr(sp, AR71XX_SPI_REG_IOC, sp->ioc_base);

}



}



static void ath79_spi_enable(struct ath79_spi *sp)

{

	/* enable GPIO mode */
@@ -110,6 +85,9 @@ static void ath79_spi_enable(struct ath79_spi *sp) 
	sp->reg_ctrl = ath79_spi_rr(sp, AR71XX_SPI_REG_CTRL);

	sp->ioc_base = ath79_spi_rr(sp, AR71XX_SPI_REG_IOC);



	/* clear clk and mosi in the base state */

	sp->ioc_base &= ~(AR71XX_SPI_IOC_DO | AR71XX_SPI_IOC_CLK);



	/* TODO: setup speed? */

	ath79_spi_wr(sp, AR71XX_SPI_REG_CTRL, 0x43);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE