Merge 0b38d81c90
on remote branch
Change-Id: I90265750fa9e1800e7faa110292e418f026cb1f0
This commit is contained in:
@@ -32,8 +32,20 @@
|
|||||||
compatible = "qcom,lpass-cdc-va-macro";
|
compatible = "qcom,lpass-cdc-va-macro";
|
||||||
clock-names = "lpass_audio_hw_vote";
|
clock-names = "lpass_audio_hw_vote";
|
||||||
clocks = <&lpass_audio_hw_vote 0>;
|
clocks = <&lpass_audio_hw_vote 0>;
|
||||||
qcom,va-dmic-sample-rate = <600000>;
|
|
||||||
qcom,va-clk-mux-select = <1>;
|
qcom,va-clk-mux-select = <1>;
|
||||||
|
/*
|
||||||
|
* Clk divding factors for each DMIC pair.
|
||||||
|
* Valid entries for each DMIC pair:
|
||||||
|
* 2, 3, 4, 6, 8, 16
|
||||||
|
*
|
||||||
|
* These factors are translated to corresponding config values
|
||||||
|
* for the following registers,
|
||||||
|
* -- LPASS_VA_TOP_CSR_DMIC0_CTL,
|
||||||
|
* -- LPASS_VA_TOP_CSR_DMIC1_CTL,
|
||||||
|
* -- LPASS_VA_TOP_CSR_DMIC2_CTL,
|
||||||
|
* -- LPASS_VA_TOP_CSR_DMIC3_CTL,
|
||||||
|
*/
|
||||||
|
qcom,va-dmic-clk-div-factor = <16 16 16 16>;
|
||||||
qcom,default-clk-id = <TX_CORE_CLK>;
|
qcom,default-clk-id = <TX_CORE_CLK>;
|
||||||
qcom,use-clk-id = <VA_CORE_CLK>;
|
qcom,use-clk-id = <VA_CORE_CLK>;
|
||||||
qcom,is-used-swr-gpio = <1>;
|
qcom,is-used-swr-gpio = <1>;
|
||||||
@@ -82,7 +94,19 @@
|
|||||||
tx_macro: tx-macro@6AE0000 {
|
tx_macro: tx-macro@6AE0000 {
|
||||||
compatible = "qcom,lpass-cdc-tx-macro";
|
compatible = "qcom,lpass-cdc-tx-macro";
|
||||||
qcom,default-clk-id = <TX_CORE_CLK>;
|
qcom,default-clk-id = <TX_CORE_CLK>;
|
||||||
qcom,tx-dmic-sample-rate = <2400000>;
|
/*
|
||||||
|
* Clk divding factors for each DMIC pair.
|
||||||
|
* Valid entries for each DMIC pair:
|
||||||
|
* 2, 3, 4, 6, 8, 16
|
||||||
|
*
|
||||||
|
* These factors are translated to corresponding config values
|
||||||
|
* for the following registers,
|
||||||
|
* -- LPASS_VA_TOP_CSR_DMIC0_CTL,
|
||||||
|
* -- LPASS_VA_TOP_CSR_DMIC1_CTL,
|
||||||
|
* -- LPASS_VA_TOP_CSR_DMIC2_CTL,
|
||||||
|
* -- LPASS_VA_TOP_CSR_DMIC3_CTL,
|
||||||
|
*/
|
||||||
|
qcom,tx-dmic-clk-div-factor = <4 4 4 4>;
|
||||||
qcom,is-used-swr-gpio = <0>;
|
qcom,is-used-swr-gpio = <0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@@ -439,6 +439,7 @@
|
|||||||
qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
|
qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
|
||||||
qcom,mi2s-tdm-is-hw-vote-needed = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
|
qcom,mi2s-tdm-is-hw-vote-needed = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
|
||||||
qcom,wcn-bt = <1>;
|
qcom,wcn-bt = <1>;
|
||||||
|
qcom,wcn-bt-ext = <1>;
|
||||||
qcom,ext-disp-audio-rx = <1>;
|
qcom,ext-disp-audio-rx = <1>;
|
||||||
qcom,tdm-max-slots = <8>;
|
qcom,tdm-max-slots = <8>;
|
||||||
qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;
|
qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;
|
||||||
|
Reference in New Issue
Block a user