qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-04 21:46:14 +02:00
Code

ar71xx: pb44_spi: introduce pb44_spi_{en,dis}able helpers

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29708 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2012-01-11 09:14:15 +00:00
parent 3e74da5245
commit ddfc10f668
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
target/linux/ar71xx/files/drivers/spi/pb44_spi.c
View File

@ -86,10 +86,8 @@ static void pb44_spi_chipselect(struct spi_device *spi, int is_active)
} }
static int pb44_spi_setup_cs(struct spi_device *spi) static void pb44_spi_enable(struct ar71xx_spi *sp)
{ {
struct ar71xx_spi *sp = spidev_to_sp(spi);
/* enable GPIO mode */ /* enable GPIO mode */
pb44_spi_wr(sp, SPI_REG_FS, SPI_FS_GPIO); pb44_spi_wr(sp, SPI_REG_FS, SPI_FS_GPIO);
@ -97,8 +95,22 @@ static int pb44_spi_setup_cs(struct spi_device *spi)
sp->reg_ctrl = pb44_spi_rr(sp, SPI_REG_CTRL); sp->reg_ctrl = pb44_spi_rr(sp, SPI_REG_CTRL);
sp->ioc_base = pb44_spi_rr(sp, SPI_REG_IOC); sp->ioc_base = pb44_spi_rr(sp, SPI_REG_IOC);
/* TODO: setup speed? */
pb44_spi_wr(sp, SPI_REG_CTRL, 0x43); pb44_spi_wr(sp, SPI_REG_CTRL, 0x43);
}
static void pb44_spi_disable(struct ar71xx_spi *sp)
{
/* restore CTRL register */
pb44_spi_wr(sp, SPI_REG_CTRL, sp->reg_ctrl);
/* disable GPIO mode */
pb44_spi_wr(sp, SPI_REG_FS, 0);
}
static int pb44_spi_setup_cs(struct spi_device *spi)
{
struct ar71xx_spi *sp = spidev_to_sp(spi);
pb44_spi_enable(sp);
if (spi->chip_select) { if (spi->chip_select) {
unsigned long gpio = (unsigned long) spi->controller_data; unsigned long gpio = (unsigned long) spi->controller_data;
@ -133,10 +145,7 @@ static void pb44_spi_cleanup_cs(struct spi_device *spi)
gpio_free(gpio); gpio_free(gpio);
} }
/* restore CTRL register */ pb44_spi_disable(sp);
pb44_spi_wr(sp, SPI_REG_CTRL, sp->reg_ctrl);
/* disable GPIO mode */
pb44_spi_wr(sp, SPI_REG_FS, 0);
} }
static int pb44_spi_setup(struct spi_device *spi) static int pb44_spi_setup(struct spi_device *spi)