From 9aad839b8ea6cb196abf12bf0d53b85b5a92bd9a Mon Sep 17 00:00:00 2001 From: Kyoungil Kim Date: Wed, 23 May 2012 21:29:51 +0900 Subject: [PATCH] --- yaml --- r: 347283 b: refs/heads/master c: 7d859ff4937a22aabc0d3f352d1f515fb8b38528 h: refs/heads/master i: 347281: c897536171b9309041698b31a5b15fe9a0aeee29 347279: bfc1b8b82d68e31fc777f07cde6ad59ea59fc3a4 v: v3 --- [refs] | 2 +- trunk/drivers/spi/spi-s3c64xx.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 003f21c22be7..948889c96c00 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f38010d54a9dfd4b9c9e49a7184f84cc2281605 +refs/heads/master: 7d859ff4937a22aabc0d3f352d1f515fb8b38528 diff --git a/trunk/drivers/spi/spi-s3c64xx.c b/trunk/drivers/spi/spi-s3c64xx.c index 88c3f5e51c36..ad93231a8038 100644 --- a/trunk/drivers/spi/spi-s3c64xx.c +++ b/trunk/drivers/spi/spi-s3c64xx.c @@ -214,6 +214,10 @@ static void flush_fifo(struct s3c64xx_spi_driver_data *sdd) writel(0, regs + S3C64XX_SPI_PACKET_CNT); + val = readl(regs + S3C64XX_SPI_CH_CFG); + val &= ~(S3C64XX_SPI_CH_RXCH_ON | S3C64XX_SPI_CH_TXCH_ON); + writel(val, regs + S3C64XX_SPI_CH_CFG); + val = readl(regs + S3C64XX_SPI_CH_CFG); val |= S3C64XX_SPI_CH_SW_RST; val &= ~S3C64XX_SPI_CH_HS_EN; @@ -248,10 +252,6 @@ static void flush_fifo(struct s3c64xx_spi_driver_data *sdd) val = readl(regs + S3C64XX_SPI_MODE_CFG); val &= ~(S3C64XX_SPI_MODE_TXDMA_ON | S3C64XX_SPI_MODE_RXDMA_ON); writel(val, regs + S3C64XX_SPI_MODE_CFG); - - val = readl(regs + S3C64XX_SPI_CH_CFG); - val &= ~(S3C64XX_SPI_CH_RXCH_ON | S3C64XX_SPI_CH_TXCH_ON); - writel(val, regs + S3C64XX_SPI_CH_CFG); } static void s3c64xx_spi_dmacb(void *data)