From: Junhan Bae Date: Tue, 11 Dec 2018 05:22:17 +0000 (+0900) Subject: [9610] drivers : fix try snk problem X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=0ebbc54ad6c0d2944f52139fd07d8e40feb11341;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git [9610] drivers : fix try snk problem There is possibility that error occured about try-snk I fix it to operate better Change-Id: If23bbef1a42d5e6d0a8f2d3b452943b0972e6799 Signed-off-by: Junhan Bae --- diff --git a/drivers/ccic/s2mu106-usbpd.c b/drivers/ccic/s2mu106-usbpd.c index edfb7f0c05c8..3de61b921e10 100644 --- a/drivers/ccic/s2mu106-usbpd.c +++ b/drivers/ccic/s2mu106-usbpd.c @@ -2185,7 +2185,6 @@ static void s2mu106_usbpd_detach_init(struct s2mu106_usbpd_data *pdic_data) struct device *dev = pdic_data->dev; struct usbpd_data *pd_data = dev_get_drvdata(dev); int ret = 0; - u8 data = 0; dev_info(dev, "%s\n", __func__); @@ -2211,24 +2210,6 @@ static void s2mu106_usbpd_detach_init(struct s2mu106_usbpd_data *pdic_data) pdic_data->status_reg = 0; usbpd_reinit(dev); -#ifdef CONFIG_CCIC_TRY_SNK - s2mu106_usbpd_read_reg(i2c, S2MU106_REG_PLUG_CTRL_PORT, &data); - data &= ~(S2MU106_REG_PLUG_CTRL_MODE_MASK | S2MU106_REG_PLUG_CTRL_RP_SEL_MASK); - data |= S2MU106_REG_PLUG_CTRL_DRP | S2MU106_REG_PLUG_CTRL_RP180; - s2mu106_usbpd_write_reg(i2c, S2MU106_REG_PLUG_CTRL_PORT, data); - - s2mu106_usbpd_read_reg(i2c, S2MU106_REG_PLUG_CTRL, &data); - data |= S2MU106_REG_PLUG_CTRL_UFP_ATTACH_OPT; - s2mu106_usbpd_write_reg(i2c, S2MU106_REG_PLUG_CTRL, data); - - s2mu106_usbpd_read_reg(i2c, S2MU106_REG_PLUG_CTRL_SET_RD, &data); - data &= ~S2MU106_REG_USB31_EN; - s2mu106_usbpd_write_reg(i2c, S2MU106_REG_PLUG_CTRL_SET_RD, data); - - s2mu106_usbpd_read_reg(i2c, S2MU106_REG_PLUG_CTRL_DET, &data); - data |= S2MU106_REG_DET_RD_OR_VBUS; - s2mu106_usbpd_write_reg(i2c, S2MU106_REG_PLUG_CTRL_DET, data); -#endif pdic_data->rid = REG_RID_MAX; pdic_data->check_rid_wa = false; pdic_data->is_factory_mode = false;