diff options
author | Linaro CI <ci_notify@linaro.org> | 2020-06-16 15:03:45 +0000 |
---|---|---|
committer | Linaro CI <ci_notify@linaro.org> | 2020-06-16 15:03:45 +0000 |
commit | 6fb1ec977e97030eac07d58722140a95ee67fa00 (patch) | |
tree | 2ee66a3926189bd0e3506770adcea94c454d2c41 | |
parent | 0aa249c33fddab437d93ee43b796f3c4d55a06c1 (diff) | |
parent | e3f38836f309f253225d0287970d2b134ab86dcc (diff) |
Merge remote-tracking branch 'cci-cams/tracking-qcomlt-cci-camss' into integration-linux-qcomlt
-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 0d9fca50e194..4eaef567412c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -435,6 +435,7 @@ CONFIG_I2C_TEGRA=y CONFIG_I2C_UNIPHIER_F=y CONFIG_I2C_RCAR=y CONFIG_I2C_CROS_EC_TUNNEL=y +CONFIG_I2C_QCOM_CCI=y CONFIG_SPI=y CONFIG_SPI_ARMADA_3700=y CONFIG_SPI_BCM2835=m @@ -609,6 +610,8 @@ CONFIG_VIDEO_RCAR_DRIF=m CONFIG_VIDEO_QCOM_CAMSS=m CONFIG_VIDEO_QCOM_VENUS=m CONFIG_DRM=m +CONFIG_VIDEO_QCOM_VENUS=m +CONFIG_VIDEO_QCOM_CAMSS=m CONFIG_DRM_I2C_NXP_TDA998X=m CONFIG_DRM_MALI_DISPLAY=m CONFIG_DRM_NOUVEAU=m |