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

Commit 0705e05e 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: Move usb_otg from dtsi to dts file for msm8939 skuk"

parents ed946cbd 68f09876

arch/arm/boot/dts/qcom/msm8939-qrd-skuk.dts

+9 −0
Original line number Diff line number Diff line
@@ -60,3 +60,12 @@ 
	status = "ok";

	qcom,disable-bms;

};



&usb_otg {

       qcom,hsusb-otg-mode = <3>;

       qcom,usbid-gpio = <&msm_gpio 110 0>;

       pinctrl-names = "default";

       pinctrl-0 = <&usbid_default>;

       vbus_otg-supply = <&smb1360_otg_supply>;

};

arch/arm/boot/dts/qcom/msm8939-qrd-skuk.dtsi

+0 −8
Original line number Diff line number Diff line
@@ -280,14 +280,6 @@ 
	/delete-property/ cd-gpios;

};



&usb_otg {

       qcom,hsusb-otg-mode = <3>;

       qcom,usbid-gpio = <&msm_gpio 110 0>;

       pinctrl-names = "default";

       pinctrl-0 = <&usbid_default>;

       vbus_otg-supply = <&smb1360_otg_supply>;

};



&mdss_mdp {

	qcom,mdss-pref-prim-intf = "dsi";

};