Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0a7f7065 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: kona: enable compilation of fsa4480 for kona"

parents f649f870 3ebd62a9

arch/arm64/configs/vendor/kona-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -508,6 +508,7 @@ CONFIG_MSM_BOOT_STATS=y 
CONFIG_QCOM_DCC_V2=y

CONFIG_QCOM_EUD=y

CONFIG_QCOM_MINIDUMP=y

CONFIG_QCOM_FSA4480_I2C=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_QCOM_BUS_SCALING=y

arch/arm64/configs/vendor/kona_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -525,6 +525,7 @@ CONFIG_QCOM_DCC_V2=y 
CONFIG_QCOM_EUD=y

CONFIG_QCOM_MINIDUMP=y

CONFIG_MSM_CORE_HANG_DETECT=y

CONFIG_QCOM_FSA4480_I2C=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_FORCE_WDOG_BITE_ON_PANIC=y

CONFIG_QCOM_BUS_SCALING=y

drivers/soc/qcom/fsa4480-i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ static int fsa4480_remove(struct i2c_client *i2c) 
		return -EINVAL;



	fsa4480_usbc_update_settings(fsa_priv, 0x18, 0x98);

	cancel_work(&fsa_priv->usbc_analog_work);

	cancel_work_sync(&fsa_priv->usbc_analog_work);

	pm_relax(fsa_priv->dev);

	/* deregister from PMI */

	power_supply_unreg_notifier(&fsa_priv->psy_nb);