From 3638c3731070ff10fd6a4a6ad840e1732ee72a3e Mon Sep 17 00:00:00 2001 From: Soumya Managoli Date: Mon, 29 Aug 2022 23:07:01 +0530 Subject: [PATCH 1/3] ARM: dts: Add audio support for khaje qrd Enable sound nodes for khaje qrd. Change-Id: If5e49f0716b478df9935b343d966b0d9cc653f4e --- Kbuild | 2 ++ bengal-audio-qrd.dtsi | 42 ++++++++++++++++++++++++++++++++++++ khaje-audio-qrd-hvdcp3p5.dts | 11 ++++++++++ khaje-audio-qrd.dts | 11 ++++++++++ 4 files changed, 66 insertions(+) create mode 100644 bengal-audio-qrd.dtsi create mode 100644 khaje-audio-qrd-hvdcp3p5.dts create mode 100644 khaje-audio-qrd.dts diff --git a/Kbuild b/Kbuild index e2380ae3..e77931a5 100644 --- a/Kbuild +++ b/Kbuild @@ -20,6 +20,8 @@ endif ifeq ($(CONFIG_ARCH_KHAJE), y) dtbo-y += khaje-audio.dtbo \ khaje-audio-idp.dtbo \ + khaje-audio-qrd.dtbo \ + khaje-audio-qrd-hvdcp3p5.dtbo \ khaje-nowcd.dtbo endif diff --git a/bengal-audio-qrd.dtsi b/bengal-audio-qrd.dtsi new file mode 100644 index 00000000..714fcb1b --- /dev/null +++ b/bengal-audio-qrd.dtsi @@ -0,0 +1,42 @@ +#include "bengal-audio-overlay.dtsi" + +&bengal_snd { + qcom,model = "bengal-qrd-snd-card"; + qcom,msm-mi2s-master = <1>, <1>, <1>, <1>; + qcom,wcn-btfm = <1>; + qcom,ext-disp-audio-rx = <0>; + qcom,audio-routing = + "AMIC1", "Analog Mic1", + "AMIC1", "MIC BIAS1", + "AMIC2", "Analog Mic2", + "AMIC2", "MIC BIAS2", + "AMIC3", "MIC BIAS3", + "AMIC3", "Analog Mic3", + "AMIC3", "MIC BIAS3", + "AMIC4", "Analog Mic4", + "AMIC4", "MIC BIAS3", + "IN1_HPHL", "HPHL_OUT", + "IN2_HPHR", "HPHR_OUT", + "IN3_AUX", "AUX_OUT", + "SpkrMono WSA_IN", "AUX", + "TX SWR_INPUT", "WCD_TX_OUTPUT", + "VA SWR_INPUT", "VA_SWR_CLK", + "VA SWR_INPUT", "WCD_TX_OUTPUT", + "RX_TX DEC0_INP", "TX DEC0 MUX", + "RX_TX DEC1_INP", "TX DEC1 MUX", + "RX_TX DEC2_INP", "TX DEC2 MUX", + "RX_TX DEC3_INP", "TX DEC3 MUX", + "TX_AIF1 CAP", "VA_SWR_CLK", + "TX_AIF2 CAP", "VA_SWR_CLK", + "TX_AIF3 CAP", "VA_SWR_CLK"; + qcom,msm-mbhc-hphl-swh = <1>; + qcom,msm-mbhc-gnd-swh = <1>; + asoc-codec = <&stub_codec>, <&bolero_cdc>, + <&wcd937x_codec> , <&wsa881x_i2c_e>; + asoc-codec-names = "msm-stub-codec.1", "bolero-codec", + "wcd937x_codec", "wsa-codec0"; + qcom,wsa-max-devs = <1>; + qcom,wsa-aux-dev-prefix = "SpkrMono"; + qcom,msm_audio_ssr_devs = <&audio_gpr>, <&bolero_cdc>, + <&lpi_tlmm>; +}; diff --git a/khaje-audio-qrd-hvdcp3p5.dts b/khaje-audio-qrd-hvdcp3p5.dts new file mode 100644 index 00000000..580d5afe --- /dev/null +++ b/khaje-audio-qrd-hvdcp3p5.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "bengal-audio-qrd.dtsi" +/ { + model = "Qualcomm Technologies, Inc. Khaje QRD HVDCP3P5"; + compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd"; + qcom,msm-id = <518 0x10000>; + qcom,board-id = <0x1010B 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/khaje-audio-qrd.dts b/khaje-audio-qrd.dts new file mode 100644 index 00000000..b785ce23 --- /dev/null +++ b/khaje-audio-qrd.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "bengal-audio-qrd.dtsi" +/ { + model = "Qualcomm Technologies, Inc. Khaje QRD"; + compatible = "qcom,khaje-qrd", "qcom,khaje", "qcom,qrd"; + qcom,msm-id = <518 0x10000>; + qcom,board-id = <0x1000B 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; From dba3d3262d1a36aa63f1b77128476b565376db44 Mon Sep 17 00:00:00 2001 From: Soumya Managoli Date: Mon, 5 Sep 2022 13:23:46 +0530 Subject: [PATCH 2/3] ARM: dts: Add audio support for khaje idp nopmi Enable sound node for khaje idp nopmi platform. Change-Id: I458ee91b2394a16b58d9eb3a385fc9bc9090b8c4 --- Kbuild | 1 + khaje-audio-idp-nopmi.dts | 11 +++++++++++ 2 files changed, 12 insertions(+) create mode 100644 khaje-audio-idp-nopmi.dts diff --git a/Kbuild b/Kbuild index e77931a5..5fd55e85 100644 --- a/Kbuild +++ b/Kbuild @@ -22,6 +22,7 @@ dtbo-y += khaje-audio.dtbo \ khaje-audio-idp.dtbo \ khaje-audio-qrd.dtbo \ khaje-audio-qrd-hvdcp3p5.dtbo \ + khaje-audio-idp-nopmi.dtbo \ khaje-nowcd.dtbo endif diff --git a/khaje-audio-idp-nopmi.dts b/khaje-audio-idp-nopmi.dts new file mode 100644 index 00000000..26c7ee3d --- /dev/null +++ b/khaje-audio-idp-nopmi.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "bengal-audio-overlay.dtsi" +/ { + model = "Qualcomm Technologies, Inc. Khaje IDP nopmi"; + compatible = "qcom,khaje-idp", "qcom,khaje", "qcom,idp"; + qcom,msm-id = <518 0x10000>; + qcom,board-id = <0x10022 0>; + qcom,pmic-id = <0x2D 0x0 0x0 0x0>; +}; From 0d6ae8d1f76f69100ccbf46d1d7d07e38ea92841 Mon Sep 17 00:00:00 2001 From: Soumya Managoli Date: Fri, 9 Sep 2022 12:52:07 +0530 Subject: [PATCH 3/3] ARM: dts: Audio support for khajeg idp Enable sound node for khajeg idp platform. Change-Id: Ic5fe29f1ed903ef3fad90efbac63add2f1f478f5 --- Kbuild | 2 ++ khaje-audio.dts | 2 +- khajeg-audio-idp-90hz.dts | 11 +++++++++++ khajeg-audio-idp.dts | 11 +++++++++++ 4 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 khajeg-audio-idp-90hz.dts create mode 100644 khajeg-audio-idp.dts diff --git a/Kbuild b/Kbuild index 5fd55e85..d949f082 100644 --- a/Kbuild +++ b/Kbuild @@ -23,6 +23,8 @@ dtbo-y += khaje-audio.dtbo \ khaje-audio-qrd.dtbo \ khaje-audio-qrd-hvdcp3p5.dtbo \ khaje-audio-idp-nopmi.dtbo \ + khajeg-audio-idp.dtbo \ + khajeg-audio-idp-90hz.dtbo \ khaje-nowcd.dtbo endif diff --git a/khaje-audio.dts b/khaje-audio.dts index 74f59d7d..459b5536 100644 --- a/khaje-audio.dts +++ b/khaje-audio.dts @@ -9,6 +9,6 @@ / { model = "Qualcomm Technologies, Inc. Khaje SoC"; compatible = "qcom,khaje"; - qcom,msm-id = <518 0x10000>; + qcom,msm-id = <518 0x10000>, <585 0x10000>; qcom,board-id = <0 0>; }; diff --git a/khajeg-audio-idp-90hz.dts b/khajeg-audio-idp-90hz.dts new file mode 100644 index 00000000..f97be7ae --- /dev/null +++ b/khajeg-audio-idp-90hz.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "bengal-audio-overlay.dtsi" +/ { + model = "Qualcomm Technologies, Inc. Khajeg IDPS + 90Hz"; + compatible = "qcom,khajeg-idp", "qcom,khajeg", "qcom,idp"; + qcom,msm-id = <585 0x10000>; + qcom,board-id = <0x10122 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +}; diff --git a/khajeg-audio-idp.dts b/khajeg-audio-idp.dts new file mode 100644 index 00000000..fb11486c --- /dev/null +++ b/khajeg-audio-idp.dts @@ -0,0 +1,11 @@ +/dts-v1/; +/plugin/; + +#include "bengal-audio-overlay.dtsi" +/ { + model = "Qualcomm Technologies, Inc. Khajeg IDP"; + compatible = "qcom,khajeg-idp", "qcom,khajeg", "qcom,idp"; + qcom,msm-id = <585 0x10000>; + qcom,board-id = <0x10022 0>; + qcom,pmic-id = <0x2D 0x2E 0x0 0x0>; +};