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

Commit 83eeea88 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: add spi_0 dev subnode on msm8996 adp/cdp platform"

parents b303c61b 89e3e131

Documentation/devicetree/bindings/spi/qcom,spi-qup.txt

+18 −1
Original line number Diff line number Diff line
@@ -35,7 +35,24 @@ Optional properties: 




SPI slave nodes must be children of the SPI master node and can contain

properties described in Documentation/devicetree/bindings/spi/spi-bus.txt

the following properties.



Required properties:

- compatible:     Should contain:

                  "qcom,spi-msm-codec-slave" for external codec control



- reg:            Chip select address of device.



- spi-max-frequency: Maximum SPI clocking speed of device in Hz.



Optional properties:

- spi-cpol:       Empty property indicating device requires

                  inverse clock polarity (CPOL) mode.

- spi-cpha:       Empty property indicating device requires

                  shifted clock phase (CPHA) mode.



Other optional properties described in

Documentation/devicetree/bindings/spi/spi-bus.txt



Example:

arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi

+4 −3
Original line number Diff line number Diff line
@@ -933,9 +933,10 @@ 
};



&spi_0 {

	spi_codec@2 {

	spi_codec@0 {

		compatible = "qcom,spi-msm-codec-slave";

		reg = <2>;

		spi-max-frequency = <19200000>;

		reg = <0>;

		spi-max-frequency = <2000000>;

		spi-cpha;

	};

};

arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -1290,3 +1290,12 @@ 
&blsp1_uart2 {

	status = "ok";

};



&spi_0 {

	spi_codec@0 {

		compatible = "qcom,spi-msm-codec-slave";

		reg = <0>;

		spi-max-frequency = <2000000>;

		spi-cpha;

	};

};

arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi

+9 −0
Original line number Diff line number Diff line
@@ -56,6 +56,15 @@ 
	status = "ok";

};



&spi_0 {

	spi_codec@0 {

		compatible = "qcom,spi-msm-codec-slave";

		reg = <0>;

		spi-max-frequency = <2000000>;

		spi-cpha;

	};

};



&uartblsp2dm1 {

	status = "ok";

	pinctrl-names = "default";

arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi

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

	/delete-property/ qcom,spkr-sd-n-gpio;

};



&spi_0 {

	spi_codec@0 {

		compatible = "qcom,spi-msm-codec-slave";

		reg = <0>;

		spi-max-frequency = <2000000>;

		spi-cpha;

	};

};