diff options
| author | Linaro CI <ci_notify@linaro.org> | 2018-04-23 15:57:13 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2018-04-23 15:57:13 +0000 |
| commit | e50f12d080475e5f79529d49bae70c2f5fbaae15 (patch) | |
| tree | 78668cc349e5b5f6599cf95dfd9a0b121535bc9c | |
| parent | 033d22c9cfa10ef60f1aaf51d1a9472636933b75 (diff) | |
| parent | f20e90dff254dd8aae16d3d1592149b9261a8b40 (diff) | |
Merge remote-tracking branch 'sdm845-defconfig/tracking/sdm845/defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20180423-175247-e50f12d08047
| -rw-r--r-- | arch/arm64/configs/defconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index ecf613761e78..006456149aa9 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -279,6 +279,7 @@ CONFIG_SERIAL_SH_SCI=y CONFIG_SERIAL_SH_SCI_NR_UARTS=11 CONFIG_SERIAL_SH_SCI_CONSOLE=y CONFIG_SERIAL_MSM=y +CONFIG_SERIAL_QCOM_GENI=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SERIAL_XILINX_PS_UART=y CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y @@ -320,6 +321,7 @@ CONFIG_PINCTRL_MAX77620=y CONFIG_PINCTRL_MSM8916=y CONFIG_PINCTRL_MSM8994=y CONFIG_PINCTRL_MSM8996=y +CONFIG_PINCTRL_SDM845=y CONFIG_PINCTRL_QDF2XXX=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y CONFIG_GPIO_DWAPB=y @@ -545,6 +547,7 @@ CONFIG_MSM_GCC_8916=y CONFIG_MSM_GCC_8994=y CONFIG_MSM_MMCC_8996=y CONFIG_HWSPINLOCK=y +CONFIG_SDM_GCC_845=y CONFIG_HWSPINLOCK_QCOM=y CONFIG_ARM_MHU=y CONFIG_PLATFORM_MHU=y @@ -666,3 +669,8 @@ CONFIG_CRYPTO_AES_ARM64_BS=m CONFIG_CRYPTO_SHA512_ARM64_CE=m CONFIG_CRYPTO_SHA3_ARM64=m CONFIG_CRYPTO_SM3_ARM64_CE=m +CONFIG_QTI_RPMH_MBOX=y +CONFIG_QTI_RPMH_API=y +CONFIG_QCOM_COMMAND_DB=y +CONFIG_REGULATOR_RPMH=y +CONFIG_QCOM_GENI_SE=y |