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

Commit 97915c40 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dt-bindings: usb: Remove vconn_uses_external_source from qpnp-pdphy"

parents bf083c8e 778bdd14

Documentation/devicetree/bindings/usb/qpnp-pdphy.txt

+0 −3
Original line number Diff line number Diff line
@@ -40,9 +40,6 @@ Optional properties: 
- vconn-supply:		Regulator that enables VCONN source output. This will

			be supplied on the USB CC line that is not used for

			communication when Ra resistance is detected.

- qcom,vconn-uses-external-source: Indicates whether VCONN supply is sourced

			from an external regulator. If omitted, then it is

			assumed it is connected to VBUS.

- qcom,default-sink-caps: List of 32-bit values representing the nominal sink

			capabilities in voltage (millivolts) and current

			(milliamps) pairs.

drivers/usb/pd/policy_engine.c

+0 −23
Original line number Diff line number Diff line
@@ -448,7 +448,6 @@ struct usbpd { 
	struct regulator	*vconn;

	bool			vbus_enabled;

	bool			vconn_enabled;

	bool			vconn_is_external;



	u8			tx_msgid[SOPII_MSG + 1];

	u8			rx_msgid[SOPII_MSG + 1];
@@ -830,11 +829,6 @@ static int pd_select_pdo(struct usbpd *pd, int pdo_pos, int uv, int ua) 
		return -ENOTSUPP;

	}



	/* Can't sink more than 5V if VCONN is sourced from the VBUS input */

	if (pd->vconn_enabled && !pd->vconn_is_external &&

			pd->requested_voltage > 5000000)

		return -ENOTSUPP;



	pd->requested_current = curr;

	pd->requested_pdo = pdo_pos;
@@ -3053,20 +3047,6 @@ static void usbpd_sm(struct work_struct *w) 
			usbpd_set_state(pd, PE_PRS_SNK_SRC_TRANSITION_TO_OFF);

			break;

		} else if (IS_CTRL(rx_msg, MSG_VCONN_SWAP)) {

			/*

			 * if VCONN is connected to VBUS, make sure we are

			 * not in high voltage contract, otherwise reject.

			 */

			if (!pd->vconn_is_external &&

					(pd->requested_voltage > 5000000)) {

				ret = pd_send_msg(pd, MSG_REJECT, NULL, 0,

						SOP_MSG);

				if (ret)

					usbpd_set_state(pd, PE_SEND_SOFT_RESET);



				break;

			}



			ret = pd_send_msg(pd, MSG_ACCEPT, NULL, 0, SOP_MSG);

			if (ret) {

				usbpd_set_state(pd, PE_SEND_SOFT_RESET);
@@ -4573,9 +4553,6 @@ struct usbpd *usbpd_create(struct device *parent) 
	extcon_set_property_capability(pd->extcon, EXTCON_USB_HOST,

			EXTCON_PROP_USB_SS);



	pd->vconn_is_external = device_property_present(parent,

					"qcom,vconn-uses-external-source");



	pd->num_sink_caps = device_property_read_u32_array(parent,

			"qcom,default-sink-caps", NULL, 0);

	if (pd->num_sink_caps > 0) {