diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-07 22:29:01 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-07 22:29:01 -0800 |
| commit | 2047ab822dbb4ac9a9d2c81428af208c2a64c0c7 (patch) | |
| tree | af50ea682c436aba2472bcb9aa21eb1a2ea168d6 | |
| parent | c98650b20a7e38f49031573981156c553ccbab1b (diff) | |
| parent | 00a15f82755eec554da17a1eb096f14a84aea3a4 (diff) | |
Merge "defconfig: msm: Add support for GCC clocks"
| -rw-r--r-- | arch/arm/configs/msmfalcon_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/msmfalcon-perf_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/msmfalcon_defconfig | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/configs/msmfalcon_defconfig b/arch/arm/configs/msmfalcon_defconfig index 0788a03ed219..74ee9792a284 100644 --- a/arch/arm/configs/msmfalcon_defconfig +++ b/arch/arm/configs/msmfalcon_defconfig @@ -420,6 +420,7 @@ CONFIG_RMNET_IPA3=y CONFIG_GPIO_USB_DETECT=y CONFIG_USB_BAM=y CONFIG_QCOM_CLK_SMD_RPM=y +CONFIG_MSM_GCC_FALCON=y CONFIG_REMOTE_SPINLOCK_MSM=y CONFIG_ARM_SMMU=y CONFIG_IOMMU_DEBUG=y diff --git a/arch/arm64/configs/msmfalcon-perf_defconfig b/arch/arm64/configs/msmfalcon-perf_defconfig index 35400f8e3ac9..dde7a01a9a36 100644 --- a/arch/arm64/configs/msmfalcon-perf_defconfig +++ b/arch/arm64/configs/msmfalcon-perf_defconfig @@ -483,6 +483,7 @@ CONFIG_GPIO_USB_DETECT=y CONFIG_SEEMP_CORE=y CONFIG_USB_BAM=y CONFIG_QCOM_CLK_SMD_RPM=y +CONFIG_MSM_GCC_FALCON=y CONFIG_REMOTE_SPINLOCK_MSM=y CONFIG_IOMMU_IO_PGTABLE_FAST=y CONFIG_ARM_SMMU=y diff --git a/arch/arm64/configs/msmfalcon_defconfig b/arch/arm64/configs/msmfalcon_defconfig index 67e399394787..7c56e933c853 100644 --- a/arch/arm64/configs/msmfalcon_defconfig +++ b/arch/arm64/configs/msmfalcon_defconfig @@ -493,6 +493,7 @@ CONFIG_GPIO_USB_DETECT=y CONFIG_SEEMP_CORE=y CONFIG_USB_BAM=y CONFIG_QCOM_CLK_SMD_RPM=y +CONFIG_MSM_GCC_FALCON=y CONFIG_REMOTE_SPINLOCK_MSM=y CONFIG_IOMMU_IO_PGTABLE_FAST=y CONFIG_IOMMU_IO_PGTABLE_FAST_SELFTEST=y |