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

Commit 6b20799c authored by Venkata Narendra Kumar Gutta's avatar Venkata Narendra Kumar Gutta Committed by Gerrit - the friendly Code Review server
Browse files

ARM: dt: msm: add more wsa881x devices for MSM8952 targets 



MSM8952 based targets supports different versions of wsa881x
chipset. Add a list of all additional devices which might
be supported for the target. Create a separate DTSI file
to define the list of different wsa881x devices supported.

Change-Id: I6ef1bc526271fa4ae0ec0b22acb6168cfe29a2ae
Signed-off-by: default avatarVenkata Narendra Kumar Gutta <vgutta@codeaurora.org>
parent ce6a0f0a

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

+4 −4
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ 
		qcom,msm-vdd-wsa-switch-current = <5000>;

	};

	i2c@7af8000 {

		wsa881x-i2c-codec@e {

		wsa881x_i2c_e: wsa881x-i2c-codec@e {

			compatible = "qcom,wsa881x-i2c-codec";

			reg = <0x0e>;

			qcom,msm-gpios = "wsa_clk",
@@ -227,11 +227,11 @@ 
			pinctrl-6 = <&wsa_clk_off &wsa_reset_on &wsa_vi_on>;

			pinctrl-7 = <&wsa_clk_on &wsa_reset_on &wsa_vi_on>;

		};

		wsa881x-i2c-codec@44 {

		wsa881x_i2c_44: wsa881x-i2c-codec@44 {

			compatible = "qcom,wsa881x-i2c-codec";

			reg = <0x44>;

		};

		wsa881x-i2c-codec@f {

		wsa881x_i2c_f: wsa881x-i2c-codec@f {

			compatible = "qcom,wsa881x-i2c-codec";

			reg = <0x0f>;

			qcom,msm-gpios = "wsa_clk",
@@ -262,7 +262,7 @@ 
			pinctrl-6 = <&wsa_clk_off &wsa_reset_on &wsa_vi_on>;

			pinctrl-7 = <&wsa_clk_on &wsa_reset_on &wsa_vi_on>;

		};

		wsa881x-i2c-codec@45 {

		wsa881x_i2c_45: wsa881x-i2c-codec@45 {

			compatible = "qcom,wsa881x-i2c-codec";

			reg = <0x45>;

		};

arch/arm/boot/dts/qcom/msm8952-ext-codec-cdp.dts

+31 −18
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
/dts-v1/;



#include "msm8952-cdp.dtsi"

#include "msm8952-wsa881x.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8952 External Audio Codec CDP";
@@ -25,6 +26,30 @@ 
	status = "disabled";

};



&pm8950_cajon_dig {

	status = "disabled";

};



&pm8950_cajon_analog {

	status = "disabled";

};



&wsa881x_i2c_e {

	status = "disabled";

};



&wsa881x_i2c_44 {

	status = "disabled";

};



&wsa881x_i2c_f {

	status = "disabled";

};



&wsa881x_i2c_45 {

	status = "disabled";

};



&soc {

	wcd9xxx_intc: wcd9xxx-irq {

		compatible = "qcom,wcd9xxx-irq";
@@ -33,6 +58,7 @@ 
		interrupt-parent = <&msm_gpio>;

		interrupts = <73 0>;

		interrupt-names = "cdc-int";

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

	};



	ext_codec: sound-9335 {
@@ -130,8 +156,11 @@ 
				"msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293";

		asoc-codec = <&stub_codec>;

		asoc-codec-names = "msm-stub-codec.1";

		asoc-wsa-codec-names = "wsa881x.20170212", "wsa881x.20170211";

		asoc-wsa-codec-prefixes = "SpkrLeft", "SpkrRight";

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

	};



	sound-9330 {
@@ -366,21 +395,5 @@ 


		clock-names = "wcd_clk";

		clocks = <&clock_audio clk_audio_pmi_clk>;



		swr_master {

			compatible = "qcom,swr-wcd";

			#address-cells = <2>;

			#size-cells = <0>;

			wsa881x@20170212 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170212>;

				qcom,spkr-sd-n-gpio = <&msm_gpio 95 0>;

			};

			wsa881x@20170211 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170211>;

				qcom,spkr-sd-n-gpio = <&msm_gpio 94 0>;

			};

}		;

	};

};

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

0 → 100644
+47 −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 = <&msm_gpio 94 0>;

			};



			wsa881x_212: wsa881x@20170212 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170212>;

				qcom,spkr-sd-n-gpio = <&msm_gpio 95 0>;

			};



			wsa881x_213: wsa881x@20170213 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170213>;

				qcom,spkr-sd-n-gpio = <&msm_gpio 94 0>;

			};



			wsa881x_214: wsa881x@20170214 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170214>;

				qcom,spkr-sd-n-gpio = <&msm_gpio 95 0>;

			};

		};

	};

};