spi/topcliff_pch: Fix data transfer issue

It seems spi_topcliff_pch of linux-2.6.37-rc6 degraded by previous patch.
In fact, data transfer fails on evaluation board testing.
I found like the following register miss-setting line.
Using this patch, I have confirmed data transfer can work well.

Signed-off-by: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>

diff --git a/drivers/spi/spi_topcliff_pch.c b/drivers/spi/spi_topcliff_pch.c
index 58e187f45ec73f9eabb42d4ebafcfb930a4450dc..56b758847c04f92fa691201c9b5685218cd5cce1 100644 (file)
--- a/drivers/spi/spi_topcliff_pch.c
+++ b/drivers/spi/spi_topcliff_pch.c
@@ -267,7 +267,7 @@ static void pch_spi_handler_sub(struct pch_spi_data *data, u32 reg_spsr_val,
        if (reg_spsr_val & SPSR_FI_BIT) {
                /* disable FI & RFI interrupts */
                pch_spi_setclr_reg(data->master, PCH_SPCR, 0,
-                                  SPCR_FIE_BIT | SPCR_TFIE_BIT);
+                                  SPCR_FIE_BIT | SPCR_RFIE_BIT);
 
                /* transfer is completed;inform pch_spi_process_messages */
                data->transfer_complete = true;
@@ -679,11 +679,11 @@ static void pch_spi_set_ir(struct pch_spi_data *data)
        if ((data->bpw_len) > PCH_MAX_FIFO_DEPTH) {
                /* set receive threhold to PCH_RX_THOLD */
                pch_spi_setclr_reg(data->master, PCH_SPCR,
-                                  PCH_RX_THOLD << SPCR_TFIC_FIELD,
-                                  ~MASK_TFIC_SPCR_BITS);
+                                  PCH_RX_THOLD << SPCR_RFIC_FIELD,
+                                  ~MASK_RFIC_SPCR_BITS);
                /* enable FI and RFI interrupts */
                pch_spi_setclr_reg(data->master, PCH_SPCR,
-                                  SPCR_RFIE_BIT | SPCR_TFIE_BIT, 0);
+                                  SPCR_RFIE_BIT | SPCR_FIE_BIT, 0);
        } else {
                /* set receive threhold to maximum */
                pch_spi_setclr_reg(data->master, PCH_SPCR,