summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Chen <chenche@codeaurora.org>2016-06-10 15:57:02 -0400
committerGerrit - the friendly Code Review server <code-review@localhost>2017-03-22 23:03:28 -0700
commite823a55d473519968ceb166e106983aeabde8a89 (patch)
tree229cb798c72ac78aae9c2da4cb9cab3cc69b6fbb
parent90c6439d081e5d81f349fb3c38ddbc8fd606340b (diff)
ARM: dts: msm: add spi_0 dev subnode on msm8996 adp/cdp platform
Add spi-msm-codec-slave device as a subnode of spi_0 on msm8996 adp/cdp platform. CRs-fixed: 1027162 Signed-off-by: Derek Chen <chenche@codeaurora.org> Change-Id: I0b402ef31b53b7f0408e2eec39cc8dea2729cedd
-rw-r--r--Documentation/devicetree/bindings/spi/qcom,spi-qup.txt19
-rw-r--r--arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi7
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi9
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi9
-rw-r--r--arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi9
5 files changed, 49 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt b/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt
index 5c090771c016..fa6a6dfea0e2 100644
--- a/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt
+++ b/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt
@@ -40,7 +40,24 @@ Optional properties:
receive.
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:
diff --git a/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi b/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi
index 887e871406a4..fbc71a5aa9e4 100644
--- a/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi
+++ b/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi
@@ -893,9 +893,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;
};
};
diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
index ca374217385b..637d6ddf27fe 100644
--- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
@@ -989,3 +989,12 @@
&blsp1_uart2 {
status = "ok";
};
+
+&spi_0 {
+ spi_codec@0 {
+ compatible = "qcom,spi-msm-codec-slave";
+ reg = <0>;
+ spi-max-frequency = <2000000>;
+ spi-cpha;
+ };
+};
diff --git a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
index 2cb20120a737..d1b494ca00f7 100644
--- a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
@@ -44,6 +44,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";
diff --git a/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi
index acb98745b2a7..bd54ef98f1c3 100644
--- a/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi
@@ -876,3 +876,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;
+ };
+};