Merge 5f5833c6eb on remote branch

Change-Id: I2e277be7f2da70ffca92701c06d71dbbcfe09d2a
This commit is contained in:
Linux Build Service Account
2022-07-07 16:10:11 -07:00
11 changed files with 31 additions and 11 deletions

1
Kbuild
View File

@@ -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 \

10
kalama-audio-cdp-nfc.dts Normal file
View File

@@ -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>;
};

View File

@@ -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>;
};

View File

@@ -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>;
};

View File

@@ -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>;
};

View File

@@ -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 = <TX_CORE_CLK>;
qcom,use-clk-id = <TX_CORE_CLK>;
qcom,use-clk-id = <VA_CORE_CLK>;
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 = <AUDIO_LPASS_MCLK>;
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 = <AUDIO_LPASS_MCLK_2>;

View File

@@ -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>;
};

View File

@@ -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>;
};

View File

@@ -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>;
};

View File

@@ -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>;
};

View File

@@ -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>;
};