A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 21:22:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

charger: Rename sc8549 to cp

Browse source 
For charge pump commen interface. use cp
name replace sc8549.

Change-Id: I7329b7379b7489e223b2daa75385722f81bc3f58
Signed-off-by: chailu1 <chailu1@lenovo.com>
Reviewed-on: https://gerrit.mot.com/2024927
Reviewed-by: Huosheng Liao <liaohs@motorola.com>
SME-Granted: SME Approvals Granted
SLTApproved: Slta Waiver
Tested-by: Jira Key
Submit-Approved: Jira Key
This commit is contained in:
chailu1 2021-07-27 14:21:36 +08:00 • committed by Lu Chai
commit 465d5d73b5
5 changed files with 44 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/power/mmi_parallel_charger_iio/Kbuild
View file

@ -7,7 +7,7 @@ obj-m += mmi_parallel_charger_iio.o
mmi_parallel_charger_iio-objs += mmi_charger_class.o
mmi_parallel_charger_iio-objs += mmi_charger_core.o
mmi_parallel_charger_iio-objs += mmi_charger_pump_policy.o
mmi_parallel_charger_iio-objs += sc8549_charger.o
mmi_parallel_charger_iio-objs += mmi_cp_charger.o
mmi_parallel_charger_iio-objs += qpnp_pmic_charger.o
mmi_parallel_charger_iio-objs += mmi_qc3p.o
mmi_parallel_charger_iio-objs += mmi_qc3p_cp_policy.o

2
drivers/power/mmi_parallel_charger_iio/mmi_charger_class.h
View file

