Merge "power: smb5: Disable/enable USBIN pulldown upon Type-C attach/detach" (0144d3f6) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+10 −12

Original line number	Diff line number	Diff line
		@@ -1365,17 +1365,6 @@ int smblib_set_icl_current(struct smb_charger *chg, int icl_ua)
		POWER_SUPPLY_TYPEC_SINK_DEBUG_ACCESSORY)
		return 0;

		if (chg->connector_type == POWER_SUPPLY_CONNECTOR_TYPEC) {
		rc = smblib_masked_write(chg, USB_CMD_PULLDOWN_REG,
		EN_PULLDOWN_USB_IN_BIT,
		suspend ? 0 : EN_PULLDOWN_USB_IN_BIT);
		if (rc < 0) {
		smblib_err(chg, "Couldn't write %s to EN_PULLDOWN_USB_IN_BIT rc=%d\n",
		suspend ? "disable" : "enable", rc);
		goto out;
		}
		}

		if (suspend)
		return smblib_set_usb_suspend(chg, true);

		@@ -5958,6 +5947,7 @@ irqreturn_t typec_attach_detach_irq_handler(int irq, void *data)
		struct smb_irq_data *irq_data = data;
		struct smb_charger *chg = irq_data->parent_data;
		u8 stat;
		bool attached = false;
		int rc;

		smblib_dbg(chg, PR_INTERRUPT, "IRQ: %s\n", irq_data->name);
		@@ -5969,8 +5959,9 @@ irqreturn_t typec_attach_detach_irq_handler(int irq, void *data)
		return IRQ_HANDLED;
		}

		if (stat & TYPEC_ATTACH_DETACH_STATE_BIT) {
		attached = !!(stat & TYPEC_ATTACH_DETACH_STATE_BIT);

		if (attached) {
		smblib_lpd_clear_ra_open_work(chg);

		rc = smblib_read(chg, TYPE_C_MISC_STATUS_REG, &stat);
		@@ -6030,6 +6021,13 @@ irqreturn_t typec_attach_detach_irq_handler(int irq, void *data)
		msecs_to_jiffies(1000));
		}

		rc = smblib_masked_write(chg, USB_CMD_PULLDOWN_REG,
		EN_PULLDOWN_USB_IN_BIT,
		attached ? 0 : EN_PULLDOWN_USB_IN_BIT);
		if (rc < 0)
		smblib_err(chg, "Couldn't configure pulldown on USB_IN rc=%d\n",
		rc);

		power_supply_changed(chg->usb_psy);
		if (chg->dual_role)
		dual_role_instance_changed(chg->dual_role);