Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9d32af66 authored by Tomoya MORINAGA's avatar Tomoya MORINAGA Committed by Grant Likely
Browse files

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: default avatarTomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 89342174
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -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,