From: lingsen1 Date: Wed, 20 Feb 2019 07:48:38 +0000 (+0800) Subject: rebase samsung Feb17 X-Git-Tag: MMI-QSAS30.62-33-3~229 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1af1641d1551fcf7311120d6de72c842fe1fc4cc;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git rebase samsung Feb17 Change-Id: I2a5f51a96460020c0c22fe74f3b3da3496f34207 Reviewed-on: https://gerrit.mot.com/1311648 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Submit-Approved: Lu Lu Reviewed-by: Guolin Wang --- diff --git a/arch/arm64/configs/erd9610_defconfig b/arch/arm64/configs/erd9610_defconfig index 146353398f1b..2169a1aad513 100644 --- a/arch/arm64/configs/erd9610_defconfig +++ b/arch/arm64/configs/erd9610_defconfig @@ -225,8 +225,14 @@ CONFIG_SCSC_STATIC_RING_SIZE=4194304 CONFIG_SCSC_WIFILOGGER=y CONFIG_SCSC_BT=y CONFIG_USE_MUIC=y -CONFIG_MUIC_MANAGER=y +CONFIG_MUIC_SUPPORT_CCIC=y CONFIG_MUIC_S2MU106=y +CONFIG_MUIC_SYSFS=y +CONFIG_MUIC_CORE=y +CONFIG_MUIC_MANAGER=y +CONFIG_MUIC_HV=y +CONFIG_HV_MUIC_S2MU106_AFC=y +CONFIG_HV_MUIC_TURBO_CHARGER=y CONFIG_IFCONN_MANAGER=y CONFIG_IFCONN_NOTIFIER=y CONFIG_SCSI=y @@ -312,6 +318,7 @@ CONFIG_SPI_S3C64XX=y CONFIG_GPIOLIB=y CONFIG_BATTERY_S2MU00X_ERD=y CONFIG_SENSORS_NTC_THERMISTOR=y +CONFIG_BATTERY_S2MU00X=y CONFIG_FUELGAUGE_S2MU106=y CONFIG_CHARGER_S2MU106=y CONFIG_SMALL_CHARGER=y