Merge "mdm9615: Add support to include/exclude FOTA partitions"
diff --git a/platform/msm8960/acpuclock.c b/platform/msm8960/acpuclock.c
index cebc8d1..6c24aef 100644
--- a/platform/msm8960/acpuclock.c
+++ b/platform/msm8960/acpuclock.c
@@ -208,10 +208,10 @@
void ce_clock_init(void)
{
/* Enable HCLK for CE */
- clk_get_set_enable("ce_pclk", 0, 1);
+ clk_get_set_enable("ce1_pclk", 0, 1);
/* Enable core clk for CE */
- clk_get_set_enable("ce_clk", 0, 1);
+ clk_get_set_enable("ce1_clk", 0, 1);
}
/* Async Reset CE1 */
diff --git a/platform/msm8960/gpio.c b/platform/msm8960/gpio.c
index 783d4c1..82d99bd 100644
--- a/platform/msm8960/gpio.c
+++ b/platform/msm8960/gpio.c
@@ -63,7 +63,24 @@
/* Configure gpio for uart - based on gsbi id */
void gpio_config_uart_dm(uint8_t id)
{
- if(board_platform_id() == APQ8064)
+ if(board_platform_id() == MPQ8064)
+ {
+ switch (id) {
+
+ case GSBI_ID_5:
+ /* configure rx gpio */
+ gpio_tlmm_config(52, 1, GPIO_INPUT, GPIO_NO_PULL,
+ GPIO_8MA, GPIO_DISABLE);
+ /* configure tx gpio */
+ gpio_tlmm_config(51, 1, GPIO_OUTPUT, GPIO_NO_PULL,
+ GPIO_8MA, GPIO_DISABLE);
+ break;
+
+ default:
+ ASSERT(0);
+ }
+ }
+ else if(board_platform_id() == APQ8064)
{
switch (id) {
diff --git a/platform/msm_shared/include/board.h b/platform/msm_shared/include/board.h
index 1eef91e..59e19e3 100644
--- a/platform/msm_shared/include/board.h
+++ b/platform/msm_shared/include/board.h
@@ -53,6 +53,7 @@
#define LINUX_MACHTYPE_8064_CDP 3948
#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
diff --git a/target/msm8960/init.c b/target/msm8960/init.c
index 4a5d84f..7488800 100644
--- a/target/msm8960/init.c
+++ b/target/msm8960/init.c
@@ -123,8 +123,8 @@
if ((platform_id == MSM8960) || (platform_id == MSM8660A)
|| (platform_id == MSM8260A) || (platform_id == APQ8060A)
|| (platform_id == MSM8230) || (platform_id == MSM8630)
- || (platform_id == MSM8930) || (platform_id == APQ8030)
- || (platform_id == MSM8227) || (platform_id == MSM8627)) {
+ || (platform_id == APQ8030) || (platform_id == MSM8227)
+ || (platform_id == MSM8627)) {
panel_backlight_on();
display_init();
dprintf(SPEW, "Diplay initialized\n");
@@ -277,6 +277,10 @@
uart_dm_init(7, 0x16600000, 0x16640000);
break;
+ case LINUX_MACHTYPE_8064_MPQ_CDP:
+ uart_dm_init(5, 0x1A200000, 0x1A240000);
+ break;
+
case LINUX_MACHTYPE_8627_CDP:
case LINUX_MACHTYPE_8627_MTP: