commit 85f5e3341223679e6f7053eec9a5a68fc65355ef
author Linux Build Service Account <lnxbuild@localhost> Sat Jan 21 21:07:06 2012 -0800
committer QuIC Gerrit Code Review <code-review@localhost> Sat Jan 21 21:07:06 2012 -0800
tree f5da7c4f58128e96466cfe4e41aabf0e9f6fdd2e
parent 5103c3ae368b1db81982dfdf9b989b24d93385cf
parent f35fd738cb4155ac47c08c8db615237dc5e772ce

Merge "msm: iomap: Add QFPROM entry for TSENS" into msm-3.0

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

diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8064.h b/arch/arm/mach-msm/include/mach/msm_iomap-8064.h
index 15b2856..c584c66 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8064.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8064.h
@@ -97,5 +97,7 @@
 
 #define APQ8064_SAW_L2_PHYS		0x02012000
 #define APQ8064_SAW_L2_SIZE		SZ_4K
+#define APQ8064_QFPROM_PHYS		0x00700000
+#define APQ8064_QFPROM_SIZE		SZ_4K
 
 #endif

arch/arm/mach-msm/io.c

diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 9622a4c..0f9d707 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -278,6 +278,7 @@
 		.length =   MSM_SHARED_RAM_SIZE,
 		.type =     MT_DEVICE,
 	},
+	MSM_CHIP_DEVICE(QFPROM, APQ8064),
 };
 
 void __init msm_map_apq8064_io(void)