commit ae2b5ab8c72ed768d31abefeec99af445f073dc2
author Linux Build Service Account <lnxbuild@localhost> Sat Jan 21 04:44:57 2012 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Sat Jan 21 04:44:57 2012 -0800
tree b0cfa1582155a5b607f41baad71b423d61237b11
parent 12f522c922a7d30379dc91bd72e111195a414b48
parent 4b931ed127737e1cd97c29f576d0606d7f0fb644

Merge "msm: smd: fix legacy DS port registration" into msm-3.0

arch/arm/mach-msm/smd_tty.c

diff --git a/arch/arm/mach-msm/smd_tty.c b/arch/arm/mach-msm/smd_tty.c
index c8248a7..4248be4 100644
--- a/arch/arm/mach-msm/smd_tty.c
+++ b/arch/arm/mach-msm/smd_tty.c
@@ -1,7 +1,7 @@
 /* arch/arm/mach-msm/smd_tty.c
  *
  * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2009-2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2009-2012, Code Aurora Forum. All rights reserved.
  * Author: Brian Swetland <swetland@google.com>
  *
  * This software is licensed under the terms of the GNU General Public
@@ -552,8 +552,11 @@
 			legacy_ds |= cpu_is_msm7x01() || cpu_is_msm7x25();
 			legacy_ds |= cpu_is_msm7x27() || cpu_is_msm7x30();
 			legacy_ds |= cpu_is_qsd8x50() || cpu_is_msm8x55();
+			/*
+			 * use legacy mode for 8660 Standalone (subtype 0)
+			 */
 			legacy_ds |= cpu_is_msm8x60() &&
-					(socinfo_get_platform_subtype() == 0x1);
+					(socinfo_get_platform_subtype() == 0x0);
 
 			if (!legacy_ds)
 				continue;