commit 6d631d0519ab042fe1f16c450f889abbbea86861
author Linux Build Service Account <lnxbuild@localhost> Thu May 31 03:38:22 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Thu May 31 03:38:22 2012 -0700
tree 2da68e975e219f5b6fa144ed04a27dcdaa617911
parent 041d672ba32de1ed58cef1d40bfeb3c85a739027
parent 0d50138cdd0fe1a116e737e30863958c1d6f15d1

Merge "mpq8064: uart support for hrd and dtv targets"

target/msm8960/include/target/board.h

diff --git a/target/msm8960/include/target/board.h b/target/msm8960/include/target/board.h
index a47f16a..d40a7a0 100644
--- a/target/msm8960/include/target/board.h
+++ b/target/msm8960/include/target/board.h
@@ -57,7 +57,7 @@
 #define LINUX_MACHTYPE_8064_MTP     3949
 #define LINUX_MACHTYPE_8064_LIQUID  3951
 #define LINUX_MACHTYPE_8064_MPQ_CDP 3993
-#define LINUX_MACHTYPE_8064_HRD     3994
-#define LINUX_MACHTYPE_8064_DTV     3995
+#define LINUX_MACHTYPE_8064_MPQ_HRD 3994
+#define LINUX_MACHTYPE_8064_MPQ_DTV 3995
 
 #endif

target/msm8960/init.c

diff --git a/target/msm8960/init.c b/target/msm8960/init.c
index 24f70a4..47808f7 100644
--- a/target/msm8960/init.c
+++ b/target/msm8960/init.c
@@ -271,6 +271,8 @@
 		break;
 
 	case LINUX_MACHTYPE_8064_MPQ_CDP:
+	case LINUX_MACHTYPE_8064_MPQ_HRD:
+	case LINUX_MACHTYPE_8064_MPQ_DTV:
 		uart_dm_init(5, 0x1A200000, 0x1A240000);
 		break;
 
@@ -349,10 +351,10 @@
 			target_id = LINUX_MACHTYPE_8064_MPQ_CDP;
 			break;
 		case HW_PLATFORM_HRD:
-			target_id = LINUX_MACHTYPE_8064_HRD;
+			target_id = LINUX_MACHTYPE_8064_MPQ_HRD;
 			break;
 		case HW_PLATFORM_DTV:
-			target_id = LINUX_MACHTYPE_8064_DTV;
+			target_id = LINUX_MACHTYPE_8064_MPQ_DTV;
 			break;
 		default:
 			target_id = LINUX_MACHTYPE_8064_MPQ_CDP;