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

Commit 0efa4599 authored by Xiaoyu Ye's avatar Xiaoyu Ye
Browse files

ARM: dts: msm: Add support to enable VA macro on Kona 



Add clock and CPU DAI configurations of VA macro to enable
it on Kona with Bolero codec.

Change-Id: I3e74ca702ac12aed62e9809586cdcad9d9c5d662
Signed-off-by: default avatarXiaoyu Ye <benyxy@codeaurora.org>
parent e0e6a8ab

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

+1 −13
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include <dt-bindings/clock/qcom,audio-ext-clk.h>

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

#include "kona-va-bolero.dtsi"



&bolero {

	qcom,num-macros = <4>;
@@ -127,11 +128,6 @@ 


	};



	va_macro: va-macro@3370000 {

		compatible = "qcom,va-macro";

		reg = <0x3370000 0x0>;

	};



	wcd938x_codec: wcd938x-codec {

		compatible = "qcom,wcd938x-codec";

		qcom,rx_swr_ch_map = <0 HPH_L 0x1 0 HPH_L>,
@@ -254,14 +250,6 @@ 
		#clock-cells = <1>;

	};



	clock_audio_va: va_core_clk  {

		compatible = "qcom,audio-ref-clk";

		qcom,codec-ext-clk-src = <AUDIO_LPASS_MCLK>;

		qcom,codec-lpass-ext-clk-freq = <19200000>;

		qcom,codec-lpass-clk-id = <0x30B>;

		#clock-cells = <1>;

	};



	clock_audio_rx_1: rx_core_clk {

		compatible = "qcom,audio-ref-clk";

		qcom,codec-ext-clk-src = <AUDIO_LPASS_MCLK_4>;

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

+4 −1
Original line number Diff line number Diff line
@@ -87,7 +87,8 @@ 
				<&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>;

				<&rx_cdc_dma_6_rx>, <&rx_cdc_dma_7_rx>,

				<&va_cdc_dma_0_tx>, <&va_cdc_dma_1_tx>;

		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",
@@ -112,6 +113,8 @@ 
				"msm-dai-cdc-dma-dev.45058",

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

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

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

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

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

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

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

arch/arm64/boot/dts/qcom/kona-va-bolero.dtsi

0 → 100644
+31 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

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

 */



&bolero {

	va_macro: va-macro@3370000 {

		compatible = "qcom,va-macro";

		reg = <0x3370000 0x0>;

		clock-names = "va_core_clk";

		clocks = <&clock_audio_va 0>;

		va-vdd-micb-supply = <&S4A>;

		qcom,va-vdd-micb-voltage = <1800000 1800000>;

		qcom,va-vdd-micb-current = <11200>;

		qcom,va-dmic-sample-rate = <4800000>;

	};

};



&soc {

	clock_audio_va: va_core_clk  {

		compatible = "qcom,audio-ref-clk";

		qcom,codec-ext-clk-src = <AUDIO_LPASS_MCLK>;

		qcom,codec-lpass-ext-clk-freq = <19200000>;

		qcom,codec-lpass-clk-id = <0x30B>;

		#clock-cells = <1>;

	};

};



&va_cdc_dma_0_tx {

	qcom,msm-dai-is-island-supported = <1>;

};