diff options
| author | Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2023-03-23 17:18:02 +0100 |
|---|---|---|
| committer | Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2023-03-23 17:18:02 +0100 |
| commit | dc6f539b6840c60ece3557b11121e3ebf8ab7bdc (patch) | |
| tree | 5496fcda975b667140f672997d9f972c3a4d1d1b | |
| parent | 983b903e251806f63c83258c1d17e8898665a155 (diff) | |
| parent | dc8824a0b956f281951f4b7d9376380dec33c316 (diff) | |
Merge branch 'z-linaro/tracking-qcomlt-rt-arm64-defconfig' into z-linaro/tracking-qcomlt-rttracking-qcomlt-rtrelease/qcomlt-6.1-rt
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
| -rw-r--r-- | arch/arm64/configs/defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 30f6ca73f554..3506acd48690 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -547,6 +547,7 @@ CONFIG_EXYNOS_THERMAL=y CONFIG_TEGRA_SOCTHERM=m CONFIG_TEGRA_BPMP_THERMAL=m CONFIG_QCOM_QMI_COOLING=m +CONFIG_QCOM_TSENS=y CONFIG_QCOM_SPMI_ADC_TM5=m CONFIG_QCOM_SPMI_TEMP_ALARM=m CONFIG_QCOM_LMH=m @@ -1138,6 +1139,7 @@ CONFIG_ARM_SMMU_V3_PMU=m CONFIG_QCOM_L2_PMU=y CONFIG_QCOM_L3_PMU=y CONFIG_HISI_PMU=y +CONFIG_NVMEM_QCOM_QFPROM=y CONFIG_NVMEM_RMEM=m CONFIG_NVMEM_SUNXI_SID=y CONFIG_FPGA=y |