Merge "arm64: defconfig: enable CNSS2 driver on SA6155 configs" (0c692d7a) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/configs/vendor/sdmsteppe-auto-perf_defconfig

+3 −2

Original line number	Diff line number	Diff line
		@@ -250,6 +250,7 @@ CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
		CONFIG_REGMAP_WCD_IRQ=y
		CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y
		CONFIG_DMA_CMA=y
		CONFIG_MHI_BUS=y
		CONFIG_ZRAM=y
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		@@ -301,6 +302,8 @@ CONFIG_USB_USBNET=y
		CONFIG_WIL6210=m
		CONFIG_WCNSS_MEM_PRE_ALLOC=y
		CONFIG_CLD_LL_CORE=y
		CONFIG_CNSS2=y
		CONFIG_CNSS_UTILS=y
		CONFIG_INPUT_EVDEV=y
		CONFIG_KEYBOARD_GPIO=y
		# CONFIG_INPUT_MOUSE is not set
		@@ -570,8 +573,6 @@ CONFIG_PANIC_ON_SSR_NOTIF_TIMEOUT=y
		CONFIG_MSM_BOOT_STATS=y
		CONFIG_QCOM_DCC_V2=y
		CONFIG_QCOM_SECURE_BUFFER=y
		CONFIG_ICNSS=y
		CONFIG_ICNSS_QMI=y
		CONFIG_QCOM_EUD=y
		CONFIG_QCOM_MINIDUMP=y
		CONFIG_QCOM_BUS_SCALING=y

+4 −3

Original line number	Diff line number	Diff line
		@@ -259,6 +259,7 @@ CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y
		CONFIG_REGMAP_WCD_IRQ=y
		CONFIG_REGMAP_ALLOW_WRITE_DEBUGFS=y
		CONFIG_DMA_CMA=y
		CONFIG_MHI_BUS=y
		CONFIG_ZRAM=y
		CONFIG_BLK_DEV_LOOP=y
		CONFIG_BLK_DEV_RAM=y
		@@ -310,6 +311,9 @@ CONFIG_USB_USBNET=y
		CONFIG_WIL6210=m
		CONFIG_WCNSS_MEM_PRE_ALLOC=y
		CONFIG_CLD_LL_CORE=y
		CONFIG_CNSS2=y
		CONFIG_CNSS2_DEBUG=y
		CONFIG_CNSS_UTILS=y
		CONFIG_INPUT_EVDEV=y
		CONFIG_KEYBOARD_GPIO=y
		# CONFIG_INPUT_MOUSE is not set
		@@ -594,9 +598,6 @@ CONFIG_MSM_CORE_HANG_DETECT=y
		CONFIG_QCOM_DCC_V2=y
		CONFIG_MSM_GLADIATOR_HANG_DETECT=y
		CONFIG_QCOM_SECURE_BUFFER=y
		CONFIG_ICNSS=y
		CONFIG_ICNSS_DEBUG=y
		CONFIG_ICNSS_QMI=y
		CONFIG_QCOM_EUD=y
		CONFIG_QCOM_MINIDUMP=y
		CONFIG_QCOM_BUS_SCALING=y