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

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

Merge "ARM: dt: msm: add more wsa881x devices for MSM8996 targets"

parents 0c01541c a86ea5c5

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

+6 −23
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include "msm8996-pinctrl.dtsi"

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

#include "msm8996-wsa881x.dtsi"



/ {

	bluetooth: bt_qca6174 {
@@ -462,28 +463,6 @@ 
	qcom,panel-roi-alignment = <4 4 2 2 20 20>;

};



&slim_msm {

	tasha_codec {

		swr_master {

			compatible = "qcom,swr-wcd";

			#address-cells = <2>;

			#size-cells = <0>;



			wsa881x_1: wsa881x@20170212 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170212>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 3 0>;

			};



			wsa881x_2: wsa881x@20170211 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170211>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 2 0>;

			};

		};

	};

};



&pm8994_gpios {

	gpio@c700 { /* GPIO 8 - WLAN_EN */

		qcom,mode = <1>;		/* Digital output*/
@@ -643,7 +622,11 @@ 
		asoc-codec = <&stub_codec>, <&hdmi_audio>;

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

		qcom,us-euro-gpios = <&pm8994_mpps 2 0>;

		qcom,aux-codec = <&wsa881x_1>, <&wsa881x_2>;

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

	};

};

arch/arm/boot/dts/qcom/msm8996-fluid.dtsi

+4 −17
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 




#include "msm8996-pinctrl.dtsi"

#include "msm8996-wsa881x.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. MSM 8996 FLUID";
@@ -447,7 +448,9 @@ 
		asoc-codec = <&stub_codec>, <&hdmi_audio>;

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

				"msm-hdmi-audio-codec-rx";

		qcom,aux-codec = <&wsa881x_1>;

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

		qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_213>;

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

	};



};
@@ -620,19 +623,3 @@ 
		status = "okay";

	};

};
 


&slim_msm {

	tasha_codec {

		swr_master {

			compatible = "qcom,swr-wcd";

			#address-cells = <2>;

			#size-cells = <0>;



			wsa881x_1: wsa881x@20170211 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170211>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 2 0>;

			};

		};

	};

};

arch/arm/boot/dts/qcom/msm8996-liquid.dtsi

+6 −23
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include "msm8996-pinctrl.dtsi"

#include "msm8996-camera-sensor-liquid.dtsi"

#include "msm8996-wsa881x.dtsi"



/ {

	bluetooth: bt_qca6174 {
@@ -485,7 +486,11 @@ 
		qcom,hdmi-audio-rx;

		asoc-codec = <&stub_codec>, <&hdmi_audio>;

		asoc-codec-names = "msm-stub-codec.1", "msm-hdmi-audio-codec-rx";

		qcom,aux-codec = <&wsa881x_1>, <&wsa881x_2>;

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

	};



	usb_detect {
@@ -656,25 +661,3 @@ 
		};

	};

};
 


&slim_msm {

	tasha_codec {

		swr_master {

			compatible = "qcom,swr-wcd";

			#address-cells = <2>;

			#size-cells = <0>;



			wsa881x_1: wsa881x@21170214 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x21170214>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 3 0>;

			};



			wsa881x_2: wsa881x@21170213 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x21170213>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 2 0>;

			};

		};

	};

};

arch/arm/boot/dts/qcom/msm8996-mtp.dtsi

+6 −23
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include "msm8996-pinctrl.dtsi"

#include "msm8996-camera-sensor-mtp.dtsi"

#include "msm8996-wsa881x.dtsi"



/ {

	bluetooth: bt_qca6174 {
@@ -688,7 +689,11 @@ 
		qcom,hph-en1-gpio = <&pmi8994_gpios 10 0>;

		qcom,hph-en0-gpio = <&pm8994_gpios 13 0>;

		qcom,us-euro-gpios = <&pm8994_mpps 2 0>;

		qcom,aux-codec = <&wsa881x_1>, <&wsa881x_2>;

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

	};

};
@@ -869,25 +874,3 @@ 
		clock-names = "ref_clk";

	};

};
 


&slim_msm {

	tasha_codec {

		swr_master {

			compatible = "qcom,swr-wcd";

			#address-cells = <2>;

			#size-cells = <0>;



			wsa881x_1: wsa881x@20170212 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170212>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 3 0>;

			};



			wsa881x_2: wsa881x@20170211 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170211>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 2 0>;

			};

		};

	};

};

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

0 → 100644
+45 −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 = <&pmi8994_gpios 2 0>;

			};



			wsa881x_212: wsa881x@20170212 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170212>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 3 0>;

			};



			wsa881x_213: wsa881x@21170213 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x21170213>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 2 0>;

			};



			wsa881x_214: wsa881x@21170214 {

				compatible = "qcom,wsa881x";

				reg = <0x00 0x21170214>;

				qcom,spkr-sd-n-gpio = <&pmi8994_gpios 3 0>;

			};

		};

	};

};