arm64/defconfig: sync Q defconfig

1. sync kane defconfig change
2. pick wifi change
	RAMEN9610-21775]wlbt: Enable Wifi Configurations in Defconfig.
	Enable Wifi Configurations in Defconfi

Change-Id: Iea3d6c430f6b3a039c7124b5fa2a331c15bad27c
Signed-off-by: zhaoxp3 <zhaoxp3@motorola.com>

diff --git a/arch/arm64/configs/erd9610_pqr_defconfig b/arch/arm64/configs/erd9610_pqr_defconfig
index 75e427c1ac61d23b49d74844056ed62985c062ad..66304f6d1b03c41195241a4525009c88ccb61bd8 100644 (file)
--- a/arch/arm64/configs/erd9610_pqr_defconfig
+++ b/arch/arm64/configs/erd9610_pqr_defconfig
@@ -209,10 +209,17 @@ CONFIG_MEMORY_STATE_TIME=y
 CONFIG_SEC_MODEM_IF=y
 CONFIG_MODEM_CHIP_MODAP_S3XXAP=y
 CONFIG_MODEM_IF_ADAPTIVE_QOS=y
-CONFIG_UART_SWITCH=y
+#CONFIG_UART_SWITCH=y
+CONFIG_HW_REV_DETECT=y
 CONFIG_GNSS_SHMEM_IF=y
+CONFIG_WIRELESS=y
+CONFIG_CFG80211=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
 CONFIG_SCSC_CORE=y
-CONFIG_SCSC_WLBT_CONFIG_PLATFORM="leman_s620_maestro"
+CONFIG_SCSC_WLBT_CONFIG_PLATFORM="leman_s620_robusta2_dualfem"
 CONFIG_SCSC_CORE_FW_LOCATION="/vendor/etc/wifi"
 CONFIG_SCSC_WLBTD=y
 CONFIG_SCSC_PLATFORM=y
@@ -226,8 +233,15 @@ CONFIG_SCSC_STATIC_RING_SIZE=4194304
 CONFIG_SCSC_WIFILOGGER=y
 CONFIG_SCSC_BT=y
 CONFIG_USE_MUIC=y
+CONFIG_MUIC_SUPPORT_CCIC=y
+CONFIG_MUIC_S2MU106=y
+CONFIG_MUIC_SYSFS=y
+CONFIG_MUIC_CORE=y
 CONFIG_MUIC_MANAGER=y
-CONFIG_MUIC_S2MU004=y
+CONFIG_MUIC_HV=y
+CONFIG_HV_MUIC_S2MU106_AFC=y
+CONFIG_HV_MUIC_TURBO_CHARGER=y
+CONFIG_S2MU106_SPECOUT_CHARGER=y
 CONFIG_IFCONN_MANAGER=y
 CONFIG_IFCONN_NOTIFIER=y
 CONFIG_SCSI=y
@@ -263,7 +277,7 @@ CONFIG_USB_USBNET=y
 CONFIG_SCSC_WLAN=y
 CONFIG_SCSC_WLAN_DEBUG=y
 CONFIG_SCSC_WLAN_WIFI_SHARING=n
-# CONFIG_SCSC_WLAN_SINGLE_ANTENNA is not set
+CONFIG_SCSC_WLAN_SINGLE_ANTENNA=y
 CONFIG_SCSC_WLAN_MHS_STATIC_INTERFACE=n
 CONFIG_SCSC_WLAN_SAE_CONFIG=y
 CONFIG_INPUT_EVDEV=y
@@ -282,7 +296,15 @@ CONFIG_TABLET_USB_GTCO=y
 CONFIG_TABLET_USB_HANWANG=y
 CONFIG_TABLET_USB_KBTAB=y
 CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_DSX=y
+CONFIG_TOUCHSCREEN_NOVATEK_CHIPSET=y
+CONFIG_TOUCHSCREEN_NT36xxx=y
+CONFIG_TOUCHSCREEN_HIMAX_CHIPSET=y
+CONFIG_TOUCHSCREEN_HIMAX_COMMON=y
+CONFIG_TOUCHSCREEN_HIMAX_INCELL=y
+CONFIG_TOUCHSCREEN_HIMAX_IC_HX83102=y
+CONFIG_TOUCHSCREEN_HIMAX_IC_HX83112=y
+CONFIG_TOUCHSCREEN_HIMAX_INSPECT=y
+CONFIG_TOUCHSCREEN_HIMAX_DEBUG=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_KEYCHORD=y
 CONFIG_INPUT_UINPUT=y
@@ -291,8 +313,6 @@ CONFIG_INPUT_GPIO=y
 # CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
 # CONFIG_DEVMEM is not set
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 CONFIG_HW_RANDOM=y
 CONFIG_EXYRNG_FIPS_COMPLIANCE=y
 CONFIG_EXYRNG_FAIL_POLICY_RESET=y
@@ -302,10 +322,14 @@ CONFIG_I2C_S3C2410=y
 CONFIG_SPI=y
 CONFIG_SPI_S3C64XX=y
 CONFIG_GPIOLIB=y
-CONFIG_FUELGAUGE_S2MU004=y
-CONFIG_CHARGER_S2MU004=y
 CONFIG_BATTERY_S2MU00X_ERD=y
