Merge "msm8960: Add support for MSM8130 variants"
diff --git a/target/msm8960/atags.c b/target/msm8960/atags.c
index add3f09..8ac045c 100755
--- a/target/msm8960/atags.c
+++ b/target/msm8960/atags.c
@@ -164,15 +164,18 @@
case MPQ8064:
ptr = target_atag(ptr, mpq8064_first_256M, ARRAY_SIZE(mpq8064_first_256M));
break;
+ case MSM8130:
case MSM8230:
case MSM8930:
case MSM8630:
+ case MSM8130AA:
case MSM8230AA:
case MSM8630AA:
case MSM8930AA:
case MSM8930AB:
case MSM8630AB:
case MSM8230AB:
+ case MSM8130AB:
case APQ8030AB:
case APQ8030:
case APQ8030AA:
diff --git a/target/msm8960/init.c b/target/msm8960/init.c
index cf57250..d0c15fc 100755
--- a/target/msm8960/init.c
+++ b/target/msm8960/init.c
@@ -115,15 +115,18 @@
case MSM8660AB:
msm8960_keypad_init();
break;
+ case MSM8130:
case MSM8230:
case MSM8630:
case MSM8930:
+ case MSM8130AA:
case MSM8230AA:
case MSM8630AA:
case MSM8930AA:
case MSM8930AB:
case MSM8630AB:
case MSM8230AB:
+ case MSM8130AB:
case APQ8030AB:
case APQ8030:
case APQ8030AA:
@@ -357,7 +360,9 @@
default:
target_id = LINUX_MACHTYPE_8960_CDP;
}
- } else if ((platform == MSM8230) || (platform == MSM8630) ||
+ } else if ((platform == MSM8130) ||
+ (platform == MSM8130AA) || (platform == MSM8130AB) ||
+ (platform == MSM8230) || (platform == MSM8630) ||
(platform == MSM8930) || (platform == MSM8230AA) ||
(platform == MSM8630AA) || (platform == MSM8930AA) ||
(platform == MSM8930AB) || (platform == MSM8630AB) ||