New patch to review for coreboot: a619a3a arm/exynos: Correct SPI session commands.

[Gabe Black]

Gabe Black ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3706

-gerrit

commit a619a3a4c9cc9216fdcbe76be9da4dcaba95cab6
Author: Hung-Te Lin 
Date:   Sun Jun 23 08:14:30 2013 +0800

arm/exynos: Correct SPI session commands.

Some initialization / shutdown commands should be paired correctly in a SPI I/O
    session. For example, setting CS should be enabled and disabled in each read;
    and the bus width (byte or word) should be configured only when opening /
    closing the SPI device.

Change-Id: Ie56b1c3a6df7d542f7ea8f1193ac435987f937ba
    Signed-off-by: Hung-Te Lin 
    Signed-off-by: Gabe Black 
---
 src/cpu/samsung/exynos5250/spi.c | 13 +++++++------
 src/cpu/samsung/exynos5420/spi.c | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/cpu/samsung/exynos5250/spi.c b/src/cpu/samsung/exynos5250/spi.c
index 503cee9..642ae23 100644
--- a/src/cpu/samsung/exynos5250/spi.c
+++ b/src/cpu/samsung/exynos5250/spi.c
@@ -102,7 +102,6 @@ int exynos_spi_open(struct exynos_spi *regs)

/* now set rx and tx channel ON */
    setbits_le32(&regs->ch_cfg, SPI_RX_CH_ON | SPI_TX_CH_ON | SPI_CH_HS_EN);
-	clrbits_le32(&regs->cs_reg, SPI_SLAVE_SIG_INACT); /* CS low */
    return 0;
 }

@@ -110,6 +109,8 @@ int exynos_spi_read(struct exynos_spi *regs, void *dest, u32 len, u32 off)
 {
    int upto, todo;
    int i;
+	clrbits_le32(&regs->cs_reg, SPI_SLAVE_SIG_INACT); /* CS low */
+
    /* Send read instruction (0x3h) followed by a 24 bit addr */
    writel((SF_READ_DATA_CMD << 24) | off, &regs->tx_data);

@@ -123,6 +124,11 @@ int exynos_spi_read(struct exynos_spi *regs, void *dest, u32 len, u32 off)

setbits_le32(&regs->cs_reg, SPI_SLAVE_SIG_INACT);/* make the CS high */

+	return len;
+}
+
+int exynos_spi_close(struct exynos_spi *regs)
+{
    /*
     * Let put controller mode to BYTE as
     * SPI driver does not support WORD mode yet
@@ -131,11 +137,6 @@ int exynos_spi_read(struct exynos_spi *regs, void *dest, u32 len, u32 off)
    	     SPI_MODE_CH_WIDTH_WORD | SPI_MODE_BUS_WIDTH_WORD);
    writel(0, &regs->swap_cfg);

-	return len;
-}
-
-int exynos_spi_close(struct exynos_spi *regs)
-{
    /*
     * Flush spi tx, rx fifos and reset the SPI controller
     * and clear rx/tx channel
diff --git a/src/cpu/samsung/exynos5420/spi.c b/src/cpu/samsung/exynos5420/spi.c
index 503cee9..642ae23 100644
--- a/src/cpu/samsung/exynos5420/spi.c
+++ b/src/cpu/samsung/exynos5420/spi.c
@@ -102,7 +102,6 @@ int exynos_spi_open(struct exynos_spi *regs)

/* now set rx and tx channel ON */
    setbits_le32(&regs->ch_cfg, SPI_RX_CH_ON | SPI_TX_CH_ON | SPI_CH_HS_EN);
-	clrbits_le32(&regs->cs_reg, SPI_SLAVE_SIG_INACT); /* CS low */
    return 0;
 }

@@ -110,6 +109,8 @@ int exynos_spi_read(struct exynos_spi *regs, void *dest, u32 len, u32 off)
 {
    int upto, todo;
    int i;
+	clrbits_le32(&regs->cs_reg, SPI_SLAVE_SIG_INACT); /* CS low */
+
    /* Send read instruction (0x3h) followed by a 24 bit addr */
    writel((SF_READ_DATA_CMD << 24) | off, &regs->tx_data);

@@ -123,6 +124,11 @@ int exynos_spi_read(struct exynos_spi *regs, void *dest, u32 len, u32 off)

setbits_le32(&regs->cs_reg, SPI_SLAVE_SIG_INACT);/* make the CS high */

+	return len;
+}
+
+int exynos_spi_close(struct exynos_spi *regs)
+{
    /*
     * Let put controller mode to BYTE as
     * SPI driver does not support WORD mode yet
@@ -131,11 +137,6 @@ int exynos_spi_read(struct exynos_spi *regs, void *dest, u32 len, u32 off)
    	     SPI_MODE_CH_WIDTH_WORD | SPI_MODE_BUS_WIDTH_WORD);
    writel(0, &regs->swap_cfg);

-	return len;
-}
-
-int exynos_spi_close(struct exynos_spi *regs)
-{
    /*
     * Flush spi tx, rx fifos and reset the SPI controller
     * and clear rx/tx channel