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

Commit 86f712d6 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: enable audio nodes for titanium on apq"

parents 4cd6db92 f7809086

arch/arm/boot/dts/qcom/msmtitanium-cdp.dts

+1 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, 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
@@ -15,7 +15,6 @@ 


#include "msmtitanium.dtsi"

#include "msmtitanium-cdp.dtsi"

#include "msmtitanium-audio-cdp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSMTITANIUM CDP";

arch/arm/boot/dts/qcom/msmtitanium-cdp.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 */



#include "msmtitanium-pinctrl.dtsi"

#include "msmtitanium-audio-cdp.dtsi"

#include "msmtitanium-camera-sensor-cdp.dtsi"



&spi_3 { /* BLSP1 QUP3 */

arch/arm/boot/dts/qcom/msmtitanium-ext-codec-mtp.dts

+28 −0
Original line number Diff line number Diff line
@@ -22,6 +22,34 @@ 
	qcom,board-id= <8 1>;

};



&int_codec {

	status = "disabled";

};



&pmtitanium_diangu_dig {

	status = "disabled";

};



&pmtitanium_diangu_analog {

	status = "disabled";

};



&wsa881x_i2c_e {

	status = "disabled";

};



&wsa881x_i2c_44 {

	status = "disabled";

};



&wsa881x_i2c_f {

	status = "disabled";

};



&wsa881x_i2c_45 {

	status = "disabled";

};



&slim_msm {

	status = "okay";

};

arch/arm/boot/dts/qcom/msmtitanium-ext-codec-rcm.dts

+28 −0
Original line number Diff line number Diff line
@@ -22,6 +22,34 @@ 
	qcom,board-id= <21 1>;

};



&int_codec {

	status = "disabled";

};



&pmtitanium_diangu_dig {

	status = "disabled";

};



&pmtitanium_diangu_analog {

	status = "disabled";

};



&wsa881x_i2c_e {

	status = "disabled";

};



&wsa881x_i2c_44 {

	status = "disabled";

};



&wsa881x_i2c_f {

	status = "disabled";

};



&wsa881x_i2c_45 {

	status = "disabled";

};



&slim_msm {

	status = "okay";

};

arch/arm/boot/dts/qcom/msmtitanium-mtp.dts

+1 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, 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
@@ -15,7 +15,6 @@ 


#include "msmtitanium.dtsi"

#include "msmtitanium-mtp.dtsi"

#include "msmtitanium-audio-mtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSMTITANIUM MTP";