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

Commit 73faccff authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add bolero codec node in wsa"

parents d6a1f977 5455e424

Documentation/devicetree/bindings/sound/wcd_codec.txt

+12 −1
Original line number Diff line number Diff line
@@ -461,6 +461,16 @@ Required properties: 
			 required to be configured to receive interrupts

			 in BCL block of WSA macro



WSA slave device as child of Bolero codec



Required properties:

 - compatible = "qcom,wsa881x";

 - reg: Specifies the WSA slave device base address.

 - qcom,spkr-sd-n-gpio: speaker reset gpio



Optional properties:

 - qcom,bolero-handle: phandle to bolero codec



Example:



&bolero {
@@ -479,6 +489,7 @@ Example: 
				compatible = "qcom,wsa881x";

				reg = <0x00 0x20170212>;

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

				qcom,bolero-handle = <&bolero>;

			};

		};

	};

arch/arm64/boot/dts/qcom/atoll-audio-overlay.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -155,24 +155,28 @@ 
				compatible = "qcom,wsa881x";

				reg = <0x0 0x20170211>;

				qcom,spkr-sd-n-node = <&wsa_spkr_en1>;

				qcom,bolero-handle = <&bolero>;

			};



			wsa881x_0212: wsa881x@20170212 {

				compatible = "qcom,wsa881x";

				reg = <0x0 0x20170212>;

				qcom,spkr-sd-n-node = <&wsa_spkr_en2>;

				qcom,bolero-handle = <&bolero>;

			};



			wsa881x_0213: wsa881x@21170213 {

				compatible = "qcom,wsa881x";

				reg = <0x0 0x21170213>;

				qcom,spkr-sd-n-node = <&wsa_spkr_en1>;

				qcom,bolero-handle = <&bolero>;

			};



			wsa881x_0214: wsa881x@21170214 {

				compatible = "qcom,wsa881x";

				reg = <0x0 0x21170214>;

				qcom,spkr-sd-n-node = <&wsa_spkr_en2>;

				qcom,bolero-handle = <&bolero>;

			};

		};

arch/arm64/boot/dts/qcom/qcs405-wsa881x.dtsi

+5 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2018, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2019, 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
@@ -38,24 +38,28 @@ 
			compatible = "qcom,wsa881x";

			reg = <0x0 0x20170211>;

			qcom,spkr-sd-n-node = <&wsa_spkr_en_1_2>;

			qcom,bolero-handle = <&bolero>;

		};



		wsa881x_0212: wsa881x@20170212 {

			compatible = "qcom,wsa881x";

			reg = <0x0 0x20170212>;

			qcom,spkr-sd-n-node = <&wsa_spkr_en_1_2>;

			qcom,bolero-handle = <&bolero>;

		};



		wsa881x_0213: wsa881x@21170213 {

			compatible = "qcom,wsa881x";

			reg = <0x0 0x21170213>;

			qcom,spkr-sd-n-node = <&wsa_spkr_en_1_2>;

			qcom,bolero-handle = <&bolero>;

		};



		wsa881x_0214: wsa881x@21170214 {

			compatible = "qcom,wsa881x";

			reg = <0x0 0x21170214>;

			qcom,spkr-sd-n-node = <&wsa_spkr_en_1_2>;

			qcom,bolero-handle = <&bolero>;

		};

	};

};

arch/arm64/boot/dts/qcom/sm6150-audio-overlay.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -116,24 +116,28 @@ 
				compatible = "qcom,wsa881x";

				reg = <0x0 0x20170211>;

				qcom,spkr-sd-n-node = <&wsa_spkr_en1>;

				qcom,bolero-handle = <&bolero>;

			};



			wsa881x_0212: wsa881x@20170212 {

				compatible = "qcom,wsa881x";

				reg = <0x0 0x20170212>;

				qcom,spkr-sd-n-node = <&wsa_spkr_en2>;

				qcom,bolero-handle = <&bolero>;

			};



			wsa881x_0213: wsa881x@21170213 {

				compatible = "qcom,wsa881x";

				reg = <0x0 0x21170213>;

				qcom,spkr-sd-n-node = <&wsa_spkr_en1>;

				qcom,bolero-handle = <&bolero>;

			};



			wsa881x_0214: wsa881x@21170214 {

				compatible = "qcom,wsa881x";

				reg = <0x0 0x21170214>;

				qcom,spkr-sd-n-node = <&wsa_spkr_en2>;

				qcom,bolero-handle = <&bolero>;

			};

		};

arch/arm64/boot/dts/qcom/trinket-audio-overlay.dtsi

+4 −0
Original line number Diff line number Diff line
@@ -114,24 +114,28 @@ 
				compatible = "qcom,wsa881x";

				reg = <0x0 0x20170211>;

				qcom,spkr-sd-n-node = <&wsa_spkr_en1>;

				qcom,bolero-handle = <&bolero>;

			};



			wsa881x_0212: wsa881x@20170212 {

				compatible = "qcom,wsa881x";

				reg = <0x0 0x20170212>;

				qcom,spkr-sd-n-node = <&wsa_spkr_en1>;

				qcom,bolero-handle = <&bolero>;

			};



			wsa881x_0213: wsa881x@21170213 {

				compatible = "qcom,wsa881x";

				reg = <0x0 0x21170213>;

				qcom,spkr-sd-n-node = <&wsa_spkr_en1>;

				qcom,bolero-handle = <&bolero>;

			};



			wsa881x_0214: wsa881x@21170214 {

				compatible = "qcom,wsa881x";

				reg = <0x0 0x21170214>;

				qcom,spkr-sd-n-node = <&wsa_spkr_en1>;

				qcom,bolero-handle = <&bolero>;

			};

		};

	};