Merge "ARM: dts: msm: Move audio overlay device tree file on SM8150 target" (d6fa86d6) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+12 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,12 @@
		#include <dt-bindings/clock/qcom,audio-ext-clk.h>

		&snd_9360 {
		qcom,ext-disp-audio-rx;
		qcom,wcn-btfm;
		qcom,mi2s-audio-intf;
		qcom,auxpcm-audio-intf;
		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>;

		qcom,audio-routing =
		"AIF4 VI", "MCLK",
		"MADINPUT", "MCLK",
		@@ -54,6 +60,12 @@
		};

		&snd_934x {
		qcom,ext-disp-audio-rx;
		qcom,wcn-btfm;
		qcom,mi2s-audio-intf;
		qcom,auxpcm-audio-intf;
		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>;

		qcom,audio-routing =
		"AIF4 VI", "MCLK",
		"RX_BIAS", "MCLK",

+0 −10

Original line number	Diff line number	Diff line
		@@ -32,11 +32,6 @@
		snd_9360: sound-pahu {
		compatible = "qcom,sm8150-asoc-snd-pahu";
		qcom,model = "sm8150-pahu-snd-card";
		qcom,ext-disp-audio-rx;
		qcom,wcn-btfm;
		qcom,mi2s-audio-intf;
		qcom,auxpcm-audio-intf;
		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>;

		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
		<&loopback>, <&compress>, <&hostless>,
		@@ -98,11 +93,6 @@
		snd_934x: sound-tavil {
		compatible = "qcom,sm8150-asoc-snd-tavil";
		qcom,model = "sm8150-tavil-snd-card";
		qcom,ext-disp-audio-rx;
		qcom,wcn-btfm;
		qcom,mi2s-audio-intf;
		qcom,auxpcm-audio-intf;
		qcom,msm-mi2s-master = <1>, <1>, <1>, <1>, <1>;

		asoc-platform = <&pcm0>, <&pcm1>, <&pcm2>, <&voip>, <&voice>,
		<&loopback>, <&compress>, <&hostless>,

0 → 100644

+19 −0

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 "sm8150-audio-overlay.dtsi"

		&snd_934x {
		qcom,model = "sm8150-tavil-cdp-snd-card";
		qcom,us-euro-gpios = <&tavil_us_euro_switch>;
		};

+1 −0

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

		#include "sm8150-cdp.dtsi"
		#include "sm8150-cdp-audio-overlay.dtsi"

		/ {
		model = "CDP";

+0 −6

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@
		#include <dt-bindings/input/input.h>

		#include "sm8150-pmic-overlay.dtsi"
		#include "sm8150-audio-overlay.dtsi"
		#include "sm8150-sde-display.dtsi"
		#include "sm8150-camera-sensor-cdp.dtsi"
		#include "sm8150-thermal-overlay.dtsi"
		@@ -104,11 +103,6 @@
		};
		};

		&snd_934x {
		qcom,model = "sm8150-tavil-cdp-snd-card";
		qcom,us-euro-gpios = <&tavil_us_euro_switch>;
		};

		&dsi_sharp_4k_dsc_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;
		qcom,mdss-dsi-bl-pmic-control-type = "bl_ctrl_wled";