diff options
| author | Trilok Soni <tsoni@codeaurora.org> | 2016-03-08 18:21:48 -0800 |
|---|---|---|
| committer | David Keitel <dkeitel@codeaurora.org> | 2016-03-23 21:10:46 -0700 |
| commit | 89fd208cc47257828cda94c37be291254152d083 (patch) | |
| tree | a98c8df28e7b6fba5e935ec4164f3c9efecdf99a | |
| parent | 8826ec9a9c47298e47041ca2a3a035a8b0f09d13 (diff) | |
defconfig: 8996: Enable ADSP Loader and disable memlat
ADSP Loader is required for the audio probes and memlat governor
is crashing right now so we should keep it disabled for now.
Signed-off-by: Trilok Soni <tsoni@codeaurora.org>
| -rw-r--r-- | arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm64/configs/msm-perf_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/msm_defconfig | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 5ea078b9ee4a..eb31bff88a3a 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi @@ -585,12 +585,14 @@ compatible = "qcom,arm-memlat-mon"; qcom,cpulist = <&CPU0 &CPU1>; qcom,target-dev = <&memlat_cpu0>; + status = "disabled"; }; qcom,arm-memlat-mon-2 { compatible = "qcom,arm-memlat-mon"; qcom,cpulist = <&CPU2 &CPU3>; qcom,target-dev = <&memlat_cpu2>; + status = "disabled"; }; devfreq_cpufreq: devfreq-cpufreq { diff --git a/arch/arm64/configs/msm-perf_defconfig b/arch/arm64/configs/msm-perf_defconfig index a52074cedf64..381372a7a9bf 100644 --- a/arch/arm64/configs/msm-perf_defconfig +++ b/arch/arm64/configs/msm-perf_defconfig @@ -470,6 +470,7 @@ CONFIG_QCOM_SCM=y CONFIG_QCOM_SCM_XPU=y CONFIG_QCOM_WATCHDOG_V2=y CONFIG_QCOM_MEMORY_DUMP_V2=y +CONFIG_MSM_ADSP_LOADER=y CONFIG_MSM_SUBSYSTEM_RESTART=y CONFIG_MSM_PIL=y CONFIG_MSM_PIL_SSR_GENERIC=y diff --git a/arch/arm64/configs/msm_defconfig b/arch/arm64/configs/msm_defconfig index 2460aea488dd..c79977d5265d 100644 --- a/arch/arm64/configs/msm_defconfig +++ b/arch/arm64/configs/msm_defconfig @@ -492,6 +492,7 @@ CONFIG_QCOM_SCM=y CONFIG_QCOM_SCM_XPU=y CONFIG_QCOM_WATCHDOG_V2=y CONFIG_QCOM_MEMORY_DUMP_V2=y +CONFIG_MSM_ADSP_LOADER=y CONFIG_MSM_SUBSYSTEM_RESTART=y CONFIG_MSM_PIL=y CONFIG_MSM_PIL_SSR_GENERIC=y |