@ -125,7 +125,7 @@ extern int mmi_update_charger_status(struct mmi_charger_device *chrg);
extern int mmi_update_charger_error(struct mmi_charger_device *chrg);
extern int mmi_clear_charger_error(struct mmi_charger_device *chrg);
extern int mmi_get_vbus(struct mmi_charger_device *chrg, u32 *mv);
extern struct mmi_charger_ops sc8549_charger_ops;
extern struct mmi_charger_ops cp_charger_ops;
extern struct mmi_charger_ops qpnp_pmic_charger_ops;
extern struct mmi_charger_device *mmi_charger_device_register(const char *name,
const char *psy_name,struct device *parent, void *devdata,

6
drivers/power/mmi_parallel_charger_iio/mmi_charger_core.c
View file

@ -62,11 +62,11 @@ const struct mmi_chrg_dev_ops dev_ops[] = {
},
{
.dev_name = "cp-master",
.ops = &sc8549_charger_ops,
.ops = &cp_charger_ops,
},
{
.dev_name = "cp-slave",
.ops = &sc8549_charger_ops,
.ops = &cp_charger_ops,
},
};
@ -242,7 +242,7 @@ static int mmi_charger_init_iio_psy(struct mmi_charger_manager *chip,
rc = devm_iio_device_register(chip->dev, indio_dev);
if (rc) {
pr_err("Failed to register sc8549 IIO device, rc=%d\n", rc);
pr_err("Failed to register cp IIO device, rc=%d\n", rc);
return rc;
}

24
drivers/power/mmi_parallel_charger_iio/mmi_charger_core_iio.h
View file

@ -42,12 +42,12 @@ enum mmi_charger_ext_iio_channels {
SMB5_USB_REAL_TYPE,
SMB5_DP_DM,
SMB5_QC3P_POWER,
/*sc8549*/
SC8549_CP_ENABLE,
SC8549_INPUT_CURRENT_NOW,
SC8549_INPUT_VOLTAGE_NOW,
SC8549_CP_STATUS1,
SC8549_CP_CLEAR_ERROR,
/*cp*/
CP_ENABLE,
CP_INPUT_CURRENT_NOW,
CP_INPUT_VOLTAGE_NOW,
CP_STATUS1,
CP_CLEAR_ERROR,
};
static const char * const mmi_charger_ext_iio_chan_name[] = {
@ -61,12 +61,12 @@ static const char * const mmi_charger_ext_iio_chan_name[] = {
[SMB5_USB_REAL_TYPE] = "usb_real_type",
[SMB5_DP_DM] = "battery_dp_dm",
[SMB5_QC3P_POWER] = "usb_qc3p_power",
/*sc8549*/
[SC8549_CP_ENABLE] = "sc8549_cp_enable",
[SC8549_INPUT_CURRENT_NOW] = "sc8549_input_current_now",
[SC8549_INPUT_VOLTAGE_NOW] = "sc8549_input_voltage_now",
[SC8549_CP_STATUS1] = "sc8549_cp_status1",
[SC8549_CP_CLEAR_ERROR] = "sc8549_cp_clear_error",
/*cp*/
[CP_ENABLE] = "cp_enable",
[CP_INPUT_CURRENT_NOW] = "cp_input_current_now",
[CP_INPUT_VOLTAGE_NOW] = "cp_input_voltage_now",
[CP_STATUS1] = "cp_status1",
[CP_CLEAR_ERROR] = "cp_clear_error",
};
int mmi_charger_read_iio_chan(struct mmi_charger_manager *chip,

54
drivers/power/mmi_parallel_charger_iio/sc8549_charger.c → drivers/power/mmi_parallel_charger_iio/mmi_cp_charger.c
View file

@ -38,7 +38,7 @@
#include "mmi_charger_core.h"
#include "mmi_charger_core_iio.h"
static int sc8549_enable_charging(struct mmi_charger_device *chrg, bool en)
static int cp_enable_charging(struct mmi_charger_device *chrg, bool en)
{
int rc;
struct mmi_charger_manager *chip = dev_get_drvdata(&chrg->dev);
@ -46,7 +46,7 @@ static int sc8549_enable_charging(struct mmi_charger_device *chrg, bool en)
if (!chip)
return -ENODEV;
rc = mmi_charger_write_iio_chan(chip, SC8549_CP_ENABLE, en);
rc = mmi_charger_write_iio_chan(chip, CP_ENABLE, en);
if (!rc) {
chrg->charger_enabled = !!en;
@ -56,7 +56,7 @@ static int sc8549_enable_charging(struct mmi_charger_device *chrg, bool en)
return rc;
}
static int sc8549_is_charging_enabled(struct mmi_charger_device *chrg, bool *en)
static int cp_is_charging_enabled(struct mmi_charger_device *chrg, bool *en)
{
int rc;
int value;
@ -65,7 +65,7 @@ static int sc8549_is_charging_enabled(struct mmi_charger_device *chrg, bool *en)
if (!chip)
return -ENODEV;
rc = mmi_charger_read_iio_chan(chip, SC8549_CP_ENABLE, &value);
rc = mmi_charger_read_iio_chan(chip, CP_ENABLE, &value);
if (!rc) {
chrg->charger_enabled = !!value;
@ -77,7 +77,7 @@ static int sc8549_is_charging_enabled(struct mmi_charger_device *chrg, bool *en)
return rc;
}
static int sc8549_get_charging_current(struct mmi_charger_device *chrg, u32 *uA)
static int cp_get_charging_current(struct mmi_charger_device *chrg, u32 *uA)
{
int rc;
union power_supply_propval prop = {0,};
@ -93,21 +93,21 @@ static int sc8549_get_charging_current(struct mmi_charger_device *chrg, u32 *uA)
return rc;
}
static int sc8549_get_vbus(struct mmi_charger_device *chrg, u32 *mv)
static int cp_get_vbus(struct mmi_charger_device *chrg, u32 *mv)
{
int rc, val;
struct mmi_charger_manager *chip = dev_get_drvdata(&chrg->dev);
if (!chip)
return -ENODEV;
rc = mmi_charger_read_iio_chan(chip, SC8549_INPUT_VOLTAGE_NOW, &val);
rc = mmi_charger_read_iio_chan(chip, CP_INPUT_VOLTAGE_NOW, &val);
if (!rc)
*mv = val;
return rc;
}
static int sc8549_get_input_current(struct mmi_charger_device *chrg, u32 *uA) //ibus
static int cp_get_input_current(struct mmi_charger_device *chrg, u32 *uA) //ibus
{
int rc;
int value;
@ -116,7 +116,7 @@ static int sc8549_get_input_current(struct mmi_charger_device *chrg, u32 *uA) //
if (!chip)
return -ENODEV;
rc = mmi_charger_read_iio_chan(chip, SC8549_INPUT_CURRENT_NOW, &value);
rc = mmi_charger_read_iio_chan(chip, CP_INPUT_CURRENT_NOW, &value);
if (!rc)
*uA = value;
@ -124,7 +124,7 @@ static int sc8549_get_input_current(struct mmi_charger_device *chrg, u32 *uA) //
return rc;
}
static int sc8549_update_charger_status(struct mmi_charger_device *chrg)
static int cp_update_charger_status(struct mmi_charger_device *chrg)
{
int rc;
struct mmi_charger_manager *chip = dev_get_drvdata(&chrg->dev);
@ -153,11 +153,11 @@ static int sc8549_update_charger_status(struct mmi_charger_device *chrg)
if (!rc)
chrg->charger_data.batt_temp = prop.intval;
rc = mmi_charger_read_iio_chan(chip, SC8549_INPUT_VOLTAGE_NOW, &prop.intval);
rc = mmi_charger_read_iio_chan(chip, CP_INPUT_VOLTAGE_NOW, &prop.intval);
if (!rc)
chrg->charger_data.vbus_volt = prop.intval;
rc = mmi_charger_read_iio_chan(chip, SC8549_INPUT_CURRENT_NOW, &prop.intval);
rc = mmi_charger_read_iio_chan(chip, CP_INPUT_CURRENT_NOW, &prop.intval);
if (!rc)
chrg->charger_data.ibus_curr = prop.intval;
@ -166,11 +166,11 @@ static int sc8549_update_charger_status(struct mmi_charger_device *chrg)
if (!rc)
chrg->charger_data.vbus_pres = !!prop.intval;
rc = mmi_charger_read_iio_chan(chip, SC8549_CP_ENABLE, &prop.intval);
rc = mmi_charger_read_iio_chan(chip, CP_ENABLE, &prop.intval);
if (!rc)
chrg->charger_enabled = !!prop.intval;
chrg_dev_info(chrg, "SC8549 chrg: %s status update: --- info---\n",chrg->name);
chrg_dev_info(chrg, "CP chrg: %s status update: --- info---\n",chrg->name);
chrg_dev_info(chrg, "vbatt %d\n", chrg->charger_data.vbatt_volt);
chrg_dev_info(chrg, "ibatt %d\n", chrg->charger_data.ibatt_curr);
chrg_dev_info(chrg, "batt temp %d\n", chrg->charger_data.batt_temp);
@ -182,7 +182,7 @@ static int sc8549_update_charger_status(struct mmi_charger_device *chrg)
return rc;
}
static int sc8549_update_charger_error_status(struct mmi_charger_device *chrg)
static int cp_update_charger_error_status(struct mmi_charger_device *chrg)
{
int rc;
int value = 0;
@ -191,14 +191,14 @@ static int sc8549_update_charger_error_status(struct mmi_charger_device *chrg)
if (!chip)
return -ENODEV;
rc = mmi_charger_read_iio_chan(chip, SC8549_CP_STATUS1, &value);
rc = mmi_charger_read_iio_chan(chip, CP_STATUS1, &value);
if (!rc) {
chrg->charger_error.chrg_err_type = value;
}
return rc;
}
static int sc8549_clear_charger_error(struct mmi_charger_device *chrg)
static int cp_clear_charger_error(struct mmi_charger_device *chrg)
{
int rc;
int value = 0;
@ -207,19 +207,19 @@ static int sc8549_clear_charger_error(struct mmi_charger_device *chrg)
if (!chip)
return -ENODEV;
rc = mmi_charger_write_iio_chan(chip, SC8549_CP_CLEAR_ERROR, value);
rc = mmi_charger_write_iio_chan(chip, CP_CLEAR_ERROR, value);
return rc;
}
struct mmi_charger_ops sc8549_charger_ops = {
.enable = sc8549_enable_charging,
.is_enabled = sc8549_is_charging_enabled,
.get_charging_current = sc8549_get_charging_current,
.get_vbus = sc8549_get_vbus,
.get_input_current = sc8549_get_input_current,
.update_charger_status = sc8549_update_charger_status,
.update_charger_error = sc8549_update_charger_error_status,
.clear_charger_error = sc8549_clear_charger_error,
struct mmi_charger_ops cp_charger_ops = {
.enable = cp_enable_charging,
.is_enabled = cp_is_charging_enabled,
.get_charging_current = cp_get_charging_current,
.get_vbus = cp_get_vbus,
.get_input_current = cp_get_input_current,
.update_charger_status = cp_update_charger_status,
.update_charger_error = cp_update_charger_error_status,
.clear_charger_error = cp_clear_charger_error,
};