Merge "ARM: dts: msm: Add Proper id for swr bus instances for sm6150" (6c0a7f36) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+42 −11

Original line number	Diff line number	Diff line
		@@ -11,13 +11,6 @@
		* GNU General Public License for more details.
		*/

		/{
		aliases {
		swr1 = &swr_1;
		swr2 = &swr_2;
		};
		};

		#include "sm6150-lpi.dtsi"
		#include <dt-bindings/clock/qcom,audio-ext-clk.h>
		#include <dt-bindings/sound/audio-codec-port-types.h>
		@@ -33,7 +26,7 @@
		<&clock_audio_tx_2 0>;
		qcom,tx-swr-gpios = <&tx_swr_gpios>;
		qcom,tx-dmic-sample-rate = <2400000>;
		swr_2: tx_swr_master {
		swr2: tx_swr_master {
		compatible = "qcom,swr-mstr";
		#address-cells = <2>;
		#size-cells = <0>;
		@@ -66,7 +59,7 @@
		<&clock_audio_rx_2 0>;
		qcom,rx-swr-gpios = <&rx_swr_gpios>;
		qcom,rx_mclk_mode_muxsel = <0x62c25020>;
		swr_1: rx_swr_master {
		swr1: rx_swr_master {
		compatible = "qcom,swr-mstr";
		#address-cells = <2>;
		#size-cells = <0>;
		@@ -96,6 +89,46 @@
		clocks = <&clock_audio_wsa_1 0>,
		<&clock_audio_wsa_2 0>;
		qcom,wsa-swr-gpios = <&wsa_swr_gpios>;
		swr0: wsa_swr_master {
		compatible = "qcom,swr-mstr";
		#address-cells = <2>;
		#size-cells = <0>;
		qcom,swr_master_id = <1>;
		swrm-io-base = <0x62f10000 0x0>;
		interrupts = <0 136 0>;
		interrupt-names = "swr_master_irq";
		qcom,swr-num-ports = <8>;
		qcom,swr-port-mapping = <1 SPKR_L 0x1>,
		<2 SPKR_L_COMP 0xF>, <3 SPKR_L_BOOST 0x3>,
		<4 SPKR_R 0x1>, <5 SPKR_R_COMP 0xF>,
		<6 SPKR_R_BOOST 0x3>, <7 SPKR_L_VI 0x3>,
		<8 SPKR_R_VI 0x3>;
		qcom,swr-num-dev = <2>;
		wsa881x_0211: wsa881x@20170211 {
		compatible = "qcom,wsa881x";
		reg = <0x0 0x20170211>;
		qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
		};

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

		wsa881x_0213: wsa881x@21170213 {
		compatible = "qcom,wsa881x";
		reg = <0x0 0x21170213>;
		qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
		};

		wsa881x_0214: wsa881x@21170214 {
		compatible = "qcom,wsa881x";
		reg = <0x0 0x21170214>;
		qcom,spkr-sd-n-node = <&wsa_spkr_en2>;
		};
		};

		};

		va_macro: va-macro@62f20000 {
		@@ -106,8 +139,6 @@
		};
		};

		#include "sm6150-wsa881x.dtsi"

		&sm6150_snd {
		qcom,model = "sm6150-idp-snd-card";
		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>;

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

+20 −0

Original line number	Diff line number	Diff line
		@@ -34,6 +34,26 @@
		compatible = "qcom,q6core-audio";
		bolero: bolero-cdc {
		compatible = "qcom,bolero-codec";
		tx_macro: tx-macro@62ec0000 {
		swr2: tx_swr_master {
		};
		};

		rx_macro: rx-macro@62ee0000 {
		swr1: rx_swr_master {
		};
		};
		wsa_macro: wsa-macro@62f00000 {
		swr0: wsa_swr_master {
		};
		};
		};
		};
		};

		&slim_aud {
		tavil_codec {
		swr3: swr_master {
		};
		};
		};

arch/arm64/boot/dts/qcom/sm6150-external-codec.dtsi

+1 −7

Original line number	Diff line number	Diff line
		@@ -11,12 +11,6 @@
		* GNU General Public License for more details.
		*/

		/{
		aliases {
		swr0 = &swr_tavil;
		};
		};

		#include <dt-bindings/sound/audio-codec-port-types.h>
		#include "sm6150-wcd.dtsi"

		@@ -111,7 +105,7 @@
		&slim_aud {
		status = "okay";
		tavil_codec {
		swr_tavil: swr_master {
		swr3: swr_master {
		compatible = "qcom,swr-mstr";
		#address-cells = <2>;
		#size-cells = <0>;

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

deleted100644 → 0

+0 −62

Original line number	Diff line number	Diff line
		/*
		* Copyright (c) 2018, 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.
		*/

		/{
		aliases {
		swr0 = &swr_0;
		};
		};

		#include <dt-bindings/sound/audio-codec-port-types.h>

		&wsa_macro {
		swr_0: wsa_swr_master {
		compatible = "qcom,swr-mstr";
		#address-cells = <2>;
		#size-cells = <0>;
		qcom,swr_master_id = <1>;
		swrm-io-base = <0x62f10000 0x0>;
		interrupts = <0 136 0>;
		interrupt-names = "swr_master_irq";
		qcom,swr-num-ports = <8>;
		qcom,swr-port-mapping = <1 SPKR_L 0x1>,
		<2 SPKR_L_COMP 0xF>, <3 SPKR_L_BOOST 0x3>,
		<4 SPKR_R 0x1>, <5 SPKR_R_COMP 0xF>,
		<6 SPKR_R_BOOST 0x3>, <7 SPKR_L_VI 0x3>,
		<8 SPKR_R_VI 0x3>;
		qcom,swr-num-dev = <2>;
		wsa881x_0211: wsa881x@20170211 {
		compatible = "qcom,wsa881x";
		reg = <0x0 0x20170211>;
		qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
		};

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

		wsa881x_0213: wsa881x@21170213 {
		compatible = "qcom,wsa881x";
		reg = <0x0 0x21170213>;
		qcom,spkr-sd-n-node = <&wsa_spkr_en1>;
		};

		wsa881x_0214: wsa881x@21170214 {
		compatible = "qcom,wsa881x";
		reg = <0x0 0x21170214>;
		qcom,spkr-sd-n-node = <&wsa_spkr_en2>;
		};
		};
		};

arch/arm64/boot/dts/qcom/sm6150.dtsi

+4 −0

Original line number	Diff line number	Diff line
		@@ -44,6 +44,10 @@
		i2c1 = &qupv3_se1_i2c;
		i2c2 = &qupv3_se3_i2c;
		hsuart0 = &qupv3_se7_4uart;
		swr0 = &swr0;
		swr1 = &swr1;
		swr2 = &swr2;
		swr3 = &swr3;
		};

		cpus {