From 78a42761f2c2ce8083c3457eecd747b05c18aa45 Mon Sep 17 00:00:00 2001
From: Mark Lord <liml@rtr.ca>
Date: Wed, 28 May 2008 13:41:52 -0400
Subject: [PATCH] --- yaml --- r: 97532 b: refs/heads/master c:
 0388a8c0d54aa039758a8eca68d82325a563f8db h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/ata/sata_mv.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d8ec20a88aff..3ca9e13fcfcf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b406c7a6655da7a2fcd9f72e41262f93ff707748
+refs/heads/master: 0388a8c0d54aa039758a8eca68d82325a563f8db
diff --git a/trunk/drivers/ata/sata_mv.c b/trunk/drivers/ata/sata_mv.c
index 17093e600d80..acf347f71a2f 100644
--- a/trunk/drivers/ata/sata_mv.c
+++ b/trunk/drivers/ata/sata_mv.c
@@ -72,7 +72,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME	"sata_mv"
-#define DRV_VERSION	"1.23"
+#define DRV_VERSION	"1.24"
 
 enum {
 	/* BAR's are enumerated in terms of pci_resource_start() terms */
@@ -2558,6 +2558,10 @@ static void mv6_phy_errata(struct mv_host_priv *hpriv, void __iomem *mmio,
 	m3 = readl(port_mmio + PHY_MODE3);
 	m3 = (m3 & 0x1f) | (0x5555601 << 5);
 
+	/* Guideline 88F5182 (GL# SATA-S11) */
+	if (IS_SOC(hpriv))
+		m3 &= ~0x1c;
+
 	if (fix_phy_mode4) {
 		u32 m4;