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

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

Merge "usb: pd: qpnp-pdphy: Remove trimming"

parents b4a9ebe1 102ecddc

arch/arm64/boot/dts/qcom/pm855b.dtsi

+29 −0
Original line number Diff line number Diff line
@@ -230,6 +230,35 @@ 
						  "temp-change-smb";

			};

		};



		pm855b_pdphy: qcom,usb-pdphy@1700 {

			compatible = "qcom,qpnp-pdphy";

			reg = <0x1700 0x100>;

			vdd-pdphy-supply = <&pm855_l2>;

			vbus-supply = <&smb5_vbus>;

			vconn-supply = <&smb5_vconn>;

			interrupts = <0x2 0x17 0x0 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x1 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x2 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x3 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x4 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x5 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x6 IRQ_TYPE_EDGE_RISING>,

				     <0x2 0x17 0x7 IRQ_TYPE_EDGE_RISING>;



			interrupt-names = "sig-tx",

					  "sig-rx",

					  "msg-tx",

					  "msg-rx",

					  "msg-tx-failed",

					  "msg-tx-discarded",

					  "msg-rx-discarded",

					  "fr-swap";



			qcom,default-sink-caps = <5000 3000>, /* 5V @ 3A */

						 <9000 3000>, /* 9V @ 3A */

						 <12000 2250>; /* 12V @ 2.25A */

		};

	};



	qcom,pm855b@3 {

drivers/usb/pd/qpnp-pdphy.c

+2 −13
Original line number Diff line number Diff line
@@ -72,12 +72,9 @@ 


#define USB_PDPHY_RX_BUFFER		0x80



#define USB_PDPHY_SEC_ACCESS		0xD0

#define USB_PDPHY_TRIM_3		0xF3



/* VDD regulator */

#define VDD_PDPHY_VOL_MIN		3088000 /* uV */

#define VDD_PDPHY_VOL_MAX		3088000 /* uV */

#define VDD_PDPHY_VOL_MIN		2800000 /* uV */

#define VDD_PDPHY_VOL_MAX		3300000 /* uV */

#define VDD_PDPHY_HPM_LOAD		3000 /* uA */



/* timers */
@@ -841,14 +838,6 @@ static int pdphy_probe(struct platform_device *pdev) 
	if (ret < 0)

		return ret;



	ret = pdphy_reg_write(pdphy, USB_PDPHY_SEC_ACCESS, 0xA5);

	if (ret)

		return ret;



	ret = pdphy_reg_write(pdphy, USB_PDPHY_TRIM_3, 0x2);

	if (ret)

		return ret;



	/* usbpd_create() could call back to us, so have __pdphy ready */

	__pdphy = pdphy;