Merge "ARM: dts: sdxpoorwills: fix wsa device node" (4ca4aa4e) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/boot/dts/qcom/sdx-audio-lpass.dtsi

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -307,6 +307,7 @@
	};		};

	prim_slave: prim_slave_pinctrl {		prim_slave: prim_slave_pinctrl {
			status = "disabled";
	compatible = "qcom,msm-cdc-pinctrl";		compatible = "qcom,msm-cdc-pinctrl";
	pinctrl-names = "aud_active", "aud_sleep";		pinctrl-names = "aud_active", "aud_sleep";
	pinctrl-0 = <&pri_ws_active_slave		pinctrl-0 = <&pri_ws_active_slave
	@@ -335,6 +336,7 @@
	};		};

	sec_slave: sec_slave_pinctrl {		sec_slave: sec_slave_pinctrl {
			status = "disabled";
	compatible = "qcom,msm-cdc-pinctrl";		compatible = "qcom,msm-cdc-pinctrl";
	pinctrl-names = "aud_active", "aud_sleep";		pinctrl-names = "aud_active", "aud_sleep";
	pinctrl-0 = <&sec_ws_active_slave		pinctrl-0 = <&sec_ws_active_slave

+4 −1

Original line number	Original line	Diff line number	Diff line
	/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.		/* Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.
	*		*
	* This program is free software; you can redistribute it and/or modify		* 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		* it under the terms of the GNU General Public License version 2 and
	@@ -18,18 +18,21 @@
	#size-cells = <0>;		#size-cells = <0>;

	wsa881x_0211: wsa881x@20170211 {		wsa881x_0211: wsa881x@20170211 {
			status = "disabled";
	compatible = "qcom,wsa881x";		compatible = "qcom,wsa881x";
	reg = <0x00 0x20170211>;		reg = <0x00 0x20170211>;
	qcom,spkr-sd-n-node = <&wsa_spkr_wcd_sd1>;		qcom,spkr-sd-n-node = <&wsa_spkr_wcd_sd1>;
	};		};

	wsa881x_0212: wsa881x@20170212 {		wsa881x_0212: wsa881x@20170212 {
			status = "disabled";
	compatible = "qcom,wsa881x";		compatible = "qcom,wsa881x";
	reg = <0x00 0x20170212>;		reg = <0x00 0x20170212>;
	qcom,spkr-sd-n-node = <&wsa_spkr_wcd_sd2>;		qcom,spkr-sd-n-node = <&wsa_spkr_wcd_sd2>;
	};		};

	wsa881x_0213: wsa881x@21170213 {		wsa881x_0213: wsa881x@21170213 {
			status = "disabled";
	compatible = "qcom,wsa881x";		compatible = "qcom,wsa881x";
	reg = <0x00 0x21170213>;		reg = <0x00 0x21170213>;
	qcom,spkr-sd-n-node = <&wsa_spkr_wcd_sd1>;		qcom,spkr-sd-n-node = <&wsa_spkr_wcd_sd1>;