Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97e1b3cf authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: add a DMA TX device node for VA macro on Kona"

parents 08e63958 74f7c734

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

+5 −3
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

 */



#include "msm-audio-lpass.dtsi"
@@ -81,14 +81,15 @@ 
				<&wsa_cdc_dma_0_rx>, <&wsa_cdc_dma_0_tx>,

				<&wsa_cdc_dma_1_rx>, <&wsa_cdc_dma_1_tx>,

				<&wsa_cdc_dma_2_tx>,

				<&va_cdc_dma_0_tx>, <&va_cdc_dma_1_tx>,

				<&va_cdc_dma_2_tx>,

				<&rx_cdc_dma_0_rx>, <&tx_cdc_dma_0_tx>,

				<&rx_cdc_dma_1_rx>, <&tx_cdc_dma_1_tx>,

				<&rx_cdc_dma_2_rx>, <&tx_cdc_dma_2_tx>,

				<&rx_cdc_dma_3_rx>, <&tx_cdc_dma_3_tx>,

				<&rx_cdc_dma_4_rx>, <&tx_cdc_dma_4_tx>,

				<&rx_cdc_dma_5_rx>, <&tx_cdc_dma_5_tx>,

				<&rx_cdc_dma_6_rx>, <&rx_cdc_dma_7_rx>,

				<&va_cdc_dma_0_tx>, <&va_cdc_dma_1_tx>;

				<&rx_cdc_dma_6_rx>, <&rx_cdc_dma_7_rx>;

		asoc-cpu-names = "msm-dai-q6-dp.24608",

				"msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1",

				"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
@@ -115,6 +116,7 @@ 
				"msm-dai-cdc-dma-dev.45061",

				"msm-dai-cdc-dma-dev.45089",

				"msm-dai-cdc-dma-dev.45091",

				"msm-dai-cdc-dma-dev.45093",

				"msm-dai-cdc-dma-dev.45104",

				"msm-dai-cdc-dma-dev.45105",

				"msm-dai-cdc-dma-dev.45106",

arch/arm64/boot/dts/qcom/msm-audio-lpass.dtsi

+6 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.

 * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.

 */



&soc {
@@ -171,6 +171,11 @@ 
			qcom,msm-dai-cdc-dma-dev-id = <45091>;

		};



		va_cdc_dma_2_tx: qcom,msm-dai-va-cdc-dma-2-tx {

			compatible = "qcom,msm-dai-cdc-dma-dev";

			qcom,msm-dai-cdc-dma-dev-id = <45093>;

		};



		rx_cdc_dma_0_rx: qcom,msm-dai-rx-cdc-dma-0-rx {

			compatible = "qcom,msm-dai-cdc-dma-dev";

			qcom,msm-dai-cdc-dma-dev-id = <45104>;