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

Commit a7ab2290 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: add support for external codec on 8909"

parents 131293b1 e6a13a41

arch/arm/boot/dts/qcom/apq8009-512mb-cdp-wcd9326-refboard.dts

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

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

 * Copyright (c) 2016-2017, 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
@@ -16,6 +16,7 @@ 
#include "msm8909-cdp.dtsi"

#include "msm8909-pm8916.dtsi"

#include "msm8909-pm8916-cdp.dtsi"

#include "apq8009-audio-external_codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8009 WCD9326 512MB \
@@ -24,3 +25,31 @@ 
	qcom,msm-id = <265 2>;

	qcom,board-id= <1 0x103>;

};



&soc {

	sound-9335 {

		qcom,audio-routing =

			"AIF4 VI", "MCLK",

			"RX_BIAS", "MCLK",

			"MADINPUT", "MCLK",

			"AMIC2", "MIC BIAS2",

			"MIC BIAS2", "Headset Mic",

			"DMIC0", "MIC BIAS1",

			"MIC BIAS1", "Digital Mic0",

			"DMIC1", "MIC BIAS1",

			"MIC BIAS1", "Digital Mic1",

			"DMIC2", "MIC BIAS3",

			"MIC BIAS3", "Digital Mic2",

			"DMIC3", "MIC BIAS3",

			"MIC BIAS3", "Digital Mic3",

			"SpkrLeft IN", "SPK1 OUT",

			"SpkrRight IN", "SPK2 OUT";

	};



	i2c@78b8000 {

		wcd9xxx_codec@d {

			qcom,cdc-reset-gpio = <&msm_gpio 27 0>;

		};

	};

};

arch/arm/boot/dts/qcom/apq8009-512mb-mtp-wcd9326-refboard.dts

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

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

 * Copyright (c) 2016-2017, 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
@@ -26,6 +26,10 @@ 
	qcom,board-id= <8 0x108>;

};



&audio_codec_mtp {

	status = "disabled";

};



&soc {

	sound-9335 {

		qcom,audio-routing =

arch/arm/boot/dts/qcom/apq8009-512mb-rcm-wcd9326-refboard.dts

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

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

 * Copyright (c) 2016-2017, 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
@@ -16,6 +16,7 @@ 
#include "msm8909-cdp.dtsi"

#include "msm8909-pm8916.dtsi"

#include "msm8909-pm8916-cdp.dtsi"

#include "apq8009-audio-external_codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8009 WCD9326 512MB \
@@ -24,3 +25,31 @@ 
	qcom,msm-id = <265 2>;

	qcom,board-id= <21 0x103>;

};



&soc {

	sound-9335 {

		qcom,audio-routing =

			"AIF4 VI", "MCLK",

			"RX_BIAS", "MCLK",

			"MADINPUT", "MCLK",

			"AMIC2", "MIC BIAS2",

			"MIC BIAS2", "Headset Mic",

			"DMIC0", "MIC BIAS1",

			"MIC BIAS1", "Digital Mic0",

			"DMIC1", "MIC BIAS1",

			"MIC BIAS1", "Digital Mic1",

			"DMIC2", "MIC BIAS3",

			"MIC BIAS3", "Digital Mic2",

			"DMIC3", "MIC BIAS3",

			"MIC BIAS3", "Digital Mic3",

			"SpkrLeft IN", "SPK1 OUT",

			"SpkrRight IN", "SPK2 OUT";

	};



	i2c@78b8000 {

		wcd9xxx_codec@d {

			qcom,cdc-reset-gpio = <&msm_gpio 27 0>;

		};

	};

};

arch/arm/boot/dts/qcom/apq8009-audio-external_codec.dtsi

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

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

 * Copyright (c) 2015-2017, 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
@@ -11,10 +11,6 @@ 
 * GNU General Public License for more details.

 */



&audio_codec_mtp {

	status = "disabled";

};



&pm8916_tombak_dig {

	status = "disabled";

};

arch/arm/boot/dts/qcom/apq8009-cdp-wcd9326-refboard.dts

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

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

 * Copyright (c) 2016-2017, 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
@@ -16,6 +16,7 @@ 
#include "msm8909-cdp.dtsi"

#include "msm8909-pm8916.dtsi"

#include "msm8909-pm8916-cdp.dtsi"

#include "apq8009-audio-external_codec.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. APQ8009 WCD9326 1GB CDP Ref Board";
@@ -23,3 +24,31 @@ 
	qcom,msm-id = <265 2>;

	qcom,board-id= <1 0x3>;

};



&soc {

	sound-9335 {

		qcom,audio-routing =

			"AIF4 VI", "MCLK",

			"RX_BIAS", "MCLK",

			"MADINPUT", "MCLK",

			"AMIC2", "MIC BIAS2",

			"MIC BIAS2", "Headset Mic",

			"DMIC0", "MIC BIAS1",

			"MIC BIAS1", "Digital Mic0",

			"DMIC1", "MIC BIAS1",

			"MIC BIAS1", "Digital Mic1",

			"DMIC2", "MIC BIAS3",

			"MIC BIAS3", "Digital Mic2",

			"DMIC3", "MIC BIAS3",

			"MIC BIAS3", "Digital Mic3",

			"SpkrLeft IN", "SPK1 OUT",

			"SpkrRight IN", "SPK2 OUT";

	};



	i2c@78b8000 {

		wcd9xxx_codec@d {

			qcom,cdc-reset-gpio = <&msm_gpio 27 0>;

		};

	};

};