From: eric miao <eric.miao@marvell.com>
Date: Fri, 23 Nov 2007 06:55:59 +0000 (+0800)
Subject: [ARM] pxa: ensure SSP TX FIFO is empty instead of not full for pxa3xx
X-Git-Tag: v2.6.25-rc1~1175^2^2~30
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=732ce16066964bb7b60947750e48374cc32bd310;p=profile%2Fivi%2Fkernel-x86-ivi.git

[ARM] pxa: ensure SSP TX FIFO is empty instead of not full for pxa3xx

Signed-off-by: eric miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-pxa/ssp.c b/arch/arm/mach-pxa/ssp.c
index 575b662..4954da9 100644
--- a/arch/arm/mach-pxa/ssp.c
+++ b/arch/arm/mach-pxa/ssp.c
@@ -138,6 +138,16 @@ int ssp_flush(struct ssp_dev *dev)
 	struct ssp_device *ssp = dev->ssp;
 	int timeout = TIMEOUT * 2;
 
+	/* ensure TX FIFO is empty instead of not full */
+	if (cpu_is_pxa3xx()) {
+		while (__raw_readl(ssp->mmio_base + SSSR) & 0xf00) {
+			if (!--timeout)
+				return -ETIMEDOUT;
+			cpu_relax();
+		}
+		timeout = TIMEOUT * 2;
+	}
+
 	do {
 		while (__raw_readl(ssp->mmio_base + SSSR) & SSSR_RNE) {
 		        if (!--timeout)