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

Commit 8c849a83 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 node from dtsi files to dts files"

parents a81d5b3f 00073b45

arch/arm/boot/dts/qcom/msm8916-512mb-qrd-skui.dts

+8 −0
Original line number Diff line number Diff line
@@ -49,3 +49,11 @@ 
	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/msm8916-qrd-skui.dts

+8 −0
Original line number Diff line number Diff line
@@ -49,3 +49,11 @@ 
	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/msm8916-qrd-skui.dtsi

+0 −7
Original line number Diff line number Diff line
@@ -227,10 +227,3 @@ 
	/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>;

};