Merge "ARM: dts: msm: make sound card child of APR for SDM855" into msm-4.14 (8fbed76e) · Commits · e / devices / android_kernel_oneplus_sm8150

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -26,7 +26,9 @@
		qcom,clk-div = <192>;
		qcom,clk-mult = <10>;
		};
		};

		&audio_apr {
		snd_9360: sound-pahu {
		compatible = "qcom,sdm855-asoc-snd-pahu";
		qcom,model = "sdm855-pahu-snd-card";

+3 −3

Original line number	Diff line number	Diff line
		@@ -85,11 +85,11 @@
		linux,can-disable;
		};
		};
		};

		sound-pahu {
		&snd_9360 {
		qcom,wsa-max-devs = <1>;
		};
		};

		&dsi_sharp_4k_dsc_cmd {
		qcom,panel-supply-entries = <&dsi_panel_pwr_supply>;

+7 −5

Original line number	Diff line number	Diff line
		@@ -61,6 +61,13 @@
		qcom,wlan-msa-memory = <0x100000>;
		};

		wdog: qcom,wdt@17c10000{
		status = "disabled";
		};

		};

		&audio_apr {
		sound-stub {
		compatible = "qcom,sdm855-asoc-snd-stub";
		qcom,model = "sdm855-stub-snd-card";
		@@ -76,11 +83,6 @@
		asoc-codec-names = "msm-stub-codec.1";
		qcom,wsa-max-devs = <0>;
		};

		wdog: qcom,wdt@17c10000{
		status = "disabled";
		};

		};

		#include "sdm855-pmic-overlay.dtsi"