msm: 8960: Add LiQUID machine support
Signed-off-by: Amir Samuelov <amirs@codeaurora.org>
Conflicts:
arch/arm/mach-msm/Kconfig
diff --git a/arch/arm/configs/msm8960_defconfig b/arch/arm/configs/msm8960_defconfig
index 1bfd83d..fddd877 100644
--- a/arch/arm/configs/msm8960_defconfig
+++ b/arch/arm/configs/msm8960_defconfig
@@ -38,6 +38,7 @@
CONFIG_MACH_MSM8960_CDP=y
CONFIG_MACH_MSM8960_MTP=y
CONFIG_MACH_MSM8960_FLUID=y
+CONFIG_MACH_MSM8960_LIQUID=y
# CONFIG_MSM_STACKED_MEMORY is not set
CONFIG_KERNEL_PMEM_EBI_REGION=y
# CONFIG_MSM_JTAG_V7 is not set
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 653da93..dc2facd 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -478,6 +478,12 @@
help
Support for the Qualcomm MSM8960 FLUID device.
+config MACH_MSM8960_LIQUID
+ depends on ARCH_MSM8960
+ bool "MSM8960 LIQUID"
+ help
+ Support for the Qualcomm MSM8960 LIQUID device.
+
config MSM_USE_TSIF1
depends on ARCH_MSM8X60
bool "MSM8x60 use TSIF1"
diff --git a/arch/arm/mach-msm/board-msm8960.c b/arch/arm/mach-msm/board-msm8960.c
index 4137833..2cadfbf 100644
--- a/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@ -3514,3 +3514,12 @@
.init_machine = msm8960_cdp_init,
.init_early = msm8960_allocate_memory_regions,
MACHINE_END
+
+MACHINE_START(MSM8960_LIQUID, "QCT MSM8960 LIQUID")
+ .map_io = msm8960_map_io,
+ .reserve = msm8960_reserve,
+ .init_irq = msm8960_init_irq,
+ .timer = &msm_timer,
+ .init_machine = msm8960_cdp_init,
+ .init_early = msm8960_allocate_memory_regions,
+MACHINE_END