浏览代码

[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>
eric miao 18 年之前
父节点
当前提交
732ce16066
共有 1 个文件被更改,包括 10 次插入0 次删除
  1. 10 0
      arch/arm/mach-pxa/ssp.c

+ 10 - 0
arch/arm/mach-pxa/ssp.c

@@ -138,6 +138,16 @@ int ssp_flush(struct ssp_dev *dev)
 	struct ssp_device *ssp = dev->ssp;
 	struct ssp_device *ssp = dev->ssp;
 	int timeout = TIMEOUT * 2;
 	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 {
 	do {
 		while (__raw_readl(ssp->mmio_base + SSSR) & SSSR_RNE) {
 		while (__raw_readl(ssp->mmio_base + SSSR) & SSSR_RNE) {
 		        if (!--timeout)
 		        if (!--timeout)