max77779_charger, max77779_usecase: use sequoia for rtx for Pro
Bug: 348681019
Change-Id: I2e6286767b2719a4d0f99ad1e00da53c03935b27
Signed-off-by: Prasanna Prapancham <[email protected]>
diff --git a/max77779_charger.c b/max77779_charger.c
index a401ae8..07e2f8a 100644
--- a/max77779_charger.c
+++ b/max77779_charger.c
@@ -678,16 +678,12 @@
dc_on = false;
if (wlc_tx) {
usecase = GSU_MODE_WLC_TX;
- if (!uc_data->reverse12_en)
- mode = MAX77779_CHGR_MODE_BOOST_UNO_ON;
+ mode = MAX77779_CHGR_MODE_BOOST_UNO_ON;
}
} else if (wlc_tx) {
/* above checks that buck_on is false */
usecase = GSU_MODE_WLC_TX;
- if (uc_data->reverse12_en)
- mode = MAX77779_CHGR_MODE_ALL_OFF;
- else
- mode = MAX77779_CHGR_MODE_BOOST_UNO_ON;
+ mode = MAX77779_CHGR_MODE_BOOST_UNO_ON;
} else if (wlc_rx) {
/* will be in mode 4 if in stby unless dc is enabled */
@@ -744,17 +740,8 @@
}
- if (!cb_data->dc_avail_votable)
- cb_data->dc_avail_votable = gvotable_election_get_handle(VOTABLE_DC_CHG_AVAIL);
- if (cb_data->dc_avail_votable)
- gvotable_cast_int_vote(cb_data->dc_avail_votable,
- "WLC_TX", wlc_tx? 0 : 1, wlc_tx);
- if (wlc_tx) {
- if (uc_data->reverse12_en)
- dc_on = true;
- else
- dc_on = false;
- }
+ if (wlc_tx)
+ dc_on = false;
/* reg might be ignored later */
cb_data->reg = _max77779_chg_cnfg_00_cp_en_set(cb_data->reg, dc_on);
diff --git a/max77779_usecase.c b/max77779_usecase.c
index 0afeb8f..8d8dca6 100644
--- a/max77779_usecase.c
+++ b/max77779_usecase.c
@@ -53,12 +53,10 @@
pr_debug("%s: use_case:%d enable:%d\n", __func__, use_case, enable);
if (!enable) {
- if (!uc_data->reverse12_en) {
- ret = max77779_external_chg_reg_write(uc_data->dev, MAX77779_CHG_CNFG_11, 0x0);
- if (ret < 0)
- pr_err("%s: fail to reset MAX77779_CHG_REVERSE_BOOST_VOUT\n",
- __func__);
- }
+ ret = max77779_external_chg_reg_write(uc_data->dev, MAX77779_CHG_CNFG_11, 0x0);
+ if (ret < 0)
+ pr_err("%s: fail to reset MAX77779_CHG_REVERSE_BOOST_VOUT\n",
+ __func__);
ret = gs201_wlc_en(uc_data, WLC_DISABLED);
if (ret < 0)
@@ -81,33 +79,31 @@
u8 val;
int ret = 0;
- /* No reverse 1:2 available, we need to configure max77779 */
- if (!uc_data->reverse12_en) {
- if (use_case == GSU_MODE_WLC_TX) {
- ret = max77779_external_chg_reg_write(uc_data->dev,
- MAX77779_CHG_CNFG_11,
- MAX77779_CHG_REVERSE_BOOST_VOUT_7V);
- if (ret < 0)
- pr_err("fail to configure MAX77779_CHG_REVERSE_BOOST_VOUT\n");
- } else {
- ret = max77779_external_chg_reg_write(uc_data->dev,
- MAX77779_CHG_CNFG_11,
- 0x0);
- if (ret < 0)
- pr_err("fail to reset MAX77779_CHG_REVERSE_BOOST_VOUT\n");
- }
- /* Set WCSM to 1.4A */
- ret = max77779_external_chg_reg_read(uc_data->dev, MAX77779_CHG_CNFG_05, &val);
+ /* We need to configure max77779 */
+ if (use_case == GSU_MODE_WLC_TX) {
+ ret = max77779_external_chg_reg_write(uc_data->dev,
+ MAX77779_CHG_CNFG_11,
+ MAX77779_CHG_REVERSE_BOOST_VOUT_7V);
if (ret < 0)
- pr_err("%s: fail to read MAX77779_CHG_CNFG_05 ret:%d\n", __func__, ret);
+ pr_err("fail to configure MAX77779_CHG_REVERSE_BOOST_VOUT\n");
+ } else {
+ ret = max77779_external_chg_reg_write(uc_data->dev,
+ MAX77779_CHG_CNFG_11,
+ 0x0);
+ if (ret < 0)
+ pr_err("fail to reset MAX77779_CHG_REVERSE_BOOST_VOUT\n");
+ }
+ /* Set WCSM to 1.4A */
+ ret = max77779_external_chg_reg_read(uc_data->dev, MAX77779_CHG_CNFG_05, &val);
+ if (ret < 0)
+ pr_err("%s: fail to read MAX77779_CHG_CNFG_05 ret:%d\n", __func__, ret);
- ret = max77779_external_chg_reg_write(uc_data->dev, MAX77779_CHG_CNFG_05,
- _max77779_chg_cnfg_05_wcsm_ilim_set(val,
- MAX77779_CHG_CNFG_05_WCSM_ILIM_1400_MA));
- if (ret < 0) {
- pr_err("%s: fail to write MAX77779_CHG_CNFG_05 ret:%d\n", __func__, ret);
- return ret;
- }
+ ret = max77779_external_chg_reg_write(uc_data->dev, MAX77779_CHG_CNFG_05,
+ _max77779_chg_cnfg_05_wcsm_ilim_set(val,
+ MAX77779_CHG_CNFG_05_WCSM_ILIM_1400_MA));
+ if (ret < 0) {
+ pr_err("%s: fail to write MAX77779_CHG_CNFG_05 ret:%d\n", __func__, ret);
+ return ret;
}
return ret;
@@ -172,8 +168,8 @@
use_case != GSU_MODE_WLC_DC;
break;
case GSU_MODE_WLC_TX:
- need_stby = !uc_data->reverse12_en;
- if (need_stby && uc_data->rtx_ready >= 0)
+ need_stby = true;
+ if (uc_data->rtx_ready >= 0)
gpio_set_value_cansleep(uc_data->rtx_ready, 0);
break;
case GSU_MODE_USB_OTG:
