Merge "msm: Undo duplication of debug image shared IMEM cookie"

arch/arm/mach-msm/include/mach/msm_iomap-8974.h

@@ -45,13 +45,4 @@
 #define MSM_DEBUG_UART_PHYS	0xF991E000
 #endif
 
-/*
- * IMEM is retained for secure watchdog reset
- * Debug Image looks at actual IMEM to
- * do memory dumping.
- */
-
-#define MSM8974_DBG_IMEM_PHYS	0xFE805000
-#define MSM8974_DBG_IMEM_SIZE	SZ_4K
-
 #endif

arch/arm/mach-msm/include/mach/msm_iomap-9625.h

@@ -48,13 +48,4 @@
 #define MSM_DEBUG_UART_PHYS	0xF991E000
 #endif
 
-/*
- * IMEM is retained for secure watchdog reset
- * Debug Image looks at actual IMEM to
- * do memory dumping.
- */
-
-#define MSM9625_DBG_IMEM_PHYS	0xFE807800
-#define MSM9625_DBG_IMEM_SIZE	SZ_4K
-
 #endif

arch/arm/mach-msm/include/mach/msm_iomap.h

@@ -98,7 +98,6 @@
 #define MSM_MDC_BASE		IOMEM(0xFA400000)	/*  1M */
 #define MSM_AD5_BASE		IOMEM(0xFA900000)	/*  13M (D00000)
 							  0xFB600000 */
-#define MSM_DBG_IMEM_BASE	IOMEM(0xFB600000)	/*  4K */
 
 #define MSM_STRONGLY_ORDERED_PAGE	0xFA0F0000
 #define MSM8625_CPU_PHYS		0x0FE00000

arch/arm/mach-msm/io.c

@@ -313,7 +313,6 @@ static struct map_desc msm_8974_io_desc[] __initdata = {
 #ifdef CONFIG_DEBUG_MSM8974_UART
 	MSM_DEVICE(DEBUG_UART),
 #endif
-	MSM_CHIP_DEVICE(DBG_IMEM, MSM8974),
 };
 
 void __init msm_map_8974_io(void)
@@ -480,7 +479,6 @@ static struct map_desc msm9625_io_desc[] __initdata = {
 #ifdef CONFIG_DEBUG_MSM9625_UART
 	MSM_DEVICE(DEBUG_UART),
 #endif
-	MSM_CHIP_DEVICE(DBG_IMEM, MSM9625),
 };
 
 void __init msm_map_msm9625_io(void)

arch/arm/mach-msm/msm_memory_dump.c

@@ -57,12 +57,6 @@ static int __init init_memory_dump(void)
 	mem_dump_data.dump_table_phys = virt_to_phys(table);
 	writel_relaxed(mem_dump_data.dump_table_phys,
 				MSM_IMEM_BASE + DUMP_TABLE_OFFSET);
-	/* TODO: Write to Debug image IMEM.
-	 * Once IMEM issues are resolved MSM_IMEM_BASE
-	 * will have actual mapping.
-	 */
-	writel_relaxed(mem_dump_data.dump_table_phys,
-				MSM_DBG_IMEM_BASE + DUMP_TABLE_OFFSET);
 	printk(KERN_INFO "MSM Memory Dump table set up\n");
 	return 0;
 }