Merge "ARM: dts: msm: Add device tree change for Wsa881x device" (642fecca) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm/boot/dts/qcom/mdmcalifornium-blsp.dtsi

+35 −1

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2015, The Linux Foundation. All rights reserved.
		* Copyright (c) 2015-2016, 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
		@@ -149,6 +149,40 @@
		qcom,cdc-micbias4-mv = <1800>;
		qcom,cdc-mclk-clk-rate = <12288000>;
		qcom,cdc-dmic-sample-rate = <4800000>;

		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_pinmux 81 0>;
		};

		wsa881x_212: wsa881x@20170212 {
		compatible = "qcom,wsa881x";
		reg = <0x00 0x20170212>;
		qcom,spkr-sd-n-gpio =
		<&tlmm_pinmux 81 0>;
		};

		wsa881x_213: wsa881x@20170213 {
		compatible = "qcom,wsa881x";
		reg = <0x00 0x20170213>;
		qcom,spkr-sd-n-gpio =
		<&tlmm_pinmux 81 0>;
		};

		wsa881x_214: wsa881x@20170214 {
		compatible = "qcom,wsa881x";
		reg = <0x00 0x20170214>;
		qcom,spkr-sd-n-gpio =
		<&tlmm_pinmux 81 0>;
		};
		};
		};
		};

+5 −1

Original line number	Diff line number	Diff line
		@@ -1048,7 +1048,11 @@
		"msm-dai-q6-auxpcm.2";
		asoc-codec = <&stub_codec>;
		asoc-codec-names = "msm-stub-codec.1";
		qcom,aux-codec = <&stub_codec>;
		qcom,wsa-max-devs = <1>;
		qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_212>,
		<&wsa881x_213>, <&wsa881x_214>;
		qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",
		"SpkrLeft", "SpkrRight";
		};

		qcom,msm-adsp-loader {