Merge a4b14bc6f1
on remote branch
Change-Id: Idd85801e796eabbb05a76d5e7605c6d108d424bf
This commit is contained in:
4
Kbuild
4
Kbuild
@@ -29,7 +29,9 @@ dtbo-y += sun-audio.dtbo \
|
|||||||
sun-audio-rcm.dtbo \
|
sun-audio-rcm.dtbo \
|
||||||
sun-audio-hamilton-rcm.dtbo \
|
sun-audio-hamilton-rcm.dtbo \
|
||||||
sun-audio-hamilton-cdp.dtbo \
|
sun-audio-hamilton-cdp.dtbo \
|
||||||
sun-audio-hamilton-mtp.dtbo
|
sun-audio-hamilton-mtp-v2.dtbo \
|
||||||
|
sun-audio-hamilton-mtp.dtbo \
|
||||||
|
sun-audio-hamilton-mtp-3.5mm.dtbo
|
||||||
endif
|
endif
|
||||||
|
|
||||||
always-y := $(dtb-y) $(dtbo-y)
|
always-y := $(dtb-y) $(dtbo-y)
|
||||||
|
22
sun-audio-hamilton-mtp-3.5mm.dts
Normal file
22
sun-audio-hamilton-mtp-3.5mm.dts
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
/plugin/;
|
||||||
|
|
||||||
|
/*This is MTP with Hamilton + V8 + 3.5mm support*/
|
||||||
|
|
||||||
|
#include "sun-audio-hamilton-mtp-3.5mm.dtsi"
|
||||||
|
|
||||||
|
/ {
|
||||||
|
model = "Qualcomm Technologies, Inc. Sun MTP Hamilton with 3.5mm";
|
||||||
|
compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp",
|
||||||
|
"qcom,mtp";
|
||||||
|
qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
|
||||||
|
<0x100026a 0x10000>, <0x100026a 0x20000>,
|
||||||
|
<0x100027f 0x10000>, <0x100027f 0x20000>;
|
||||||
|
qcom,board-id = <0x60108 0>;
|
||||||
|
};
|
||||||
|
|
16
sun-audio-hamilton-mtp-3.5mm.dtsi
Normal file
16
sun-audio-hamilton-mtp-3.5mm.dtsi
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
/plugin/;
|
||||||
|
|
||||||
|
/*This is MTP with Hamilton + V8 +3.5mm*/
|
||||||
|
#include "sun-audio-hamilton-mtp.dtsi"
|
||||||
|
|
||||||
|
&sun_snd {
|
||||||
|
qcom,msm-mbhc-usbc-audio-supported = <0>;
|
||||||
|
qcom,msm-mbhc-hphl-swh = <1>;
|
||||||
|
qcom,msm-mbhc-gnd-swh = <1>;
|
||||||
|
};
|
21
sun-audio-hamilton-mtp-v2.dts
Normal file
21
sun-audio-hamilton-mtp-v2.dts
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
/plugin/;
|
||||||
|
|
||||||
|
/*This is MTP v2 with Hamilton + V8/V6 wlan*/
|
||||||
|
|
||||||
|
#include "sun-audio-hamilton-qmp-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 0x20000>, <639 0x20000>,
|
||||||
|
<0x100026a 0x20000>,
|
||||||
|
<0x100027f 0x20000>;
|
||||||
|
qcom,board-id = <0x20008 0>, <0x50008 0>;
|
||||||
|
};
|
||||||
|
|
@@ -13,9 +13,9 @@
|
|||||||
/ {
|
/ {
|
||||||
model = "Qualcomm Technologies, Inc. Sun MTP ST54L NFC";
|
model = "Qualcomm Technologies, Inc. Sun MTP ST54L NFC";
|
||||||
compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp";
|
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,msm-id = <618 0x10000>, <639 0x10000>,
|
||||||
<0x100026a 0x10000>, <0x100026a 0x20000>,
|
<0x100026a 0x10000>,
|
||||||
<0x100027f 0x10000>, <0x100027f 0x20000>;
|
<0x100027f 0x10000>;
|
||||||
qcom,board-id = <0x20008 0>, <0x50008 0>;
|
qcom,board-id = <0x20008 0>, <0x50008 0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
17
sun-audio-hamilton-qmp-mtp.dtsi
Normal file
17
sun-audio-hamilton-qmp-mtp.dtsi
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
// SPDX-License-Identifier: BSD-3-Clause
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "sun-audio-mtp-qmp.dtsi"
|
||||||
|
|
||||||
|
&lpass_bt_swr {
|
||||||
|
status = "disabled";
|
||||||
|
};
|
||||||
|
|
||||||
|
&sun_snd {
|
||||||
|
qcom,model = "sun-mtp-wsa883x_qmp-snd-card";
|
||||||
|
qcom,msm_audio_ssr_devs = <&audio_gpr>, <&lpi_tlmm>,
|
||||||
|
<&lpass_cdc>;
|
||||||
|
};
|
||||||
|
|
@@ -103,6 +103,7 @@
|
|||||||
qcom,msm-mbhc-usbc-audio-supported = <1>;
|
qcom,msm-mbhc-usbc-audio-supported = <1>;
|
||||||
qcom,msm-mbhc-hphl-swh = <0>;
|
qcom,msm-mbhc-hphl-swh = <0>;
|
||||||
qcom,msm-mbhc-gnd-swh = <0>;
|
qcom,msm-mbhc-gnd-swh = <0>;
|
||||||
|
qcom,msm-mbhc-hs-mic-max-threshold-mv = <1670>;
|
||||||
qcom,wcd-disable-legacy-surge;
|
qcom,wcd-disable-legacy-surge;
|
||||||
wcd939x-i2c-handle = <&wcd_usbss>;
|
wcd939x-i2c-handle = <&wcd_usbss>;
|
||||||
};
|
};
|
||||||
|
Reference in New Issue
Block a user