From 9c0610f1717dc974231ba5fcf93b0243147145f6 Mon Sep 17 00:00:00 2001
From: Daniel Ribeiro <drwyrm@gmail.com>
Date: Tue, 21 Apr 2009 12:24:43 -0700
Subject: [PATCH] --- yaml --- r: 143801 b: refs/heads/master c:
 148da331200a0df8195e10eb8a38fd77bd7003af h: refs/heads/master i:   143799:
 8063c5fe48cd9fc61e4629cc931fb40622f55734 v: v3

---
 [refs]                         | 2 +-
 trunk/drivers/spi/pxa2xx_spi.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 65609199d133..469917f96606 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa0b8f3687f06ac0e5a2b24547fdf431e923c475
+refs/heads/master: 148da331200a0df8195e10eb8a38fd77bd7003af
diff --git a/trunk/drivers/spi/pxa2xx_spi.c b/trunk/drivers/spi/pxa2xx_spi.c
index c76feea5fe25..1a00b415bcc4 100644
--- a/trunk/drivers/spi/pxa2xx_spi.c
+++ b/trunk/drivers/spi/pxa2xx_spi.c
@@ -1700,6 +1700,13 @@ static int pxa2xx_spi_resume(struct platform_device *pdev)
 	struct ssp_device *ssp = drv_data->ssp;
 	int status = 0;
 
+	if (drv_data->rx_channel != -1)
+		DRCMR(drv_data->ssp->drcmr_rx) =
+			DRCMR_MAPVLD | drv_data->rx_channel;
+	if (drv_data->tx_channel != -1)
+		DRCMR(drv_data->ssp->drcmr_tx) =
+			DRCMR_MAPVLD | drv_data->tx_channel;
+
 	/* Enable the SSP clock */
 	clk_enable(ssp->clk);