Patch "spi/rockchip: Make sure spi clk is on in rockchip_spi_set_cs" has been added to the 4.4-stable tree

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

spi/rockchip: Make sure spi clk is on in rockchip_spi_set_cs

to the 4.4-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-rockchip-make-sure-spi-clk-is-on-in-rockchip_spi_set_cs.patch
and it can be found in the queue-4.4 subdirectory.

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

From: Huibin Hong <[email protected]>
Date: Wed, 24 Feb 2016 18:00:04 +0800
Subject: spi/rockchip: Make sure spi clk is on in rockchip_spi_set_cs

From: Huibin Hong <[email protected]>

commit b920cc3191d7612f26f36ee494e05b5ffd9044c0 upstream.

Rockchip_spi_set_cs could be called by spi_setup, but spi_setup may be called by device driver after runtime suspend. Then the spi clock is closed, rockchip_spi_set_cs may access the spi registers, which causes cpu block in some socs.

---
 drivers/spi/spi-rockchip.c |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

@@ -265,7 +265,10 @@ static inline u32 rx_max(struct rockchip
 static void rockchip_spi_set_cs(struct spi_device *spi, bool enable)
 {
 	u32 ser;
-	struct rockchip_spi *rs = spi_master_get_devdata(spi->master);
+	struct spi_master *master = spi->master;
+	struct rockchip_spi *rs = spi_master_get_devdata(master);
+
+	pm_runtime_get_sync(rs->dev);
 
 	ser = readl_relaxed(rs->regs + ROCKCHIP_SPI_SER) & SER_MASK;
 

@@ -290,6 +293,8 @@ static void rockchip_spi_set_cs(struct s
 		ser &= ~(1 << spi->chip_select);
 
 	writel_relaxed(ser, rs->regs + ROCKCHIP_SPI_SER);
+
+	pm_runtime_put_sync(rs->dev);
 }
 
 static int rockchip_spi_prepare_message(struct spi_master *master,

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

queue-4.4/spi-rockchip-make-sure-spi-clk-is-on-in-rockchip_spi_set_cs.patch