diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-08-18 12:04:19 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-18 12:04:18 -0700 |
| commit | 89e6c2f791e895900b60b7fb8bb30110b3a06c41 (patch) | |
| tree | 4d3390a7dc79fe47ea9c0807ea03d0af48f658d3 | |
| parent | 59f4659fffecf46e5fec41e579ceb3c778760dc8 (diff) | |
| parent | b99388f08fb9922812625279e2795b370bd91a4a (diff) | |
Merge "ARM: dts: msm: Add SPI device node for msmcobalt"
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi | 12 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt.dtsi | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi index c770b5075ef0..d39db15d3ef1 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi @@ -18,6 +18,10 @@ iommus = <&lpass_q6_smmu 1>; }; +&spi_10 { + status = "ok"; +}; + &soc { qcom,avtimer@170f7000 { compatible = "qcom,avtimer"; @@ -342,5 +346,13 @@ qcom,cdc-slim-ifd-elemental-addr = [00 00 50 02 17 02]; qcom,cdc-dmic-sample-rate = <4800000>; qcom,cdc-mad-dmic-rate = <600000>; + + wcd_spi_0: wcd_spi { + compatible = "qcom,wcd-spi-v2"; + qcom,master-bus-num = <10>; + qcom,chip-select = <0>; + qcom,max-frequency = <24000000>; + qcom,mem-base-addr = <0x100000>; + }; }; }; diff --git a/arch/arm/boot/dts/qcom/msmcobalt.dtsi b/arch/arm/boot/dts/qcom/msmcobalt.dtsi index a3f6365851ac..7287495a5af6 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt.dtsi @@ -2939,7 +2939,7 @@ #include "msmcobalt-gpu.dtsi" #include "msmcobalt-pinctrl.dtsi" #include "msm-audio-lpass.dtsi" -#include "msmcobalt-audio.dtsi" #include "msmcobalt-mdss.dtsi" #include "msmcobalt-mdss-pll.dtsi" #include "msmcobalt-blsp.dtsi" +#include "msmcobalt-audio.dtsi" |