Merge "Revert "audio: dts: add support for kalama v2 hardware."" into audio-kernel.lnx.5.15.r1-rel

This commit is contained in:
Linux Build Service Account
2022-07-07 12:11:19 -07:00
committed by Gerrit - the friendly Code Review server
10 changed files with 8 additions and 19 deletions

1
Kbuild
View File

@@ -1,7 +1,6 @@
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 \

View File

@@ -1,10 +0,0 @@
/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>, <519 0x20000>, <536 0x20000>;
qcom,msm-id = <519 0x10000>, <536 0x10000>;
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>, <519 0x20000>, <536 0x20000>;
qcom,msm-id = <519 0x10000>, <536 0x10000>;
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>, <519 0x20000>, <536 0x20000>;
qcom,msm-id = <519 0x10000>, <536 0x10000>;
qcom,board-id = <0x10008 0>;
};

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>, <519 0x20000>, <536 0x20000>;
qcom,msm-id = <519 0x10000>, <536 0x10000>;
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>, <519 0x20000>, <536 0x20000>;
qcom,msm-id = <519 0x10000>, <536 0x10000>;
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>, <519 0x20000>, <536 0x10000>, <536 0x20000>;
qcom,msm-id = <519 0x10000>;
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>, <519 0x20000>, <536 0x20000>;
qcom,msm-id = <519 0x10000>, <536 0x10000>;
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>, <519 0x20000>, <536 0x20000>;
qcom,msm-id = <519 0x10000>, <536 0x10000>;
qcom,board-id = <0 0>;
};