diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2018-11-26 02:22:54 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2018-11-26 02:22:57 -0800 |
| commit | a81e0f2639542300f8754692bddccdd740bdf24a (patch) | |
| tree | 0db7d3438c4c2a04682200d00af1621316c36200 | |
| parent | 799c959c770be4143c3bc2164950c394bd443d70 (diff) | |
| parent | d95c0c468e74b7dbc246c7db7b8f4df3ee6539b5 (diff) | |
Merge "defconfig: msm: Enable ARCH_MSM8940 config for 8940" into kernel.lnx.4.9.r12-rel
| -rw-r--r-- | arch/arm/configs/msm8937-perf_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm/configs/msm8937_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm64/configs/msm8937-perf_defconfig | 2 | ||||
| -rw-r--r-- | arch/arm64/configs/msm8937_defconfig | 2 |
4 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/configs/msm8937-perf_defconfig b/arch/arm/configs/msm8937-perf_defconfig index 5b933d9ad9be..f2ad28f3d62e 100644 --- a/arch/arm/configs/msm8937-perf_defconfig +++ b/arch/arm/configs/msm8937-perf_defconfig @@ -59,6 +59,7 @@ CONFIG_ARCH_QCOM=y CONFIG_ARCH_MSM8937=y CONFIG_ARCH_MSM8917=y CONFIG_ARCH_QM215=y +CONFIG_ARCH_MSM8940=y CONFIG_ARCH_SDM439=y CONFIG_ARCH_SDM429=y # CONFIG_VDSO is not set @@ -351,6 +352,7 @@ CONFIG_SLIMBUS_MSM_NGD=y CONFIG_SPMI=y CONFIG_PINCTRL_MSM8937=y CONFIG_PINCTRL_MSM8917=y +CONFIG_PINCTRL_MSM8940=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_QPNP_PIN=y diff --git a/arch/arm/configs/msm8937_defconfig b/arch/arm/configs/msm8937_defconfig index 675d4e39957c..ce4e840d522e 100644 --- a/arch/arm/configs/msm8937_defconfig +++ b/arch/arm/configs/msm8937_defconfig @@ -61,6 +61,7 @@ CONFIG_ARCH_QCOM=y CONFIG_ARCH_MSM8937=y CONFIG_ARCH_MSM8917=y CONFIG_ARCH_QM215=y +CONFIG_ARCH_MSM8940=y CONFIG_ARCH_SDM439=y CONFIG_ARCH_SDM429=y # CONFIG_VDSO is not set @@ -357,6 +358,7 @@ CONFIG_SLIMBUS_MSM_NGD=y CONFIG_SPMI=y CONFIG_PINCTRL_MSM8937=y CONFIG_PINCTRL_MSM8917=y +CONFIG_PINCTRL_MSM8940=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_QPNP_PIN=y diff --git a/arch/arm64/configs/msm8937-perf_defconfig b/arch/arm64/configs/msm8937-perf_defconfig index 84d874a957a6..8793c0361f88 100644 --- a/arch/arm64/configs/msm8937-perf_defconfig +++ b/arch/arm64/configs/msm8937-perf_defconfig @@ -56,6 +56,7 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_IOSCHED_DEADLINE is not set CONFIG_ARCH_QCOM=y CONFIG_ARCH_MSM8937=y +CONFIG_ARCH_MSM8940=y CONFIG_ARCH_MSM8917=y CONFIG_ARCH_QM215=y CONFIG_ARCH_SDM429=y @@ -349,6 +350,7 @@ CONFIG_SLIMBUS_MSM_NGD=y CONFIG_SPMI=y CONFIG_PINCTRL_MSM8937=y CONFIG_PINCTRL_MSM8917=y +CONFIG_PINCTRL_MSM8940=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y diff --git a/arch/arm64/configs/msm8937_defconfig b/arch/arm64/configs/msm8937_defconfig index 2f3ac75e3ddb..8f365f802a1b 100644 --- a/arch/arm64/configs/msm8937_defconfig +++ b/arch/arm64/configs/msm8937_defconfig @@ -57,6 +57,7 @@ CONFIG_PARTITION_ADVANCED=y # CONFIG_IOSCHED_DEADLINE is not set CONFIG_ARCH_QCOM=y CONFIG_ARCH_MSM8937=y +CONFIG_ARCH_MSM8940=y CONFIG_ARCH_MSM8917=y CONFIG_ARCH_QM215=y CONFIG_ARCH_SDM429=y @@ -357,6 +358,7 @@ CONFIG_SLIMBUS_MSM_NGD=y CONFIG_SPMI=y CONFIG_PINCTRL_MSM8937=y CONFIG_PINCTRL_MSM8917=y +CONFIG_PINCTRL_MSM8940=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_GPIOLIB=y CONFIG_GPIO_SYSFS=y |