diff options
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi | 16 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi | 13 | ||||
| -rw-r--r-- | arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi | 13 | ||||
| -rw-r--r-- | include/dt-bindings/clock/msm-clocks-cobalt.h | 5 |
4 files changed, 46 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi index 794f9cc8cc84..8cff24cac87e 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-audio.dtsi @@ -94,6 +94,11 @@ "msm-dai-q6-dev.32770", "msm-dai-q6-dev.16394"; asoc-codec = <&stub_codec>; asoc-codec-names = "msm-stub-codec.1"; + qcom,wsa-max-devs = <2>; + qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_212>, + <&wsa881x_213>, <&wsa881x_214>; + qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight", + "SpkrLeft", "SpkrRight"; }; cpe: qcom,msm-cpe-lsm { @@ -105,13 +110,18 @@ compatible = "qcom,wcd9xxx-irq"; interrupt-controller; #interrupt-cells = <1>; - interrupt-names = "cdc-int"; + interrupt-parent = <&tlmm>; + qcom,gpio-connect = <&tlmm 54 0>; + pinctrl-names = "default"; + pinctrl-0 = <&wcd_intr_default>; }; clock_audio: audio_ext_clk { status = "ok"; compatible = "qcom,audio-ref-clk"; + qcom,audio-ref-clk-gpio = <&pmcobalt_gpios 13 0>; clock-names = "osr_clk"; + clocks = <&clock_gcc clk_div_clk1>; qcom,node_has_rpm_clock; #clock-cells = <1>; }; @@ -137,6 +147,10 @@ pinctrl-0 = <&cdc_reset_active>; pinctrl-1 = <&cdc_reset_sleep>; + clock-names = "wcd_clk", "wcd_native_clk"; + clocks = <&clock_audio clk_audio_pmi_clk>, + <&clock_audio clk_audio_ap_clk2>; + cdc-vdd-buck-supply = <&pmcobalt_s4>; qcom,cdc-vdd-buck-voltage = <1800000 1800000>; qcom,cdc-vdd-buck-current = <650000>; diff --git a/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi index d2d6d85847a6..280e829eb7ec 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-cdp.dtsi @@ -90,3 +90,16 @@ pinctrl-names = "default"; pinctrl-0 = <&uart_console_active>; }; + +&pmcobalt_gpios { + gpio@cc00 { /* GPIO 13 */ + qcom,mode = <1>; + qcom,output-type = <0>; + qcom,pull = <5>; + qcom,vin-sel = <0>; + qcom,out-strength = <1>; + qcom,src-sel = <3>; + qcom,master-en = <1>; + status = "okay"; + }; +}; diff --git a/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi b/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi index 885e71ac9c0f..538e46d6f5da 100644 --- a/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi +++ b/arch/arm/boot/dts/qcom/msmcobalt-mtp.dtsi @@ -90,3 +90,16 @@ pinctrl-names = "default"; pinctrl-0 = <&uart_console_active>; }; + +&pmcobalt_gpios { + gpio@cc00 { /* GPIO 13 */ + qcom,mode = <1>; + qcom,output-type = <0>; + qcom,pull = <5>; + qcom,vin-sel = <0>; + qcom,out-strength = <1>; + qcom,src-sel = <3>; + qcom,master-en = <1>; + status = "okay"; + }; +}; diff --git a/include/dt-bindings/clock/msm-clocks-cobalt.h b/include/dt-bindings/clock/msm-clocks-cobalt.h index a38cc0fdb294..dfda7b1239d9 100644 --- a/include/dt-bindings/clock/msm-clocks-cobalt.h +++ b/include/dt-bindings/clock/msm-clocks-cobalt.h @@ -476,4 +476,9 @@ #define clk_sys_apcsaux_clk_gcc 0xf905e862 #define clk_xo_ao 0x428c856d +/* Audio External Clocks */ +#define clk_audio_ap_clk 0x9b5727cb +#define clk_audio_pmi_clk 0xcbfe416d +#define clk_audio_ap_clk2 0x454d1e91 + #endif |