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

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

Merge "ARM: dts: msm: Register cnss in apq8084 CDP and MTP" into msm-3.10

parents de869f55 fd395a1f
Loading
Loading
Loading
Loading
+5 −0
Original line number Original line Diff line number Diff line
@@ -59,3 +59,8 @@
&xhci_hsic_host {
&xhci_hsic_host {
	hsic,resume-gpio = <&msmgpio 108 0x00>;
	hsic,resume-gpio = <&msmgpio 108 0x00>;
};
};

&cnss {
	esoc-names = "modem_wlan";
	esoc-0 = <&mdm0>;
};
+5 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,11 @@
	status = "ok";
	status = "ok";
};
};


&cnss {
	esoc-names = "modem_wlan";
	esoc-0 = <&mdm0>;
};

&usb3 {
&usb3 {
	vbus_dwc3-supply = <&smb349_otg_vreg>;
	vbus_dwc3-supply = <&smb349_otg_vreg>;
};
};
+5 −0
Original line number Original line Diff line number Diff line
@@ -56,3 +56,8 @@
&ufs1 {
&ufs1 {
	status = "disabled";
	status = "disabled";
};
};

&cnss {
	esoc-names = "modem_wlan";
	esoc-0 = <&mdm1>;
};
+5 −0
Original line number Original line Diff line number Diff line
@@ -73,3 +73,8 @@
&xhci_hsic_host {
&xhci_hsic_host {
	hsic,resume-gpio = <&msmgpio 108 0x00>;
	hsic,resume-gpio = <&msmgpio 108 0x00>;
};
};

&cnss {
	esoc-names = "modem_wlan";
	esoc-0 = <&mdm0>;
};
+5 −0
Original line number Original line Diff line number Diff line
@@ -67,3 +67,8 @@
&ufs1 {
&ufs1 {
	status = "disabled";
	status = "disabled";
};
};

&cnss {
	esoc-names = "modem_wlan";
	esoc-0 = <&mdm1>;
};
Loading