From 8d0288b196d7ff327f8bb54716f31c3023df80c6 Mon Sep 17 00:00:00 2001 From: yuayang Date: Wed, 17 Aug 2022 17:33:38 +0800 Subject: [PATCH] audio dts: audio dts: Add new SOCID for Kalama. Add new SOCID for Kalama HHG. Change-Id: If4de2aa9007623b0d024a9b657acbd3a26047c2d --- Kbuild | 2 +- kalama-audio-hhg.dts | 10 ---------- kalama-audio.dts | 2 +- kalama-sg-audio-hhg.dts | 10 ++++++++++ kalama-audio-hhg.dtsi => kalama-sg-audio-hhg.dtsi | 4 ++++ 5 files changed, 16 insertions(+), 12 deletions(-) delete mode 100644 kalama-audio-hhg.dts create mode 100644 kalama-sg-audio-hhg.dts rename kalama-audio-hhg.dtsi => kalama-sg-audio-hhg.dtsi (96%) diff --git a/Kbuild b/Kbuild index 81d62683..7f3828a5 100644 --- a/Kbuild +++ b/Kbuild @@ -10,7 +10,7 @@ dtbo-y += kalama-audio.dtbo \ kalama-audio-rcm.dtbo \ kalama-audio-rumi.dtbo \ kalama-audio-hdk.dtbo \ - kalama-audio-hhg.dtbo + kalama-sg-audio-hhg.dtbo endif ifeq ($(CONFIG_ARCH_SA8155), y) diff --git a/kalama-audio-hhg.dts b/kalama-audio-hhg.dts deleted file mode 100644 index 3a8f6406..00000000 --- a/kalama-audio-hhg.dts +++ /dev/null @@ -1,10 +0,0 @@ -/dts-v1/; -/plugin/; - -#include "kalama-audio-hhg.dtsi" - / { - model = "Qualcomm Technologies, Inc. KalamaP HHG"; - compatible = "qcom,kalamap-hhg", "qcom,kalamap", "qcom,hhg"; - qcom,msm-id = <536 0x10000>, <536 0x20000>; - qcom,board-id = <0x1001f 0x1>; -}; \ No newline at end of file diff --git a/kalama-audio.dts b/kalama-audio.dts index 3fb4c66e..e246d1c7 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>, <519 0x20000>, <536 0x20000>; + qcom,msm-id = <519 0x10000>, <536 0x10000>, <519 0x20000>, <536 0x20000>, <600 0x20000>, <601 0x20000>; qcom,board-id = <0 0>; }; diff --git a/kalama-sg-audio-hhg.dts b/kalama-sg-audio-hhg.dts new file mode 100644 index 00000000..e853b117 --- /dev/null +++ b/kalama-sg-audio-hhg.dts @@ -0,0 +1,10 @@ +/dts-v1/; +/plugin/; + +#include "kalama-sg-audio-hhg.dtsi" + / { + model = "Qualcomm Technologies, Inc. Kalama SG HHG"; + compatible = "qcom,kalamap", "qcom,hhg"; + qcom,msm-id = <600 0x20000>, <601 0x20000>; + qcom,board-id = <0x1001f 0x1>; +}; \ No newline at end of file diff --git a/kalama-audio-hhg.dtsi b/kalama-sg-audio-hhg.dtsi similarity index 96% rename from kalama-audio-hhg.dtsi rename to kalama-sg-audio-hhg.dtsi index 9e5493a7..37196555 100644 --- a/kalama-audio-hhg.dtsi +++ b/kalama-sg-audio-hhg.dtsi @@ -23,6 +23,10 @@ }; }; +&wsa_macro { + qcom,wsa-bat-cfgs = <2>, <2>; +}; + &kalama_snd { qcom,model = "kalama-grd-snd-card";