diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-06-17 05:00:33 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-06-17 05:00:32 -0700 |
| commit | 83eeea88f974840474b440ef108ff988f433a474 (patch) | |
| tree | ede5a8836c7b1497a6e28a01a4d2761c2734b458 | |
| parent | b303c61b5b5f844bdcb5072a44029d183361cb34 (diff) | |
| parent | 89e3e131e98f0bbdb07ca4eeaeed33fc2b54a90e (diff) | |
Merge "ARM: dts: msm: add spi_0 dev subnode on msm8996 adp/cdp platform"
| -rw-r--r-- | Documentation/devicetree/bindings/spi/qcom,spi-qup.txt | 19 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi | 7 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi | 9 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi | 9 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi | 9 |
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 e2c88df2cc15..3befe88b7579 100644 --- a/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt +++ b/Documentation/devicetree/bindings/spi/qcom,spi-qup.txt @@ -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: diff --git a/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi b/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi index 2d516df2b6f6..82f19c0fc9fe 100644 --- a/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi +++ b/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi @@ -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; }; }; diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi index 3f06a771b369..10ad47b2abf4 100644 --- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi @@ -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; + }; +}; diff --git a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi index 4bfd95b097f5..005176128d38 100644 --- a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi @@ -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"; diff --git a/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi index 3889740b36e5..ac814a928d8f 100644 --- a/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi +++ b/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi @@ -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; + }; +}; |