diff options
| author | Linaro CI <ci_notify@linaro.org> | 2020-12-04 05:17:39 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2020-12-04 05:17:39 +0000 |
| commit | 31bc9e16070e33f877bd6a650a1a07b477c82d08 (patch) | |
| tree | 3d79daa8e369af6dbbc8febad04420b69e12590e | |
| parent | bbba4a43b527568a2c004bc2ba1c8b10dd614638 (diff) | |
| parent | 0e4d043908f01a271a8eb3bf278c2a2d1dfcc0d9 (diff) | |
Merge remote-tracking branch 'sm8350-defconfig/tracking-qcomlt-sm8350-defconfig' into integration-linux-qcomltintegration-linux-qcomlt-20201204-062157-v5.10-rc6-336-g31bc9e16070e3
# Conflicts:
# arch/arm64/configs/defconfig
| -rw-r--r-- | arch/arm64/configs/defconfig | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index de27c0a1d80e..798b81f2afbf 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -14,6 +14,7 @@ CONFIG_IKCONFIG_PROC=y CONFIG_NUMA_BALANCING=y CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y +CONFIG_BLK_CGROUP=y CONFIG_CGROUP_PIDS=y CONFIG_CGROUP_HUGETLB=y CONFIG_CPUSETS=y @@ -380,9 +381,6 @@ CONFIG_USB_NET_MCS7830=m CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m CONFIG_ATH10K_SNOC=m -CONFIG_ATH11K=m -CONFIG_ATH11K_AHB=m -CONFIG_ATH11K_PCI=m CONFIG_BRCMFMAC=m CONFIG_MWIFIEX=m CONFIG_MWIFIEX_PCIE=m @@ -456,7 +454,7 @@ CONFIG_I2C_MV64XXX=y CONFIG_I2C_OWL=y CONFIG_I2C_PXA=y CONFIG_I2C_QCOM_CCI=m -CONFIG_I2C_QCOM_GENI=y +CONFIG_I2C_QCOM_GENI=m CONFIG_I2C_QUP=y CONFIG_I2C_RK3X=y CONFIG_I2C_SH_MOBILE=y @@ -481,7 +479,7 @@ CONFIG_SPI_ROCKCHIP=y CONFIG_SPI_RPCIF=m CONFIG_SPI_QCOM_QSPI=m CONFIG_SPI_QUP=y -CONFIG_SPI_QCOM_GENI=y +CONFIG_SPI_QCOM_GENI=m CONFIG_SPI_S3C64XX=y CONFIG_SPI_SH_MSIOF=m CONFIG_SPI_SUN6I=y @@ -512,6 +510,7 @@ CONFIG_PINCTRL_SC7180=y CONFIG_PINCTRL_SDM845=y CONFIG_PINCTRL_SM8150=y CONFIG_PINCTRL_SM8250=y +CONFIG_PINCTRL_SM8350=y CONFIG_PINCTRL_LPASS_LPI=y CONFIG_GPIO_ALTERA=m CONFIG_GPIO_DWAPB=y @@ -804,11 +803,10 @@ CONFIG_USB_CONFIGFS_RNDIS=y CONFIG_USB_CONFIGFS_EEM=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_F_FS=y -CONFIG_TYPEC=y +CONFIG_TYPEC=m CONFIG_TYPEC_TCPM=m CONFIG_TYPEC_FUSB302=m CONFIG_TYPEC_HD3SS3220=m -CONFIG_TYPEC_QCOM_PMIC=m CONFIG_MMC=y CONFIG_MMC_BLOCK_MINORS=32 CONFIG_MMC_ARMMMCI=y @@ -838,10 +836,8 @@ CONFIG_MMC_SDHCI_AM654=y CONFIG_MMC_OWL=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y -CONFIG_LEDS_CLASS_MULTICOLOR=y CONFIG_LEDS_GPIO=y CONFIG_LEDS_PWM=y -CONFIG_LEDS_QCOM_LPG=y CONFIG_LEDS_SYSCON=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_DISK=y @@ -939,6 +935,7 @@ CONFIG_SDM_VIDEOCC_845=y CONFIG_SDM_DISPCC_845=y CONFIG_SM_GCC_8150=y CONFIG_SM_GCC_8250=y +CONFIG_SM_GCC_8350=y CONFIG_SM_GPUCC_8150=y CONFIG_SM_GPUCC_8250=y CONFIG_SM_DISPCC_8250=y @@ -1144,4 +1141,3 @@ CONFIG_DEBUG_KERNEL=y # CONFIG_DEBUG_PREEMPT is not set # CONFIG_FTRACE is not set CONFIG_MEMTEST=y -CONFIG_QCOM_DUMMY=y |