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

Commit a8c15f89 authored by Vijayavardhan Vennapusa's avatar Vijayavardhan Vennapusa
Browse files

usb: phy-msm-usb: Support external charging detection 



External circuitry can perform USB charger detection, obviating
the need for the USB controller to read the D+/D- lines itself.
Notification of detected charger type would happen by way of the
power_supply_set_type() callback. This patch adds handling of
the POWER_SUPPLY_PROP_TYPE property to set the detected charger
type in the phy-msm-usb driver and bypass the internal driver-based
detection routine.

CRs-Fixed: 718067
Change-Id: If0b37e8c1070dcaffd44399c34bf01ccb7c52983
Signed-off-by: default avatarVijayavardhan Vennapusa <vvreddy@codeaurora.org>
parent 2a0e8b68

drivers/usb/phy/phy-msm-usb.c

+29 −2
Original line number Diff line number Diff line
@@ -2470,6 +2470,11 @@ static void msm_chg_detect_work(struct work_struct *w) 
		if (aca_enabled())

			udelay(100);

		msm_chg_enable_aca_intr(motg);



		/* Enable VDP_SRC in case of DCP charger */

		if (motg->chg_type == USB_DCP_CHARGER)

			ulpi_write(phy, 0x2, 0x85);



		dev_dbg(phy->dev, "chg_type = %s\n",

			chg_to_string(motg->chg_type));

		queue_work(system_nrt_wq, &motg->sm_work);
@@ -2672,8 +2677,6 @@ static void msm_otg_sm_work(struct work_struct *w) 
			case USB_CHG_STATE_DETECTED:

				switch (motg->chg_type) {

				case USB_DCP_CHARGER:

					/* Enable VDP_SRC */

					ulpi_write(otg->phy, 0x2, 0x85);

					/* fall through */

				case USB_PROPRIETARY_CHARGER:

					msm_otg_notify_charger(motg,
@@ -3855,6 +3858,30 @@ static int otg_power_set_property_usb(struct power_supply *psy, 
		break;

	case POWER_SUPPLY_PROP_TYPE:

		psy->type = val->intval;



		switch (psy->type) {

		case POWER_SUPPLY_TYPE_USB:

			motg->chg_type = USB_SDP_CHARGER;

			break;

		case POWER_SUPPLY_TYPE_USB_DCP:

			motg->chg_type = USB_DCP_CHARGER;

			break;

		case POWER_SUPPLY_TYPE_USB_CDP:

			motg->chg_type = USB_CDP_CHARGER;

			break;

		case POWER_SUPPLY_TYPE_USB_ACA:

			motg->chg_type = USB_PROPRIETARY_CHARGER;

			break;

		default:

			motg->chg_type = USB_INVALID_CHARGER;

			break;

		}



		if (motg->chg_type != USB_INVALID_CHARGER)

			motg->chg_state = USB_CHG_STATE_DETECTED;



		dev_dbg(motg->phy.dev, "%s: charger type = %s\n", __func__,

			chg_to_string(motg->chg_type));

		break;

	case POWER_SUPPLY_PROP_HEALTH:

		motg->usbin_health = val->intval;