Merge aa5f297a43
on remote branch
Change-Id: Idd9727f737e5d0fcd6ff31fe2f0f9c7cf63ab791
This commit is contained in:
4
Kbuild
4
Kbuild
@@ -23,7 +23,9 @@ dtbo-y += sun-audio.dtbo \
|
||||
sun-audio-qrd.dtbo \
|
||||
sun-audio-qrd-sku2.dtbo \
|
||||
sun-audio-atp.dtbo \
|
||||
sun-audio-rcm.dtbo
|
||||
sun-audio-rcm.dtbo \
|
||||
sun-audio-hamilton-cdp.dtbo \
|
||||
sun-audio-hamilton-mtp.dtbo
|
||||
endif
|
||||
|
||||
always-y := $(dtb-y) $(dtbo-y)
|
||||
|
@@ -10,6 +10,6 @@
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Sun ATP";
|
||||
compatible = "qcom,sun-atp", "qcom,sun", "qcom,atp";
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>;
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
|
||||
qcom,board-id = <0x10021 0>;
|
||||
};
|
||||
|
@@ -11,6 +11,6 @@
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Sun CDP ST54L NFC";
|
||||
compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp";
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>;
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
|
||||
qcom,board-id = <0x50001 0>;
|
||||
};
|
||||
};
|
||||
|
@@ -10,6 +10,6 @@
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Sun CDP";
|
||||
compatible = "qcom,sun-cdp", "qcom,sun", "qcom,cdp";
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>;
|
||||
qcom,board-id = <1 0>;
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
|
||||
qcom,board-id = <1 0>, <0x50001 0>;
|
||||
};
|
||||
|
19
sun-audio-hamilton-cdp.dts
Normal file
19
sun-audio-hamilton-cdp.dts
Normal file
@@ -0,0 +1,19 @@
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
/*
|
||||
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
/plugin/;
|
||||
|
||||
/*This is CDP with Hamilton wlan*/
|
||||
|
||||
#include "sun-audio-hamilton-cdp.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Sun CDP";
|
||||
compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp";
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
|
||||
qcom,board-id = <0x20001 0>, <0x60001 0>;
|
||||
};
|
||||
|
@@ -3,4 +3,8 @@
|
||||
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
#include "sun-audio-overlay.dtsi"
|
||||
/*This is CDP with Hamilton wlan*/
|
||||
#include "sun-audio-cdp.dtsi"
|
||||
&lpass_bt_swr {
|
||||
status = "disabled";
|
||||
};
|
19
sun-audio-hamilton-mtp.dts
Normal file
19
sun-audio-hamilton-mtp.dts
Normal file
@@ -0,0 +1,19 @@
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
/*
|
||||
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
/plugin/;
|
||||
|
||||
/*This is MTP with Hamilton + V8/V6 wlan*/
|
||||
|
||||
#include "sun-audio-hamilton-mtp.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Sun MTP ST54L NFC";
|
||||
compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp";
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
|
||||
qcom,board-id = <0x20008 0>, <0x50008 0>;
|
||||
};
|
||||
|
15
sun-audio-hamilton-mtp.dtsi
Normal file
15
sun-audio-hamilton-mtp.dtsi
Normal file
@@ -0,0 +1,15 @@
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
/*
|
||||
* Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||
*/
|
||||
|
||||
#include "sun-audio-mtp.dtsi"
|
||||
|
||||
&lpass_bt_swr {
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
&sun_snd {
|
||||
qcom,model = "sun-mtp-wsa883x-snd-card";
|
||||
};
|
||||
|
@@ -6,11 +6,13 @@
|
||||
/dts-v1/;
|
||||
/plugin/;
|
||||
|
||||
#include "sun-audio-mtp-nfc.dtsi"
|
||||
/*This is MTP with Ganges wlan w/ v8 Power Grid */
|
||||
|
||||
#include "sun-audio-mtp.dtsi"
|
||||
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Sun MTP ST54L NFC";
|
||||
compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp";
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>;
|
||||
qcom,board-id = <0x50008 0>;
|
||||
};
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
|
||||
qcom,board-id = <0x30008 0>, <0x40008 0>;
|
||||
};
|
||||
|
@@ -10,6 +10,6 @@
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Sun MTP";
|
||||
compatible = "qcom,sun-mtp", "qcom,sun", "qcom,mtp";
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>;
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
|
||||
qcom,board-id = <8 0>;
|
||||
};
|
||||
|
@@ -396,7 +396,7 @@
|
||||
qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>, <1>, <1>;
|
||||
qcom,mi2s-tdm-is-hw-vote-needed = <1>, <0>, <1>, <0>, <1>, <0>, <0>;
|
||||
qcom,wcn-bt = <1>;
|
||||
qcom,ext-disp-audio-rx = <0>;
|
||||
qcom,ext-disp-audio-rx = <1>;
|
||||
qcom,tdm-max-slots = <8>;
|
||||
qcom,tdm-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;
|
||||
qcom,mi2s-clk-attribute = <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>, <0x1>;
|
||||
|
@@ -10,6 +10,6 @@
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Sun QRD";
|
||||
compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd";
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>;
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
|
||||
qcom,board-id = <0x2000B 0>;
|
||||
};
|
||||
|
@@ -10,6 +10,6 @@
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Sun QRD";
|
||||
compatible = "qcom,sun-qrd", "qcom,sun", "qcom,qrd";
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>;
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
|
||||
qcom,board-id = <0x1000B 0>, <0x3000B 0>;
|
||||
};
|
||||
|
@@ -10,6 +10,6 @@
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Sun RCM";
|
||||
compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp-rcm", "qcom,sunp", "qcom,rcm";
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>;
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
|
||||
qcom,board-id = <0x15 0>;
|
||||
};
|
||||
|
@@ -10,6 +10,6 @@
|
||||
/ {
|
||||
model = "Qualcomm Technologies, Inc. Sun RUMI";
|
||||
compatible = "qcom,sun-rumi", "qcom,sun", "qcom,rumi";
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>;
|
||||
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
|
||||
qcom,board-id = <15 0>;
|
||||
};
|
||||
|
Reference in New Issue
Block a user