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

Commit 7ead457a authored by Santosh Mardi's avatar Santosh Mardi Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dts: msm: add external codec support on 8937 CDP 



External codec needs to be supported on 8937 CDP along with
internal codec. Add the sound node and slim_msm nodes to
support WCD9335/9326 on CDP.

Change-Id: I99f5a3111e2ca75a4f4ffe5cf5f9f0c4de9b4602
Signed-off-by: default avatarSantosh Mardi <gsantosh@codeaurora.org>
parent 2be5ff68

arch/arm/boot/dts/qcom/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ dtb-$(CONFIG_ARCH_MDMCALIFORNIUM) += mdmcalifornium-sim.dtb \ 
dtb-$(CONFIG_ARCH_MSM8937) += msm8937-rumi.dtb \

	msm8937-pmi8950-cdp.dtb \

	msm8937-pmi8937-cdp.dtb \

	msm8937-pmi8950-ext-codec-cdp.dtb \

	msm8937-pmi8950-mtp.dtb \

	msm8937-pmi8937-mtp.dtb \

	msm8937-pmi8950-rcm.dtb \

arch/arm/boot/dts/qcom/msm-audio.dtsi

+0 −11
Original line number Diff line number Diff line
@@ -550,17 +550,6 @@ 
			compatible = "qcom,wsa881x-i2c-codec";

			reg = <0x45>;

		};



		wcd9xxx_intc: wcd9xxx-irq {

			compatible = "qcom,wcd9xxx-irq";

			status = "disabled";

			interrupt-controller;

			#interrupt-cells = <1>;

			interrupt-parent = <&tlmm>;

			interrupts = <73 0>;

			inteerupt-names = "cdc-int";

			qcom,gpio-connect = <&tlmm 73 0>;

		};

	};

};

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

+0 −103
Original line number Diff line number Diff line
@@ -23,14 +23,6 @@ 
	qcom,follow-otst2-rb-disabled;

};



&ext_codec {

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

	qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_212>,

			<&wsa881x_213>, <&wsa881x_214>;

	qcom,wsa-aux-dev-prefix = "SpkrRight", "SpkrLeft",

				"SpkrRight", "SpkrLeft";

};



&pm8937_gpios {

	gpio@c000 {

		status = "ok";
@@ -121,101 +113,6 @@ 
		qcom,node_has_rpm_clock;

		#clock-cells = <1>;

	};



	slim_msm: slim@c140000{

		msm_dai_slim {

			compatible = "qcom,msm-dai-slim";

			status = "disabled";

			elemental-addr = [ff ff ff fe 17 02];

		};



		tasha_codec {

			compatible = "qcom,tasha-slim-pgd";

			status = "disabled";

			elemental-addr = [00 01 A0 01 17 02];



			interrupt-parent = <&wcd9xxx_intc>;

			interrupts = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16

				      17 18 19 20 21 22 23 24 25 26 27 28 29

				      30>;



			qcom,cdc-reset-gpio = <&tlmm 68 0>;



			cdc-vdd-buck-supply = <&eldo2_pm8937>;

			qcom,cdc-vdd-buck-voltage = <1800000 1800000>;

			qcom,cdc-vdd-buck-current = <650000>;



			cdc-buck-sido-supply = <&eldo2_pm8937>;

			qcom,cdc-buck-sido-voltage = <1800000 1800000>;

			qcom,cdc-buck-sido-current = <250000>;



			cdc-vdd-tx-h-supply = <&pm8937_l5>;

			qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;

			qcom,cdc-vdd-tx-h-current = <25000>;



			cdc-vdd-rx-h-supply = <&pm8937_l5>;

			qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;

			qcom,cdc-vdd-rx-h-current = <25000>;



			cdc-vdd-px-supply = <&pm8937_l5>;

			qcom,cdc-vdd-px-voltage = <1800000 1800000>;

			qcom,cdc-vdd-px-current = <10000>;



			cdc-vdd-mic-bias-supply = <&pm8937_l13>;

			qcom,cdc-vdd-mic-bias-voltage = <3075000 3075000>;

			qcom,cdc-vdd-mic-bias-current = <15000>;



			qcom,cdc-static-supplies =

				"cdc-vdd-buck",

				"cdc-buck-sido",

				"cdc-vdd-tx-h",

				"cdc-vdd-rx-h",

				"cdc-vdd-px";



			qcom,cdc-micbias1-mv = <1800>;

			qcom,cdc-micbias2-mv = <1800>;

			qcom,cdc-micbias3-mv = <1800>;

			qcom,cdc-micbias4-mv = <1800>;



			qcom,cdc-mclk-clk-rate = <9600000>;

			qcom,cdc-slim-ifd = "tasha-slim-ifd";

			qcom,cdc-slim-ifd-elemental-addr = [00 00 A0 01 17 02];

			qcom,cdc-dmic-sample-rate = <4800000>;



			clock-names = "wcd_clk";

			clocks = <&clock_audio clk_audio_pmi_clk>;



			swr_master {

				compatible = "qcom,swr-wcd";

				#address-cells = <2>;

				#size-cells = <0>;



				wsa881x_211: wsa881x@20170211 {

					compatible = "qcom,wsa881x";

					reg = <0x00 0x20170211>;

					qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

				};



				wsa881x_212: wsa881x@20170212 {

					compatible = "qcom,wsa881x";

					reg = <0x00 0x20170212>;

					qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

				};



				wsa881x_213: wsa881x@20170213 {

					compatible = "qcom,wsa881x";

					reg = <0x00 0x20170213>;

					qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

				};



				wsa881x_214: wsa881x@20170214 {

					compatible = "qcom,wsa881x";

					reg = <0x00 0x20170214>;

					qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

				};

			};

		};

	};

};



