summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbhimanyu Kapur <abhimany@codeaurora.org>2016-02-08 14:17:14 -0800
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:07:47 -0700
commit77228fba61416c8ca65dd41818f916eaa39d1773 (patch)
tree637e72097ef4f22bbef75fb8b05dfbf59df6d616
parenta42ed83c2ffc1feb35cb579b43f322e3c922e1ba (diff)
arm64: Split out MSM8996 from generic ARCH_QCOM platform Kconfig
Add support for CONFIG_MSM89986 and split it out from generic ARCH_QCOM platform. Change-Id: Ibc287ffb76e5599ba63449534b264e4f31c98ec6 Signed-off-by: Abhimanyu Kapur <abhimany@codeaurora.org>
-rw-r--r--arch/arm64/Kconfig.platforms7
-rw-r--r--arch/arm64/boot/dts/qcom/Makefile2
-rw-r--r--arch/arm64/configs/msm_defconfig1
3 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 6d26da005bf5..ac6e64b4fee5 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -57,6 +57,13 @@ config ARCH_QCOM
help
This enables support for the ARMv8 based Qualcomm chipsets.
+config ARCH_MSM8996
+ bool "Enable Support for Qualcomm MSM8996"
+ depends on ARCH_QCOM
+ help
+ This enables support for the MSM8996 chipset. If you do not
+ wish to build a kernel that runs on this chipset, say 'N' here.
+
config ARCH_MSMCOBALT
bool "Enable Support for Qualcomm MSMCOBALT"
depends on ARCH_QCOM
diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile
index 8457e5d21820..20ccf581ef85 100644
--- a/arch/arm64/boot/dts/qcom/Makefile
+++ b/arch/arm64/boot/dts/qcom/Makefile
@@ -1,4 +1,4 @@
-dtb-$(CONFIG_ARCH_QCOM) += msm8996-v2-pmi8994-cdp.dtb \
+dtb-$(CONFIG_ARCH_MSM8996) += msm8996-v2-pmi8994-cdp.dtb \
msm8996-v2-pmi8994-mtp.dtb \
msm8996-v2-pmi8994-pmk8001-cdp.dtb \
msm8996-v2-pmi8994-pmk8001-mtp.dtb \
diff --git a/arch/arm64/configs/msm_defconfig b/arch/arm64/configs/msm_defconfig
index 80b3665f8c0d..1a38c7ce4998 100644
--- a/arch/arm64/configs/msm_defconfig
+++ b/arch/arm64/configs/msm_defconfig
@@ -32,6 +32,7 @@ CONFIG_MODULE_UNLOAD=y
# CONFIG_BLK_DEV_BSG is not set
# CONFIG_IOSCHED_DEADLINE is not set
CONFIG_ARCH_QCOM=y
+CONFIG_ARCH_MSM8996=y
CONFIG_PCI=y
CONFIG_PCI_MSI=y
CONFIG_PCI_HOST_GENERIC=y