Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c44a5a9 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add changes to support audio on USBC for scuba"

parents 3d3c5841 f54b7bb0

qcom/Makefile

+6 −3
Original line number Diff line number Diff line
@@ -138,14 +138,17 @@ ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y) 
        dtbo-$(CONFIG_ARCH_SCUBA) += \

		scuba-rumi-overlay.dtbo \

		scuba-idp-overlay.dtbo \

		scuba-idp-usbc-overlay.dtbo \

		scuba-qrd-overlay.dtbo



scuba-rumi-overlay.dtbo-base := scuba.dtb

scuba-idp-overlay.dtbo-base := scuba.dtb

scuba-qrd-overlay.dtbo-base := scuba.dtb

scuba-idp-usbc-overlay.dtbo-base := scuba.dtb

else

dtb-$(CONFIG_ARCH_SCUBA) += scuba-rumi.dtb \

	scuba-idp.dtb \

	scuba-idp-usbc.dtb \

	scuba-qrd.dtb

endif

qcom/scuba-idp-usbc-overlay.dts

0 → 100644
+13 −0
Original line number Diff line number Diff line 
/dts-v1/;

/plugin/;



#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "scuba-idp.dtsi"

#include "scuba-idp-usbc.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Scuba IDP USBC Audio";

	compatible = "qcom,scuba-idp", "qcom,scuba", "qcom,idp";

	qcom,msm-id = <441 0x10000>;

	qcom,board-id = <34 1>;

};

qcom/scuba-idp-usbc.dts

0 → 100644
+11 −0
Original line number Diff line number Diff line 
/dts-v1/;



#include "scuba.dtsi"

#include "scuba-idp.dtsi"

#include "scuba-idp-usbc.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. Scuba IDP USBC Audio";

	compatible = "qcom,scuba-idp", "qcom,scuba", "qcom,idp";

	qcom,board-id = <34 1>;

};

qcom/scuba-idp-usbc.dtsi

0 → 100644
+5 −0
Original line number Diff line number Diff line 
&scuba_snd {

	qcom,msm-mbhc-usbc-audio-supported = <1>;

	qcom,msm-mbhc-hphl-swh = <1>;

	qcom,msm-mbhc-gnd-swh = <1>;

};