&int_codec {

arch/arm/boot/dts/qcom/msm8937-pmi8950-ext-codec-cdp.dts

0 → 100644
+158 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, 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.

 */



/dts-v1/;



#include "msm8937.dtsi"

#include "msm8937-pmi8950-cdp.dtsi"

#include "msm8937-wsa881x.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM8937 External Audio Codec CDP";

	compatible = "qcom,msm8937-cdp", "qcom,msm8937", "qcom,cdp";

	qcom,board-id= <1 1>;

	qcom,pmic-id = <0x10019 0x010011 0x0 0x0>;

};



&int_codec {

	status = "disabled";

};



&pm8937_cajon_dig {

	status = "disabled";

};



&pm8937_cajon_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";

};



&ext_codec {

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

	qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_212>,

			<&wsa881x_213>, <&wsa881x_214>;

	qcom,wsa-aux-dev-prefix = "SpkrRight", "SpkrLeft",

				"SpkrRight", "SpkrLeft";

	status = "okay";

};



&soc {

	wcd9xxx_intc: wcd9xxx-irq {

		compatible = "qcom,wcd9xxx-irq";

		interrupt-controller;

		#interrupt-cells = <1>;

		interrupt-parent = <&tlmm>;

		interrupts = <73 0>;

		interrupt-names = "cdc-int";

		qcom,gpio-connect = <&tlmm 73 0>;

	};



	clock_audio: audio_ext_clk {

		compatible = "qcom,audio-ref-clk";

		qcom,audio-ref-clk-gpio = <&pm8937_gpios 1 0>;

		clock-names = "osr_clk";

		clocks = <&clock_gcc clk_div_clk2>;

		qcom,node_has_rpm_clock;

		#clock-cells = <1>;

	};

};



&pm8937_gpios {

	gpio@c000 {

		qcom,vin-sel = <0>;

	};

};



&slim_msm {

	msm_dai_slim {

		compatible = "qcom,msm-dai-slim";

		status = "okay";

		elemental-addr = [ff ff ff fe 17 02];

	};



	tasha_codec {

		compatible = "qcom,tasha-slim-pgd";

		status = "okay";

		elemental-addr = [00 01 A0 01 17 02];



		interrupt-parent = <&wcd9xxx_intc>;

		interrupts = <0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16

			17 18 19 20 21 22 23 24 25 26 27 28 29

			30>;



		qcom,cdc-reset-gpio = <&tlmm 68 0>;



		clock-names = "wcd_clk";

		clocks = <&clock_audio clk_audio_pmi_clk>;



		cdc-vdd-buck-supply = <&eldo2_pm8937>;

		qcom,cdc-vdd-buck-voltage = <1800000 1800000>;

		qcom,cdc-vdd-buck-current = <650000>;



		cdc-buck-sido-supply = <&eldo2_pm8937>;

		qcom,cdc-buck-sido-voltage = <1800000 1800000>;

		qcom,cdc-buck-sido-current = <250000>;



		cdc-vdd-tx-h-supply = <&pm8937_l5>;

		qcom,cdc-vdd-tx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-tx-h-current = <25000>;



		cdc-vdd-rx-h-supply = <&pm8937_l5>;

		qcom,cdc-vdd-rx-h-voltage = <1800000 1800000>;

		qcom,cdc-vdd-rx-h-current = <25000>;



		cdc-vdd-px-supply = <&pm8937_l5>;

		qcom,cdc-vdd-px-voltage = <1800000 1800000>;

		qcom,cdc-vdd-px-current = <10000>;



		cdc-vdd-mic-bias-supply = <&pm8937_l13>;

		qcom,cdc-vdd-mic-bias-voltage = <3075000 3075000>;

		qcom,cdc-vdd-mic-bias-current = <15000>;



		qcom,cdc-static-supplies =

			"cdc-vdd-buck",

			"cdc-buck-sido",

			"cdc-vdd-tx-h",

			"cdc-vdd-rx-h",

			"cdc-vdd-px";



		qcom,cdc-micbias1-mv = <1800>;

		qcom,cdc-micbias2-mv = <1800>;

		qcom,cdc-micbias3-mv = <1800>;

		qcom,cdc-micbias4-mv = <1800>;



		qcom,cdc-mclk-clk-rate = <9600000>;

		qcom,cdc-slim-ifd = "tasha-slim-ifd";

		qcom,cdc-slim-ifd-elemental-addr = [00 00 A0 01 17 02];

		qcom,cdc-dmic-sample-rate = <4800000>;

	};

};

arch/arm/boot/dts/qcom/msm8937-wsa881x.dtsi

0 → 100644
+46 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, 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.

 */



&slim_msm {

	tasha_codec {

		swr_master {

			compatible = "qcom,swr-wcd";

			#address-cells = <2>;

			#size-cells = <0>;



			wsa881x_211: wsa881x@20170211 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170211>;

				qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

			};



			wsa881x_212: wsa881x@20170212 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170212>;

				qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

			};



			wsa881x_213: wsa881x@20170213 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170213>;

				qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

			};



			wsa881x_214: wsa881x@20170214 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170214>;

				qcom,spkr-sd-n-gpio = <&tlmm 96 0>;

			};

		};

	};

};