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

Commit f437b3cd 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 SPI on 8992."

parents 18c43109 3f26b98e

arch/arm/boot/dts/qcom/msm8992-cdp.dtsi

+0 −3
Original line number Diff line number Diff line
@@ -155,9 +155,6 @@ 
	pinctrl-0 = <&uart_console_sleep>;

};



&spi_0 {

	status = "disabled";

};



&usb3 {

	status = "ok";

arch/arm/boot/dts/qcom/msm8992-mtp.dtsi

+0 −4
Original line number Diff line number Diff line
@@ -97,10 +97,6 @@ 
	pinctrl-0 = <&uart_console_sleep>;

};



&spi_0 {

	status = "disabled";

};



&usb3 {

	status = "ok";

};

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

+5 −4
Original line number Diff line number Diff line
@@ -1017,10 +1017,11 @@ 
		compatible = "qcom,spi-qup-v2";

		#address-cells = <1>;

		#size-cells = <0>;

		reg-names = "spi_physical";

		reg = <0xf9923000 0x600>;

		interrupt-names = "spi_irq";

		interrupts = <0 95 0>;

		reg-names = "spi_physical", "spi_bam_physical";

		reg = <0xf9923000 0x500>,

		      <0xf9904000 0x20000>;

		interrupt-names = "spi_irq", "spi_bam_irq";

		interrupts = <0 95 0>, <0 238 0>;

		spi-max-frequency = <50000000>;

		pinctrl-names = "default", "sleep";

		pinctrl-0 = <&spi0_default &spi0_cs2_active>;