Merge "Add support for femto development platform"
diff --git a/platform/msm8960/gpio.c b/platform/msm8960/gpio.c
index 3bd7738..07d05a0 100755
--- a/platform/msm8960/gpio.c
+++ b/platform/msm8960/gpio.c
@@ -95,6 +95,15 @@
GPIO_8MA, GPIO_DISABLE);
break;
+ case GSBI_ID_2:
+ /* configure rx gpio */
+ gpio_tlmm_config(22, 1, GPIO_INPUT, GPIO_NO_PULL,
+ GPIO_8MA, GPIO_DISABLE);
+ /* configure tx gpio */
+ gpio_tlmm_config(23, 1, GPIO_OUTPUT, GPIO_NO_PULL,
+ GPIO_8MA, GPIO_DISABLE);
+ break;
+
case GSBI_ID_7:
/* configure rx gpio */
diff --git a/platform/msm_shared/smem.h b/platform/msm_shared/smem.h
index f4b3606..33de915 100755
--- a/platform/msm_shared/smem.h
+++ b/platform/msm_shared/smem.h
@@ -263,8 +263,9 @@
HW_PLATFORM_DRAGON = 10,
HW_PLATFORM_HRD = 13,
HW_PLATFORM_DTV = 14,
- HW_PLATFORM_RUMI = 15,
- HW_PLATFORM_VIRTIO = 16,
+ HW_PLATFORM_RUMI = 15,
+ HW_PLATFORM_VIRTIO = 16,
+ HW_PLATFORM_BTS = 19,
HW_PLATFORM_32BITS = 0x7FFFFFFF,
};
diff --git a/target/msm8960/include/target/board.h b/target/msm8960/include/target/board.h
index 906eb8a..1e2606a 100644
--- a/target/msm8960/include/target/board.h
+++ b/target/msm8960/include/target/board.h
@@ -1,4 +1,5 @@
-/* Copyright (c) 2012, Code Aurora Forum. All rights reserved.
+ /* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
+ *
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are
@@ -9,7 +10,7 @@
* copyright notice, this list of conditions and the following
* disclaimer in the documentation and/or other materials provided
* with the distribution.
- * * Neither the name of Code Aurora Forum, Inc. nor the names of its
+ * * Neither the name of Linux Foundation nor the names of its
* contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
@@ -58,5 +59,6 @@
#define LINUX_MACHTYPE_8064_MPQ_CDP 3993
#define LINUX_MACHTYPE_8064_MPQ_HRD 3994
#define LINUX_MACHTYPE_8064_MPQ_DTV 3995
+#define LINUX_MACHTYPE_8064_EP 3996
#endif
diff --git a/target/msm8960/init.c b/target/msm8960/init.c
index 99a79d4..423feaa 100755
--- a/target/msm8960/init.c
+++ b/target/msm8960/init.c
@@ -301,6 +301,10 @@
uart_dm_init(7, 0x16600000, 0x16640000);
break;
+ case LINUX_MACHTYPE_8064_EP:
+ uart_dm_init(2, 0x12480000, 0x12490000);
+ break;
+
case LINUX_MACHTYPE_8064_MPQ_CDP:
case LINUX_MACHTYPE_8064_MPQ_HRD:
case LINUX_MACHTYPE_8064_MPQ_DTV:
@@ -408,6 +412,9 @@
case HW_PLATFORM_LIQUID:
target_id = LINUX_MACHTYPE_8064_LIQUID;
break;
+ case HW_PLATFORM_BTS:
+ target_id = LINUX_MACHTYPE_8064_EP;
+ break;
default:
target_id = LINUX_MACHTYPE_8064_CDP;
}