-# CONFIG_HWMON is not set
+CONFIG_SENSORS_NTC_THERMISTOR=y
+CONFIG_BATTERY_S2MU00X=y
+CONFIG_FUELGAUGE_S2MU106=y
+CONFIG_CHARGER_S2MU106=y
+CONFIG_PM_S2MU106=y
+CONFIG_SMALL_CHARGER=y
+CONFIG_CHARGER_S2MCS02=y
 CONFIG_THERMAL=y
 CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
 CONFIG_CPU_THERMAL=y
@@ -318,7 +342,7 @@ CONFIG_WATCHDOG=y
 CONFIG_S3C2410_WATCHDOG=y
 CONFIG_S3C2410_SHUTDOWN_REBOOT=y
 CONFIG_MFD_SEC_CORE=y
-CONFIG_MFD_S2MU004=y
+CONFIG_MFD_S2MU106=y
 CONFIG_MFD_S2MPU09=y
 CONFIG_MFD_S2MPB02=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
@@ -335,11 +359,17 @@ CONFIG_VIDEO_EXYNOS_CAMERA_POSTPROCESS=y
 CONFIG_CAMERA_PP_GDC_V2_0_0_OBJ=y
 CONFIG_VIDEO_EXYNOS_FIMC_IS2=y
 CONFIG_USE_CSI_DMAOUT_FEATURE=y
-CONFIG_CAMERA_CIS_6B2_OBJ=y
-CONFIG_CAMERA_CIS_2P7SQ_OBJ=y
-CONFIG_CAMERA_CIS_2T7SX_OBJ=y
-CONFIG_CAMERA_ACT_LC898217_OBJ=y
-CONFIG_CAMERA_FLASH_GPIO_OBJ=y
+CONFIG_CAMERA_EEPROM_SELECT=y
+CONFIG_CAMERA_CIS_5E9_OBJ=y
+CONFIG_CAMERA_CIS_2X5SP_OBJ=y
+CONFIG_CAMERA_CIS_GM1SP_OBJ=y
+CONFIG_CAMERA_ACT_DW9839_OBJ=y
+CONFIG_CAMERA_FLASH_S2MU106_OBJ=y
+CONFIG_CAMERA_EEPROM_GM1_OBJ=y
+CONFIG_CAMERA_EEPROM_5E9_OBJ=y
+CONFIG_CAMERA_OIS_SELECT=y
+CONFIG_CAMERA_OIS_BU24218GWL_OBJ=y
+CONFIG_OIS_DIRECT_FW_CONTROL=y
 CONFIG_USE_SENSOR_GROUP=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_EXYNOS_SCALER=y
@@ -443,7 +473,7 @@ CONFIG_USB_NOTIFY_LAYER=y
 CONFIG_USB_NOTIFIER=y
 CONFIG_USB_HW_PARAM=y
 CONFIG_USB_DWC3=y
-CONFIG_DUAL_ROLE_USB_INTF=y
+#CONFIG_DUAL_ROLE_USB_INTF=y
 CONFIG_TYPEC=y
 CONFIG_TYPEC_DEFAULT=y
 CONFIG_USB_GADGET=y
@@ -468,6 +498,7 @@ CONFIG_MMC_DW_EXYNOS=y
 CONFIG_MMC_DW_DEBUG=y
 CONFIG_MMC_DW_FORCE_32BIT_SFR_RW=y
 CONFIG_LEDS_S2MPB02=y
+CONFIG_LEDS_S2MU106_FLASH=y
 CONFIG_RTC_CLASS=y
 CONFIG_RTC_DRV_S2MPU09=y
 CONFIG_DMADEVICES=y
@@ -520,6 +551,10 @@ CONFIG_USBPD_CORE=y
 CONFIG_USBPD_S2MM005=y
 CONFIG_USBPD_ALTERNATE_MODE=y
 CONFIG_CCIC_LPM_ENABLE=y
+CONFIG_USE_CCIC=y
+CONFIG_CCIC_S2MU106=y
+CONFIG_CCIC_VDM=y
+CONFIG_CCIC_SYSFS=y
 CONFIG_VISION_SUPPORT=y
 CONFIG_EXYNOS_VIPX=y
 CONFIG_EXYNOS_VIPX_EXYNOS9610=y
@@ -609,7 +644,21 @@ CONFIG_SENSORS_NTC_THERMISTOR=y
 CONFIG_BACKLIGHT_SGM37603=y
 CONFIG_BACKLIGHT_LM36923=y
 CONFIG_SCSC_WLAN_ENABLE_MAC_RANDOMISATION=y
-CONFIG_CMDLINE="androidboot.selinux=enforce"
-CONFIG_CMDLINE_EXTEND=y
 # CONFIG_SCSC_WIFI_NAN_ENABLE is not set
 CONFIG_SCSC_WLAN_MAX_INTERFACES=12
+#CONFIG_SARSENSOR_SX9325=y
+CONFIG_SARSENSOR_SX9331=y
+CONFIG_NFC=y
+CONFIG_SEC_NFC=y
+CONFIG_SEC_NFC_PRODUCT_N5=y
+CONFIG_SEC_NFC_IF_I2C=y
+CONFIG_SEC_NFC_LDO_EN=y
+CONFIG_SEC_NFC_CLK_REQ=y
+CONFIG_SENSORS_CLASS=y
+CONFIG_INPUT_EGISTEC_320=y
+CONFIG_AW8695_HAPTIC=y
+CONFIG_MOT_UTAG=y
+CONFIG_HWMON=y
+CONFIG_SENSORS_NTC_THERMISTOR=y
+CONFIG_BACKLIGHT_SGM37603=y
+CONFIG_BACKLIGHT_LM36923=y