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

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

Merge "ARM: dts: msm: Remove pmic dependency on Yupik"

parents 57a416e2 36a0f1c9

qcom/yupik-pinctrl.dtsi

+15 −0
Original line number Diff line number Diff line
@@ -2793,5 +2793,20 @@ 
				};

			};

		};



		usb_phy_ps: usb_phy_ps {

			usb3phy_portselect_default: usb3phy_portselect_default {

				mux {

					pins = "gpio140";

					function = "usb_phy";

				};



				config {

					pins = "gpio140";

					bias-disable;

					drive-strength = <2>;

				};

			};

		};

	};

};

qcom/yupik-usb.dtsi

+4 −9
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ 
			0x144 /* GSI_RING_BASE_ADDR_H */

			0x1a4>; /* GSI_IF_STS */

		qcom,dwc-usb3-msm-tx-fifo-size = <21288>;

		usb-role-switch;

		extcon = <&eud>;



		interconnect-names = "usb-ddr", "usb-ipa", "ddr-usb";

		interconnects = <&aggre1_noc MASTER_USB3_0 &mc_virt SLAVE_EBI1>,
@@ -75,13 +73,7 @@ 
			snps,ssp-u3-u0-quirk;

			tx-fifo-resize;

			maximum-speed = "super-speed";

			dr_mode = "otg";

		};



		port {

			usb_port0: endpoint {

				remote-endpoint = <&usb_port0_connector>;

			};

			dr_mode = "peripheral";

		};

	};
@@ -131,6 +123,9 @@ 
			<&gcc GCC_USB3_PHY_PRIM_BCR>;

		reset-names = "global_phy_reset", "phy_reset";



		pinctrl-names = "default";

		pinctrl-0 = <&usb3phy_portselect_default>;



		qcom,qmp-phy-reg-offset =

			<USB3_DP_PCS_PCS_STATUS1

			 USB3_DP_PCS_USB3_AUTONOMOUS_MODE_CTRL

qcom/yupik.dtsi

+0 −5
Original line number Diff line number Diff line
@@ -2083,11 +2083,6 @@ 


		qcom,ucsi {

			compatible = "qcom,ucsi-glink";

			port {

				usb_port0_connector: endpoint {

					remote-endpoint = <&usb_port0>;

				};

			};

		};



		altmode: qcom,altmode {