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

Commit bf4ec895 authored by Harry Yang's avatar Harry Yang
Browse files

power: smb5-lib: Add wireless support in DC psy 



Parallel wireless charging requires adjustable voltage output from
Wireless receiver, implemented via input_voltage_regulation property
in wireless psy.

In addition, DC psy also supplies other current/voltage access.

Change-Id: I56e2846f18e9827486569d9c2fa988bc77993e8e
Signed-off-by: default avatarHarry Yang <harryy@codeaurora.org>
parent 60733446

drivers/power/supply/qcom/qpnp-smb5.c

+14 −4
Original line number Diff line number Diff line
@@ -1024,7 +1024,10 @@ static enum power_supply_property smb5_dc_props[] = { 
	POWER_SUPPLY_PROP_INPUT_SUSPEND,

	POWER_SUPPLY_PROP_PRESENT,

	POWER_SUPPLY_PROP_ONLINE,

	POWER_SUPPLY_PROP_VOLTAGE_NOW,

	POWER_SUPPLY_PROP_CURRENT_MAX,

	POWER_SUPPLY_PROP_VOLTAGE_MAX,

	POWER_SUPPLY_PROP_INPUT_VOLTAGE_REGULATION,

	POWER_SUPPLY_PROP_REAL_TYPE,

};
@@ -1046,9 +1049,14 @@ static int smb5_dc_get_prop(struct power_supply *psy, 
	case POWER_SUPPLY_PROP_ONLINE:

		rc = smblib_get_prop_dc_online(chg, val);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_NOW:

		rc = smblib_get_prop_dc_voltage_now(chg, val);

		break;

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		rc = smblib_get_charge_param(chg, &chg->param.dc_icl,

					&val->intval);

		rc = smblib_get_prop_dc_current_max(chg, val);

		break;

	case POWER_SUPPLY_PROP_VOLTAGE_MAX:

		rc = smblib_get_prop_dc_voltage_max(chg, val);

		break;

	case POWER_SUPPLY_PROP_REAL_TYPE:

		val->intval = POWER_SUPPLY_TYPE_WIPOWER;
@@ -1077,8 +1085,10 @@ static int smb5_dc_set_prop(struct power_supply *psy, 
				(bool)val->intval, 0);

		break;

	case POWER_SUPPLY_PROP_CURRENT_MAX:

		rc = smblib_set_charge_param(chg, &chg->param.dc_icl,

					val->intval);

		rc = smblib_set_prop_dc_current_max(chg, val);

		break;

	case POWER_SUPPLY_PROP_INPUT_VOLTAGE_REGULATION:

		rc = smblib_set_prop_voltage_wls_output(chg, val);

		break;

	default:

		return -EINVAL;

drivers/power/supply/qcom/smb5-lib.c

+66 −0
Original line number Diff line number Diff line
@@ -1978,6 +1978,72 @@ int smblib_get_prop_dc_online(struct smb_charger *chg, 
	return rc;

}



int smblib_get_prop_dc_current_max(struct smb_charger *chg,

				    union power_supply_propval *val)

{

	return smblib_get_charge_param(chg, &chg->param.dc_icl, &val->intval);

}



int smblib_get_prop_dc_voltage_max(struct smb_charger *chg,

				    union power_supply_propval *val)

{

	val->intval = MICRO_12V;

	return 0;

}



int smblib_get_prop_dc_voltage_now(struct smb_charger *chg,

				    union power_supply_propval *val)

{

	int rc;



	if (!chg->wls_psy) {

		chg->wls_psy = power_supply_get_by_name("wireless");

		if (!chg->wls_psy)

			return -ENODEV;

	}



	rc = power_supply_get_property(chg->wls_psy,

				POWER_SUPPLY_PROP_VOLTAGE_MAX,

				val);

	if (rc < 0)

		dev_err(chg->dev, "Couldn't get POWER_SUPPLY_PROP_VOLTAGE_MAX, rc=%d\n",

				rc);

	return rc;

}



/*******************

 * DC PSY SETTERS *

 *******************/



int smblib_set_prop_dc_current_max(struct smb_charger *chg,

				    const union power_supply_propval *val)

{

	return smblib_set_charge_param(chg, &chg->param.dc_icl, val->intval);

}



int smblib_set_prop_voltage_wls_output(struct smb_charger *chg,

				    const union power_supply_propval *val)

{

	int rc;



	if (!chg->wls_psy) {

		chg->wls_psy = power_supply_get_by_name("wireless");

		if (!chg->wls_psy)

			return -ENODEV;

	}



	rc = power_supply_set_property(chg->wls_psy,

				POWER_SUPPLY_PROP_INPUT_VOLTAGE_REGULATION,

				val);

	if (rc < 0)

		dev_err(chg->dev, "Couldn't set POWER_SUPPLY_PROP_VOLTAGE_REGULATION, rc=%d\n",

				rc);



	smblib_dbg(chg, PR_WLS, "Set WLS output voltage %d\n", val->intval);



	return rc;

}



/*******************

 * USB PSY GETTERS *

 *******************/

drivers/power/supply/qcom/smb5-lib.h

+11 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ enum print_reason { 
	PR_MISC		= BIT(2),

	PR_PARALLEL	= BIT(3),

	PR_OTG		= BIT(4),

	PR_WLS		= BIT(5),

};



#define DEFAULT_VOTER			"DEFAULT_VOTER"
@@ -282,6 +283,7 @@ struct smb_charger { 
	struct power_supply		*bms_psy;

	struct power_supply		*usb_main_psy;

	struct power_supply		*usb_port_psy;

	struct power_supply		*wls_psy;

	enum power_supply_type		real_charger_type;



	/* notifiers */
@@ -392,6 +394,9 @@ struct smb_charger { 
	u32			headroom_mode;

	bool			flash_init_done;

	bool			flash_active;



	/* wireless */

	int			wireless_vout;

};



int smblib_read(struct smb_charger *chg, u16 addr, u8 *val);
@@ -495,6 +500,12 @@ int smblib_get_prop_dc_current_max(struct smb_charger *chg, 
				union power_supply_propval *val);

int smblib_set_prop_dc_current_max(struct smb_charger *chg,

				const union power_supply_propval *val);

int smblib_get_prop_dc_voltage_now(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_dc_voltage_max(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_set_prop_voltage_wls_output(struct smb_charger *chg,

				const union power_supply_propval *val);

int smblib_get_prop_usb_present(struct smb_charger *chg,

				union power_supply_propval *val);

int smblib_get_prop_usb_online(struct smb_charger *chg,