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

Commit b4a9ebe1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: include audio overlay in sdm855 variants"

parents 8fac2a49 6cfdaf4e

arch/arm64/boot/dts/qcom/sdm855-cdp-overlay.dts

+0 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <dt-bindings/interrupt-controller/arm-gic.h>

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





#include "sdm855-cdp.dtsi"

#include "sdm855-cdp.dtsi"

#include "sdm855-audio-overlay.dtsi"





/ {

/ {

	model = "Qualcomm Technologies, Inc. SDM855 v1 CDP";

	model = "Qualcomm Technologies, Inc. SDM855 v1 CDP";

arch/arm64/boot/dts/qcom/sdm855-cdp.dtsi

+1 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <dt-bindings/input/input.h>

#include <dt-bindings/input/input.h>





#include "sdm855-pmic-overlay.dtsi"

#include "sdm855-pmic-overlay.dtsi"

#include "sdm855-audio-overlay.dtsi"





&qupv3_se12_2uart {

&qupv3_se12_2uart {

	status = "ok";

	status = "ok";

arch/arm64/boot/dts/qcom/sdm855-mtp-audio-overlay.dtsi

deleted100644 → 0
+0 −20
Original line number Original line Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



#include "sdm855-audio-overlay.dtsi"



&soc {

	sound-pahu {

		qcom,wsa-max-devs = <1>;

	};

};

arch/arm64/boot/dts/qcom/sdm855-mtp-overlay.dts

+0 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,6 @@ 
#include <dt-bindings/interrupt-controller/arm-gic.h>

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





#include "sdm855-mtp.dtsi"

#include "sdm855-mtp.dtsi"

#include "sdm855-mtp-audio-overlay.dtsi"





/ {

/ {

	model = "Qualcomm Technologies, Inc. SDM855 v1 MTP";

	model = "Qualcomm Technologies, Inc. SDM855 v1 MTP";

arch/arm64/boot/dts/qcom/sdm855-mtp.dtsi

+5 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <dt-bindings/input/input.h>

#include <dt-bindings/input/input.h>





#include "sdm855-pmic-overlay.dtsi"

#include "sdm855-pmic-overlay.dtsi"

#include "sdm855-audio-overlay.dtsi"





&qupv3_se12_2uart {

&qupv3_se12_2uart {

	status = "ok";

	status = "ok";
@@ -65,6 +66,10 @@ 
			linux,can-disable;

			linux,can-disable;

		};

		};

	};

	};



	sound-pahu {

		qcom,wsa-max-devs = <1>;

	};

};

};





&ufsphy_mem {

&ufsphy_mem {