Merge "ARM: dts: msm: Add SPI device node for msmcobalt"

This commit is contained in:
Linux Build Service Account 2016-08-18 12:04:19 -07:00 committed by Gerrit - the friendly Code Review server
commit 89e6c2f791
2 changed files with 13 additions and 1 deletions

View file

@ -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>;
};
};
};

View file

@ -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"