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

Commit e0e58621 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: Enable CDROM lun creation"

parents 142277b6 e3b81210

arch/arm/boot/dts/qcom/msm8226-qrd.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -159,6 +159,10 @@ 
	};

};



&android_usb {

	qcom,android-usb-cdrom;

};



&sdhc_1 {

	vdd-supply = <&pm8226_l17>;

	qcom,vdd-voltage-level = <2950000 2950000>;

arch/arm/boot/dts/qcom/msm8916-qrd.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -53,6 +53,10 @@ 
	};

};



&android_usb {

	qcom,android-usb-cdrom;

};



&blsp1_uart2 {

	status = "ok";

	pinctrl-names = "default";

arch/arm/boot/dts/qcom/msm8916.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ 
				"xo";

	};



	android_usb@086000c8 {

	android_usb: android_usb@086000c8 {

		compatible = "qcom,android-usb";

		reg = <0x086000c8 0xc8>;

		qcom,android-usb-swfi-latency = <1>;