Merge "msm_shared: mdp: Fix MDP version check to support display"
diff --git a/platform/msm8610/include/platform/iomap.h b/platform/msm8610/include/platform/iomap.h
index 0c00cf4..348487e 100644
--- a/platform/msm8610/include/platform/iomap.h
+++ b/platform/msm8610/include/platform/iomap.h
@@ -42,6 +42,10 @@
#define MSM_SHARED_IMEM_BASE 0xFE805000
#define RESTART_REASON_ADDR (MSM_SHARED_IMEM_BASE + 0x65C)
+#define BS_INFO_OFFSET (0x6B0)
+#define BS_INFO_ADDR (MSM_SHARED_IMEM_BASE + BS_INFO_OFFSET)
+#define MPM2_MPM_SLEEP_TIMETICK_COUNT_VAL 0xFC4A3000
+
#define MSM_GIC_DIST_BASE APPS_SS_BASE
#define MSM_GIC_CPU_BASE (APPS_SS_BASE + 0x2000)
#define APPS_APCS_QTMR_AC_BASE (APPS_SS_BASE + 0x00020000)
diff --git a/platform/msm8610/platform.c b/platform/msm8610/platform.c
index ac74205..40ce82a 100644
--- a/platform/msm8610/platform.c
+++ b/platform/msm8610/platform.c
@@ -36,6 +36,7 @@
#include <arch/arm/mmu.h>
#include <smem.h>
#include <board.h>
+#include <boot_stats.h>
#define MB (1024*1024)
@@ -76,6 +77,16 @@
dprintf(INFO, "platform_init()\n");
}
+uint32_t platform_get_sclk_count(void)
+{
+ return readl(MPM2_MPM_SLEEP_TIMETICK_COUNT_VAL);
+}
+
+addr_t get_bs_info_addr()
+{
+ return ((addr_t)BS_INFO_ADDR);
+}
+
void platform_uninit(void)
{
qtimer_uninit();
diff --git a/target/msm8226/init.c b/target/msm8226/init.c
index 19568cb..a836e12 100644
--- a/target/msm8226/init.c
+++ b/target/msm8226/init.c
@@ -59,6 +59,12 @@
#define TLMM_VOL_UP_BTN_GPIO 106
+enum target_subtype {
+ HW_PLATFORM_SUBTYPE_SKUAA = 1,
+ HW_PLATFORM_SUBTYPE_SKUF = 2,
+ HW_PLATFORM_SUBTYPE_SKUAB = 3,
+};
+
static uint32_t mmc_sdhci_base[] =
{ MSM_SDC1_SDHCI_BASE, MSM_SDC2_SDHCI_BASE, MSM_SDC3_SDHCI_BASE };
@@ -218,6 +224,12 @@
{
case HW_PLATFORM_SUBTYPE_UNKNOWN:
break;
+ case HW_PLATFORM_SUBTYPE_SKUAA:
+ break;
+ case HW_PLATFORM_SUBTYPE_SKUF:
+ break;
+ case HW_PLATFORM_SUBTYPE_SKUAB:
+ break;
default:
dprintf(CRITICAL, "Platform Subtype : %u is not supported\n", platform_subtype);
ASSERT(0);
diff --git a/target/msm8226/rules.mk b/target/msm8226/rules.mk
index c5b9059..3b24362 100644
--- a/target/msm8226/rules.mk
+++ b/target/msm8226/rules.mk
@@ -14,7 +14,7 @@
RAMDISK_ADDR := BASE_ADDR+0x01000000
SCRATCH_ADDR := 0x10000000
-DEFINES += DISPLAY_SPLASH_SCREEN=0
+DEFINES += DISPLAY_SPLASH_SCREEN=1
DEFINES += DISPLAY_TYPE_MIPI=1
DEFINES += DISPLAY_TYPE_DSI6G=1
DEFINES += DISPLAY_TYPE_CMD_MODE=0
diff --git a/target/msm8610/init.c b/target/msm8610/init.c
index 6537a4d..205f023 100644
--- a/target/msm8610/init.c
+++ b/target/msm8610/init.c
@@ -48,6 +48,12 @@
#define TLMM_VOL_UP_BTN_GPIO 72
+enum target_subtype {
+ HW_PLATFORM_SUBTYPE_SKUAA = 1,
+ HW_PLATFORM_SUBTYPE_SKUF = 2,
+ HW_PLATFORM_SUBTYPE_SKUAB = 3,
+};
+
static uint32_t mmc_sdc_base[] =
{ MSM_SDC1_BASE, MSM_SDC2_BASE };
@@ -152,6 +158,12 @@
{
case HW_PLATFORM_SUBTYPE_UNKNOWN:
break;
+ case HW_PLATFORM_SUBTYPE_SKUAA:
+ break;
+ case HW_PLATFORM_SUBTYPE_SKUF:
+ break;
+ case HW_PLATFORM_SUBTYPE_SKUAB:
+ break;
default:
dprintf(CRITICAL, "Platform Subtype : %u is not supported\n", platform_subtype);
ASSERT(0);