Merge "Revert "ARM: dts: msm: Add audio support for sdmmagpie target"" (72f4105b) · Commits · e / devices / android_kernel_xiaomi_nabu

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

deleted100644 → 0

+0 −30

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.
		*/

		#include "sm6150-audio-overlay.dtsi"

		&swr0 {
		interrupts = <0 295 0>;
		};

		&swr1 {
		interrupts = <0 297 0>;
		};

		&swr2 {
		interrupts = <0 296 0>, <0 528 0>;
		};

		&sm6150_snd {
		qcom,model = "sm6150-wcd9375-snd-card";
		};

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

deleted100644 → 0

+0 −18

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.
		*/

		#include "sm6150-audio.dtsi"

		&msm_audio_ion {
		iommus = <&apps_smmu 0x1b21 0x0>;
		};

arch/arm64/boot/dts/qcom/sdmmagpie-idp-overlay.dts

+0 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,6 @@
		#include <dt-bindings/interrupt-controller/arm-gic.h>

		#include "sdmmagpie-idp.dtsi"
		#include "sdmmagpie-audio-overlay.dtsi"

		/ {
		model = "IDP";

arch/arm64/boot/dts/qcom/sdmmagpie-pinctrl.dtsi

+0 −149

Original line number	Diff line number	Diff line
		@@ -867,155 +867,6 @@
		};
		};

		wsa_swr_clk_pin {
		wsa_swr_clk_sleep: wsa_swr_clk_sleep {
		mux {
		pins = "gpio49";
		function = "WSA_CLK";
		};

		config {
		pins = "gpio49";
		drive-strength = <2>;
		bias-bus-hold;
		};
		};

		wsa_swr_clk_active: wsa_swr_clk_active {
		mux {
		pins = "gpio49";
		function = "WSA_CLK";
		};

		config {
		pins = "gpio49";
		drive-strength = <2>;
		bias-bus-hold;
		};
		};
		};

		wsa_swr_data_pin {
		wsa_swr_data_sleep: wsa_swr_data_sleep {
		mux {
		pins = "gpio50";
		function = "WSA_DATA";
		};

		config {
		pins = "gpio50";
		drive-strength = <4>;
		bias-bus-hold;
		};
		};

		wsa_swr_data_active: wsa_swr_data_active {
		mux {
		pins = "gpio50";
		function = "WSA_DATA";
		};

		config {
		pins = "gpio50";
		drive-strength = <4>;
		bias-bus-hold;
		};
		};
		};

		/* WSA speaker reset pins */
		spkr_1_sd_n {
		spkr_1_sd_n_sleep: spkr_1_sd_n_sleep {
		mux {
		pins = "gpio51";
		function = "gpio";
		};

		config {
		pins = "gpio51";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down;
		input-enable;
		};
		};

		spkr_1_sd_n_active: spkr_1_sd_n_active {
		mux {
		pins = "gpio51";
		function = "gpio";
		};

		config {
		pins = "gpio51";
		drive-strength = <16>; /* 16 mA */
		bias-disable;
		output-high;
		};
		};
		};

		spkr_2_sd_n {
		spkr_2_sd_n_sleep: spkr_2_sd_n_sleep {
		mux {
		pins = "gpio52";
		function = "gpio";
		};

		config {
		pins = "gpio52";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down;
		input-enable;
		};
		};

		spkr_2_sd_n_active: spkr_2_sd_n_active {
		mux {
		pins = "gpio52";
		function = "gpio";
		};

		config {
		pins = "gpio52";
		drive-strength = <16>; /* 16 mA */
		bias-disable;
		output-high;
		};
		};
		};

		wcd9xxx_intr {
		wcd_intr_default: wcd_intr_default{
		mux {
		pins = "gpio58";
		function = "gpio";
		};

		config {
		pins = "gpio58";
		drive-strength = <2>; /* 2 mA */
		bias-pull-down; /* pull down */
		input-enable;
		};
		};
		};

		fsa_usbc_ana_en_n@42 {
		fsa_usbc_ana_en: fsa_usbc_ana_en {
		mux {
		pins = "gpio42";
		function = "gpio";
		};

		config {
		pins = "gpio42";
		drive-strength = <2>;
		bias-disable;
		output-low;
		};
		};
		};

		pmx_sde_te {
		sde_te_active: sde_te_active {
		mux {

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -2628,7 +2628,6 @@
		#include "sdmmagpie-coresight.dtsi"
		#include "sdmmagpie-usb.dtsi"
		#include "sdmmagpie-thermal.dtsi"
		#include "sdmmagpie-audio.dtsi"

		&usb0 {
		extcon = <&pm6150_pdphy>, <&pm6150_charger>, <&eud>;