diff options
| author | Linaro CI <ci_notify@linaro.org> | 2019-03-26 07:26:49 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2019-03-26 07:26:49 +0000 |
| commit | 65d544b1c6b7730c9a34251121ac14d6e40678f2 (patch) | |
| tree | f7e7f475b0a23714c2e5d23a2392d06487d1515c | |
| parent | 50296a93cfd27862a43b3f2c5e4243574d6e9903 (diff) | |
| parent | 0bb5e23b7de4990b25d20cff72ff30503ba95f48 (diff) | |
Merge remote-tracking branch 'qcs404-defconfig/tracking-qcomlt-qcs404-defconfig' into integration-linux-qcomlt
# Conflicts:
# arch/arm64/configs/defconfig
| -rw-r--r-- | arch/arm64/configs/defconfig | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 68808395b27c..893fd388415f 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -689,6 +689,7 @@ CONFIG_MSM_MMCC_8996=y CONFIG_MSM_GCC_8998=y CONFIG_QCS_GCC_404=y CONFIG_SDM_GCC_845=y +CONFIG_QCOM_HFPLL=y CONFIG_HWSPINLOCK=y CONFIG_SDM_GPUCC_845=y CONFIG_SDM_DISPCC_845=y @@ -765,6 +766,8 @@ CONFIG_PHY_QCOM_QMP=y CONFIG_PHY_QCOM_QUSB2=y CONFIG_PHY_QCOM_USB_HS=y CONFIG_PHY_RCAR_GEN3_PCIE=y +CONFIG_PHY_QCOM_USB_HS_SNPS_28NM=y +CONFIG_PHY_QCOM_USB_SS=y CONFIG_PHY_RCAR_GEN3_USB2=y CONFIG_PHY_RCAR_GEN3_USB3=m CONFIG_PHY_ROCKCHIP_EMMC=y |