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

Commit a877510f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "USB: msm: Add support for MSM_USB_EXT_CHG_TYPE ioctl"

parents a0ea73ac c1e91719

drivers/usb/dwc3/dwc3-msm.c

+12 −0
Original line number Diff line number Diff line
@@ -2261,6 +2261,18 @@ dwc3_msm_ext_chg_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		else

			pr_debug("%s:voltage request failed\n", __func__);

		break;

	case MSM_USB_EXT_CHG_TYPE:

		if (get_user(val, (int __user *)arg)) {

			pr_err("%s: get_user failed\n\n", __func__);

			ret = -EFAULT;

			break;

		}



		if (val)

			pr_debug("%s:charger is external charger\n", __func__);

		else

			pr_debug("%s:charger is not ext charger\n", __func__);

		break;

	default:

		ret = -EINVAL;

	}

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

+12 −0
Original line number Diff line number Diff line
@@ -4250,6 +4250,18 @@ msm_otg_ext_chg_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		else

			pr_debug("%s:voltage request failed\n", __func__);

		break;

	case MSM_USB_EXT_CHG_TYPE:

		if (get_user(val, (int __user *)arg)) {

			pr_err("%s: get_user failed\n\n", __func__);

			ret = -EFAULT;

			break;

		}



		if (val)

			pr_debug("%s:charger is external charger\n", __func__);

		else

			pr_debug("%s:charger is not ext charger\n", __func__);

		break;

	default:

		ret = -EINVAL;

	}

include/uapi/linux/usb/msm_ext_chg.h

+3 −0
Original line number Diff line number Diff line
@@ -35,4 +35,7 @@ struct msm_usb_chg_info { 


/* To tell kernel about voltage request result */

#define MSM_USB_EXT_CHG_RESULT _IOW('M', 3, int)



/* To tell kernel whether charger connected is external charger or not */

#define MSM_USB_EXT_CHG_TYPE _IOW('M', 4, int)

#endif /* __UAPI_USB_MSM_EXT_CHG_H */