From 4c253eddc94f99076c6d2155a5b902819cd01390 Mon Sep 17 00:00:00 2001 From: Phani Kumar Uppalapati Date: Sun, 12 Jun 2022 13:09:56 -0700 Subject: [PATCH 1/2] audio: dts: Use VA_CORE_CLK for SVA use-cases Use VA_CORE_CLK for SVA use-cases on kalama target. Change-Id: Idc6160e99bb7b009096242ebd36156e1e53e307d --- kalama-audio-overlay.dtsi | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/kalama-audio-overlay.dtsi b/kalama-audio-overlay.dtsi index a4c2bd37..0336ee7a 100644 --- a/kalama-audio-overlay.dtsi +++ b/kalama-audio-overlay.dtsi @@ -18,11 +18,12 @@ qcom,va_mclk_mode_muxsel = <0x06E28000>; clock-names = "tx_core_clk", "rx_core_clk", "wsa_core_clk", "wsa2_core_clk", "rx_tx_core_clk", - "wsa_tx_core_clk", "wsa2_tx_core_clk"; + "wsa_tx_core_clk", "wsa2_tx_core_clk", "va_core_clk"; clocks = <&clock_audio_tx_1 0>, <&clock_audio_rx_1 0>, <&clock_audio_wsa_1 0>, <&clock_audio_wsa_2 0>, <&clock_audio_rx_tx 0>, - <&clock_audio_wsa_tx 0>, <&clock_audio_wsa2_tx 0>; + <&clock_audio_wsa_tx 0>, <&clock_audio_wsa2_tx 0>, + <&clock_audio_va_1 0>; }; va_macro: va-macro@6D44000 { @@ -34,7 +35,7 @@ qcom,va-clk-mux-select = <1>; qcom,va-island-mode-muxsel = <0x06E28000>; qcom,default-clk-id = ; - qcom,use-clk-id = ; + qcom,use-clk-id = ; qcom,is-used-swr-gpio = <1>; qcom,va-swr-gpios = <&va_swr_gpios>; swr2: va_swr_master { @@ -570,6 +571,14 @@ pinctrl-1 = <&wcd938x_reset_sleep>; }; + clock_audio_va_1: va_core_clk { + compatible = "qcom,audio-ref-clk"; + qcom,codec-ext-clk-src = ; + qcom,codec-lpass-ext-clk-freq = <19200000>; + qcom,codec-lpass-clk-id = <0x307>; + #clock-cells = <1>; + }; + clock_audio_wsa_1: wsa_core_clk { compatible = "qcom,audio-ref-clk"; qcom,codec-ext-clk-src = ; From 69f24b59d14190845298aca5cf90cc1728967f39 Mon Sep 17 00:00:00 2001 From: Phani Kumar Uppalapati Date: Tue, 10 May 2022 23:06:25 -0700 Subject: [PATCH 2/2] audio: dts: add support for kalama v2 hardware Add support for kalama v2 hardware revision. Change-Id: Ie46ee639c80794780d3774b969555cbd6da8c269 --- Kbuild | 1 + kalama-audio-cdp-nfc.dts | 10 ++++++++++ kalama-audio-cdp.dts | 2 +- kalama-audio-mtp-nfc.dts | 2 +- kalama-audio-mtp.dts | 2 +- kalama-audio-qrd.dts | 2 +- kalama-audio-rcm.dts | 2 +- kalama-audio-rumi.dts | 2 +- kalama-audio-wsa883x-cdp.dts | 2 +- kalama-audio.dts | 2 +- 10 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 kalama-audio-cdp-nfc.dts diff --git a/Kbuild b/Kbuild index 4fc92edb..8ffffa8d 100644 --- a/Kbuild +++ b/Kbuild @@ -1,6 +1,7 @@ ifeq ($(CONFIG_ARCH_KALAMA), y) dtbo-y += kalama-audio.dtbo \ kalama-audio-cdp.dtbo \ + kalama-audio-cdp-nfc.dtbo \ kalama-audio-wsa883x-cdp.dtbo \ kalama-audio-mtp.dtbo \ kalama-audio-mtp-nfc.dtbo \ diff --git a/kalama-audio-cdp-nfc.dts b/kalama-audio-cdp-nfc.dts new file mode 100644 index 00000000..308f0fb2 --- /dev/null +++ b/kalama-audio-cdp-nfc.dts @@ -0,0 +1,10 @@ +/dts-v1/; +/plugin/; + +#include "kalama-audio-cdp.dtsi" + / { + model = "Qualcomm Technologies, Inc. Kalama CDP ST54K NFC"; + compatible = "qcom,kalama-cdp", "qcom,kalama", "qcom,cdp"; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; + qcom,board-id = <0x02010001 0>; +}; diff --git a/kalama-audio-cdp.dts b/kalama-audio-cdp.dts index 35d97f94..8a345804 100644 --- a/kalama-audio-cdp.dts +++ b/kalama-audio-cdp.dts @@ -5,6 +5,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama CDP"; compatible = "qcom,kalama-cdp", "qcom,kalama", "qcom,cdp"; - qcom,msm-id = <519 0x10000>, <536 0x10000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; qcom,board-id = <0x10001 0>; }; diff --git a/kalama-audio-mtp-nfc.dts b/kalama-audio-mtp-nfc.dts index 825e4db6..7f871a67 100644 --- a/kalama-audio-mtp-nfc.dts +++ b/kalama-audio-mtp-nfc.dts @@ -5,6 +5,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama MTP ST54K NFC"; compatible = "qcom,kalama-mtp", "qcom,kalama", "qcom,mtp"; - qcom,msm-id = <519 0x10000>, <536 0x10000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; qcom,board-id = <0x1010008 0>; }; diff --git a/kalama-audio-mtp.dts b/kalama-audio-mtp.dts index 5ad4a94d..e8f2a9b3 100644 --- a/kalama-audio-mtp.dts +++ b/kalama-audio-mtp.dts @@ -5,6 +5,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama MTP"; compatible = "qcom,kalama-mtp", "qcom,kalama", "qcom,mtp"; - qcom,msm-id = <519 0x10000>, <536 0x10000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; qcom,board-id = <0x10008 0>; }; diff --git a/kalama-audio-qrd.dts b/kalama-audio-qrd.dts index 05d05e62..52349a7a 100644 --- a/kalama-audio-qrd.dts +++ b/kalama-audio-qrd.dts @@ -5,6 +5,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama QRD"; compatible = "qcom,kalama-qrd", "qcom,kalama", "qcom,qrd"; - qcom,msm-id = <519 0x10000>, <536 0x10000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; qcom,board-id = <0x1000B 0>; }; diff --git a/kalama-audio-rcm.dts b/kalama-audio-rcm.dts index c189e28d..f7a7d8c6 100644 --- a/kalama-audio-rcm.dts +++ b/kalama-audio-rcm.dts @@ -5,6 +5,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama RCM"; compatible = "qcom,kalama-rcm", "qcom,kalama", "qcom,rcm"; - qcom,msm-id = <519 0x10000>, <536 0x10000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; qcom,board-id = <0x10015 0>; }; diff --git a/kalama-audio-rumi.dts b/kalama-audio-rumi.dts index 47dc265f..ec26b758 100644 --- a/kalama-audio-rumi.dts +++ b/kalama-audio-rumi.dts @@ -5,6 +5,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama RUMI"; compatible = "qcom,kalama-rumi", "qcom,kalama", "qcom,rumi"; - qcom,msm-id = <519 0x10000>; + qcom,msm-id = <519 0x10000>, <519 0x20000>, <536 0x10000>, <536 0x20000>; qcom,board-id = <0x1000F 0>; }; diff --git a/kalama-audio-wsa883x-cdp.dts b/kalama-audio-wsa883x-cdp.dts index b229c76a..d8159d5b 100644 --- a/kalama-audio-wsa883x-cdp.dts +++ b/kalama-audio-wsa883x-cdp.dts @@ -5,6 +5,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama CDP - WSA883X"; compatible = "qcom,kalama-cdp", "qcom,kalama", "qcom,cdp"; - qcom,msm-id = <519 0x10000>, <536 0x10000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; qcom,board-id = <0x1010001 0>; }; diff --git a/kalama-audio.dts b/kalama-audio.dts index d553f153..3fb4c66e 100644 --- a/kalama-audio.dts +++ b/kalama-audio.dts @@ -11,6 +11,6 @@ / { model = "Qualcomm Technologies, Inc. Kalama"; compatible = "qcom,kalama"; - qcom,msm-id = <519 0x10000>, <536 0x10000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>; qcom,board-id = <0 0>; };