commit fc08b6dc6bc1585bf9b64be932202819a1f38bd2
author Linux Build Service Account <lnxbuild@localhost> Thu Jan 05 23:09:55 2017 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Jan 05 23:09:55 2017 -0800
tree 55b9d8478d13c2263b4015edf60524360fc6f530
parent fda65b382aea364a61d182e703abe354bff0daa0
parent c16e4f9efe7098d2c18d09ca17073bca0d5bf167

Merge "target: mdm9640: Disable rpm smd."

platform/mdm9640/platform.c

diff --git a/platform/mdm9640/platform.c b/platform/mdm9640/platform.c
index 29181be..db301ee 100644
--- a/platform/mdm9640/platform.c
+++ b/platform/mdm9640/platform.c
@@ -69,7 +69,6 @@
 	{MEMBASE,               MEMBASE,                    MEMSIZE / MB,              LK_MEMORY},
 	{MSM_IOMAP_BASE,        MSM_IOMAP_BASE,             MSM_IOMAP_SIZE,            IOMAP_MEMORY},
 	{SCRATCH_REGION1,       SCRATCH_REGION1, SCRATCH_REGION1_SIZE / MB, SCRATCH_MEMORY},
-	{SCRATCH_REGION2,       SCRATCH_REGION2, SCRATCH_REGION2_SIZE / MB, SCRATCH_MEMORY},
 	{KERNEL_REGION,         KERNEL_REGION, KERNEL_REGION_SIZE / MB, SCRATCH_MEMORY},
 };
 

target/mdm9640/init.c

diff --git a/target/mdm9640/init.c b/target/mdm9640/init.c
index 9e02cf2..b335731 100644
--- a/target/mdm9640/init.c
+++ b/target/mdm9640/init.c
@@ -150,7 +150,8 @@
 	pmic_info_populate();
 
 	spmi_init(PMIC_ARB_CHANNEL_NUM, PMIC_ARB_OWNER_ID);
-	rpm_smd_init();
+	if(!platform_is_sdxhedgehog())
+		rpm_smd_init();
 
 	if (platform_boot_dev_isemmc()) {
 		target_sdc_init();
@@ -419,7 +420,8 @@
 	if (crypto_initialized())
 		crypto_eng_cleanup();
 
-	rpm_smd_uninit();
+	if(!platform_is_sdxhedgehog())
+		rpm_smd_uninit();
 }
 
 void target_usb_phy_reset(void)

target/mdm9640/meminfo.c

diff --git a/target/mdm9640/meminfo.c b/target/mdm9640/meminfo.c
index 7516b42..d71630c 100644
--- a/target/mdm9640/meminfo.c
+++ b/target/mdm9640/meminfo.c
@@ -77,10 +77,10 @@
 
 void *target_get_scratch_address(void)
 {
-	return ((void *) VA((addr_t)SCRATCH_REGION2));
+	return ((void *) VA((addr_t)SCRATCH_REGION1));
 }
 
 unsigned target_get_max_flash_size(void)
 {
-	return (SCRATCH_REGION2_SIZE);
+	return (SCRATCH_REGION1_SIZE);
 }