--- zzzz-none-000/linux-3.10.107/arch/arm/mach-msm/include/mach/msm_iomap-8960.h	2017-06-27 09:49:32.000000000 +0000
+++ vr9-7490-729/linux-3.10.107/arch/arm/mach-msm/include/mach/msm_iomap-8960.h	2021-11-10 11:53:52.000000000 +0000
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
+ * Copyright (c) 2008-2011, The Linux Foundation. All rights reserved.
  * Author: Brian Swetland <swetland@google.com>
  *
  * This software is licensed under the terms of the GNU General Public
@@ -32,22 +32,82 @@
  *
  */
 
+#define MSM8960_TMR_PHYS		0x0200A000
+#define MSM8960_TMR_SIZE		SZ_4K
 
-#define MSM8960_QGIC_DIST_PHYS	0x02000000
-#define MSM8960_QGIC_DIST_SIZE	SZ_4K
+#define MSM8960_TMR0_PHYS		0x0208A000
+#define MSM8960_TMR0_SIZE		SZ_4K
 
-#define MSM8960_QGIC_CPU_PHYS	0x02002000
-#define MSM8960_QGIC_CPU_SIZE	SZ_4K
+#define MSM8960_RPM_PHYS		0x00108000
+#define MSM8960_RPM_SIZE		SZ_4K
 
-#define MSM8960_TMR_PHYS	0x0200A000
-#define MSM8960_TMR_SIZE	SZ_4K
+#define MSM8960_RPM_MPM_PHYS		0x00200000
+#define MSM8960_RPM_MPM_SIZE		SZ_4K
 
-#define MSM8960_TMR0_PHYS	0x0208A000
-#define MSM8960_TMR0_SIZE	SZ_4K
+#define MSM8960_TCSR_PHYS		0x1A400000
+#define MSM8960_TCSR_SIZE		SZ_4K
+
+#define MSM8960_APCS_GCC_PHYS		0x02011000
+#define MSM8960_APCS_GCC_SIZE		SZ_4K
+
+#define MSM8960_SAW_L2_PHYS		0x02012000
+#define MSM8960_SAW_L2_SIZE		SZ_4K
+
+#define MSM8960_SAW0_PHYS		0x02089000
+#define MSM8960_SAW0_SIZE		SZ_4K
+
+#define MSM8960_SAW1_PHYS		0x02099000
+#define MSM8960_SAW1_SIZE		SZ_4K
+
+#define MSM8960_IMEM_PHYS		0x2A03F000
+#define MSM8960_IMEM_SIZE		SZ_4K
+
+#define MSM8960_ACC0_PHYS		0x02088000
+#define MSM8960_ACC0_SIZE		SZ_4K
+
+#define MSM8960_ACC1_PHYS		0x02098000
+#define MSM8960_ACC1_SIZE		SZ_4K
+
+#define MSM8960_QGIC_DIST_PHYS		0x02000000
+#define MSM8960_QGIC_DIST_SIZE		SZ_4K
+
+#define MSM8960_QGIC_CPU_PHYS		0x02002000
+#define MSM8960_QGIC_CPU_SIZE		SZ_4K
+
+#define MSM8960_CLK_CTL_PHYS		0x00900000
+#define MSM8960_CLK_CTL_SIZE		SZ_16K
+
+#define MSM8960_MMSS_CLK_CTL_PHYS	0x04000000
+#define MSM8960_MMSS_CLK_CTL_SIZE	SZ_4K
+
+#define MSM8960_LPASS_CLK_CTL_PHYS	0x28000000
+#define MSM8960_LPASS_CLK_CTL_SIZE	SZ_4K
+
+#define MSM8960_HFPLL_PHYS		0x00903000
+#define MSM8960_HFPLL_SIZE		SZ_4K
+
+#define MSM8960_TLMM_PHYS		0x00800000
+#define MSM8960_TLMM_SIZE		SZ_16K
+
+#define MSM8960_SIC_NON_SECURE_PHYS	0x12100000
+#define MSM8960_SIC_NON_SECURE_SIZE	SZ_64K
+
+#define MSM_GPT_BASE			(MSM_TMR_BASE + 0x4)
+#define MSM_DGT_BASE			(MSM_TMR_BASE + 0x24)
+
+#define MSM8960_HDMI_PHYS		0x04A00000
+#define MSM8960_HDMI_SIZE		SZ_4K
 
 #ifdef CONFIG_DEBUG_MSM8960_UART
-#define MSM_DEBUG_UART_BASE	0xF0040000
-#define MSM_DEBUG_UART_PHYS	0x16440000
+#define MSM_DEBUG_UART_BASE		IOMEM(0xFA740000)
+#define MSM_DEBUG_UART_PHYS		0x16440000
+#endif
+
+#define MSM8960_QFPROM_PHYS		0x00700000
+#define MSM8960_QFPROM_SIZE		SZ_4K
+
+#ifndef __ASSEMBLY__
+extern void msm_map_msm8960_io(void);
 #endif
 
 #endif