From: Junhan Bae Date: Thu, 21 Feb 2019 09:15:46 +0000 (+0900) Subject: [LV][RAMEN9610-12412][Robusta2][9610] usbpd : update s2mu106 drivers for compliance X-Git-Tag: MMI-PSB29.39-49-7~232 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ddb987f789c503d433f640fe9c1581c792cd6918;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git [LV][RAMEN9610-12412][Robusta2][9610] usbpd : update s2mu106 drivers for compliance Moto CRs-fixed:(CR) Change-Id: Iab613c6b9e742ea294b4cf8a3190d5327a203e9f Signed-off-by: Junhan Bae Reviewed-on: https://gerrit.mot.com/1313804 SLTApproved: Slta Waiver SME-Granted: SME Approvals Granted Tested-by: Jira Key Reviewed-by: Lu Lu SME-Granted: Lu Lu Submit-Approved: Lu Lu Reviewed-by: Xiangpo Zhao --- diff --git a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi index 643751128432..d6a70815d5b7 100755 --- a/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos9609-robusta2_common.dtsi @@ -1173,7 +1173,7 @@ source,max_power = <2500>; /* sink cap */ - sink,capable_max_voltage = <9000>; + sink,capable_max_voltage = <5000>; }; }; }; diff --git a/arch/arm64/configs/erd9610_defconfig b/arch/arm64/configs/erd9610_defconfig index d0678bfa681d..43a7192aa11b 100755 --- a/arch/arm64/configs/erd9610_defconfig +++ b/arch/arm64/configs/erd9610_defconfig @@ -320,6 +320,7 @@ CONFIG_BATTERY_S2MU00X_ERD=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_HWMON is not set @@ -550,7 +551,6 @@ CONFIG_USE_CCIC=y CONFIG_CCIC_S2MU106=y CONFIG_CCIC_VDM=y CONFIG_CCIC_SYSFS=y -CONFIG_CCIC_TRY_SNK=y CONFIG_VISION_SUPPORT=y CONFIG_EXYNOS_VIPX=y CONFIG_EXYNOS_VIPX_EXYNOS9610=y