Skip to contentSkip to conversation

Patch "spi: pxa2xx: Clear all RFT bits in reset_sccr1() on Intel Quark" has been added to the 4.7-stable tree

PATCH [email protected] 1 participant 1 message Aug 18, 2016

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

spi: pxa2xx: Clear all RFT bits in reset_sccr1() on Intel Quark

to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
spi-pxa2xx-clear-all-rft-bits-in-reset_sccr1-on-intel-quark.patch
and it can be found in the queue-4.7 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 152bc19e2fc2b7fce7ffbc2a9cea94b147223702 Mon Sep 17 00:00:00 2001

From: Andy Shevchenko <[email protected]>
Date: Wed, 6 Jul 2016 12:08:11 +0300
Subject: spi: pxa2xx: Clear all RFT bits in reset_sccr1() on Intel Quark

From: Andy Shevchenko <[email protected]>

commit 152bc19e2fc2b7fce7ffbc2a9cea94b147223702 upstream.

It seems the commit e5262d0568dc ("spi: spi-pxa2xx: SPI support for Intel Quark X1000") misses one place to be adapted for Intel Quark, i.e. in reset_sccr1().

Clear all RFT bits when call reset_sccr1() on Intel Quark.

Fixes e5262d0568dc ("spi: spi-pxa2xx: SPI support for Intel Quark X1000")
---
 drivers/spi/spi-pxa2xx.c |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
drivers/spi/spi-pxa2xx.c +8 -1
@@ -585,7 +585,14 @@ static void reset_sccr1(struct driver_da
 	u32 sccr1_reg;
 
 	sccr1_reg = pxa2xx_spi_read(drv_data, SSCR1) & ~drv_data->int_cr1;
-	sccr1_reg &= ~SSCR1_RFT;
+	switch (drv_data->ssp_type) {
+	case QUARK_X1000_SSP:
+		sccr1_reg &= ~QUARK_X1000_SSCR1_RFT;
+		break;
+	default:
+		sccr1_reg &= ~SSCR1_RFT;
+		break;
+	}
 	sccr1_reg |= chip->threshold;
 	pxa2xx_spi_write(drv_data, SSCR1, sccr1_reg);
 }

Patches currently in stable-queue which might be from [email protected] are

queue-4.7/gpio-intel-mid-remove-potentially-harmful-code.patch queue-4.7/spi-pxa2xx-clear-all-rft-bits-in-reset_sccr1-on-intel-quark.patch queue-4.7/gpio-intel-mid-switch-to-devm_gpiochip_add_data.patch