From d03149cd12086be37c79cb641eb32fa4cc162e47 Mon Sep 17 00:00:00 2001 From: "xing.fang" Date: Tue, 14 Mar 2023 14:00:26 +0800 Subject: [PATCH] Audio: S5 Audio K5.15 Bringup [1/1] PD#SWPL-108813 Problem: Audio driver functions bringup. Solution: 1) modify dts for BT 2) modify dts for resample 3) vad/DD DDP/eARC Verify: AX201 Change-Id: I078d7c02633847f7a7fa2857ccb01f2dfd5dcbfd Signed-off-by: xing.fang --- arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts | 6 ++++-- arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts | 6 ++++-- arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts | 6 ++++-- arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts | 6 ++++-- arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts | 6 ++++-- arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts | 6 ++++-- arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts | 6 ++++-- arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts | 6 ++++-- 8 files changed, 32 insertions(+), 16 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts index fa94839cb..ebb91a146 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201.dts @@ -582,7 +582,7 @@ aml-audio-card,dai-link@0 { format = "dsp_a"; - mclk-fs = <512>; + mclk-fs = <64>; //continuous-clock; //bitclock-inversion; //frame-inversion; @@ -602,7 +602,7 @@ dai-tdm-slot-rx-mask = <1>; dai-tdm-slot-num = <2>; dai-tdm-slot-width = <16>; - system-clock-frequency = <256000>; + system-clock-frequency = <512000>; }; tdmacodec: codec { sound-dai = <&dummy_codec>; @@ -1324,6 +1324,7 @@ &clkaudio CLKID_AUDIO_MCLK_B &clkaudio CLKID_AUDIO_RESAMPLE_A>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*same with toddr_src * TDMIN_A, 0 @@ -1351,6 +1352,7 @@ &clkaudio CLKID_AUDIO_MCLK_F &clkaudio CLKID_AUDIO_RESAMPLE_B>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*this resample is only used for loopback_A.*/ capture_sample_rate = <16000>; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts index b0dac739f..9f646dfed 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_drm.dts @@ -580,7 +580,7 @@ aml-audio-card,dai-link@0 { format = "dsp_a"; - mclk-fs = <512>; + mclk-fs = <64>; //continuous-clock; //bitclock-inversion; //frame-inversion; @@ -600,7 +600,7 @@ dai-tdm-slot-rx-mask = <1>; dai-tdm-slot-num = <2>; dai-tdm-slot-width = <16>; - system-clock-frequency = <256000>; + system-clock-frequency = <512000>; }; tdmacodec: codec { sound-dai = <&dummy_codec>; @@ -1408,6 +1408,7 @@ &clkaudio CLKID_AUDIO_MCLK_B &clkaudio CLKID_AUDIO_RESAMPLE_A>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*same with toddr_src * TDMIN_A, 0 @@ -1435,6 +1436,7 @@ &clkaudio CLKID_AUDIO_MCLK_F &clkaudio CLKID_AUDIO_RESAMPLE_B>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*this resample is only used for loopback_A.*/ capture_sample_rate = <16000>; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts index d2900e91e..1b46a81a0 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_linux.dts @@ -571,7 +571,7 @@ aml-audio-card,dai-link@0 { format = "dsp_a"; - mclk-fs = <512>; + mclk-fs = <64>; //continuous-clock; //bitclock-inversion; //frame-inversion; @@ -591,7 +591,7 @@ dai-tdm-slot-rx-mask = <1>; dai-tdm-slot-num = <2>; dai-tdm-slot-width = <16>; - system-clock-frequency = <256000>; + system-clock-frequency = <512000>; }; tdmacodec: codec { sound-dai = <&dummy_codec>; @@ -1313,6 +1313,7 @@ &clkaudio CLKID_AUDIO_MCLK_B &clkaudio CLKID_AUDIO_RESAMPLE_A>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*same with toddr_src * TDMIN_A, 0 @@ -1340,6 +1341,7 @@ &clkaudio CLKID_AUDIO_MCLK_F &clkaudio CLKID_AUDIO_RESAMPLE_B>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*this resample is only used for loopback_A.*/ capture_sample_rate = <16000>; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts index 7a6a7ad36..bb6d96457 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2.dts @@ -582,7 +582,7 @@ aml-audio-card,dai-link@0 { format = "dsp_a"; - mclk-fs = <512>; + mclk-fs = <64>; //continuous-clock; //bitclock-inversion; //frame-inversion; @@ -602,7 +602,7 @@ dai-tdm-slot-rx-mask = <1>; dai-tdm-slot-num = <2>; dai-tdm-slot-width = <16>; - system-clock-frequency = <256000>; + system-clock-frequency = <512000>; }; tdmacodec: codec { sound-dai = <&dummy_codec>; @@ -1310,6 +1310,7 @@ &clkaudio CLKID_AUDIO_MCLK_B &clkaudio CLKID_AUDIO_RESAMPLE_A>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*same with toddr_src * TDMIN_A, 0 @@ -1337,6 +1338,7 @@ &clkaudio CLKID_AUDIO_MCLK_F &clkaudio CLKID_AUDIO_RESAMPLE_B>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*this resample is only used for loopback_A.*/ capture_sample_rate = <16000>; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts index c69aa42b8..872449ee8 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_drm.dts @@ -580,7 +580,7 @@ aml-audio-card,dai-link@0 { format = "dsp_a"; - mclk-fs = <512>; + mclk-fs = <64>; //continuous-clock; //bitclock-inversion; //frame-inversion; @@ -600,7 +600,7 @@ dai-tdm-slot-rx-mask = <1>; dai-tdm-slot-num = <2>; dai-tdm-slot-width = <16>; - system-clock-frequency = <256000>; + system-clock-frequency = <2512000>; }; tdmacodec: codec { sound-dai = <&dummy_codec>; @@ -1394,6 +1394,7 @@ &clkaudio CLKID_AUDIO_MCLK_B &clkaudio CLKID_AUDIO_RESAMPLE_A>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*same with toddr_src * TDMIN_A, 0 @@ -1421,6 +1422,7 @@ &clkaudio CLKID_AUDIO_MCLK_F &clkaudio CLKID_AUDIO_RESAMPLE_B>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*this resample is only used for loopback_A.*/ capture_sample_rate = <16000>; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts index 2f4f829b9..4315e4a10 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax201_v2_linux.dts @@ -571,7 +571,7 @@ aml-audio-card,dai-link@0 { format = "dsp_a"; - mclk-fs = <512>; + mclk-fs = <64>; //continuous-clock; //bitclock-inversion; //frame-inversion; @@ -591,7 +591,7 @@ dai-tdm-slot-rx-mask = <1>; dai-tdm-slot-num = <2>; dai-tdm-slot-width = <16>; - system-clock-frequency = <256000>; + system-clock-frequency = <512000>; }; tdmacodec: codec { sound-dai = <&dummy_codec>; @@ -1299,6 +1299,7 @@ &clkaudio CLKID_AUDIO_MCLK_B &clkaudio CLKID_AUDIO_RESAMPLE_A>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*same with toddr_src * TDMIN_A, 0 @@ -1326,6 +1327,7 @@ &clkaudio CLKID_AUDIO_MCLK_F &clkaudio CLKID_AUDIO_RESAMPLE_B>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*this resample is only used for loopback_A.*/ capture_sample_rate = <16000>; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts index 498d38e94..09990faa8 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208.dts @@ -579,7 +579,7 @@ aml-audio-card,dai-link@0 { format = "dsp_a"; - mclk-fs = <512>; + mclk-fs = <64>; //continuous-clock; //bitclock-inversion; //frame-inversion; @@ -599,7 +599,7 @@ dai-tdm-slot-rx-mask = <1>; dai-tdm-slot-num = <2>; dai-tdm-slot-width = <16>; - system-clock-frequency = <256000>; + system-clock-frequency = <512000>; }; tdmacodec: codec { sound-dai = <&dummy_codec>; @@ -1334,6 +1334,7 @@ &clkaudio CLKID_AUDIO_MCLK_B &clkaudio CLKID_AUDIO_RESAMPLE_A>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*same with toddr_src * TDMIN_A, 0 @@ -1361,6 +1362,7 @@ &clkaudio CLKID_AUDIO_MCLK_F &clkaudio CLKID_AUDIO_RESAMPLE_B>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*this resample is only used for loopback_A.*/ capture_sample_rate = <16000>; diff --git a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts index 12ca28675..e68b68280 100644 --- a/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts +++ b/arch/arm64/boot/dts/amlogic/s5_s928x_ax208_v2.dts @@ -579,7 +579,7 @@ aml-audio-card,dai-link@0 { format = "dsp_a"; - mclk-fs = <512>; + mclk-fs = <64>; //continuous-clock; //bitclock-inversion; //frame-inversion; @@ -599,7 +599,7 @@ dai-tdm-slot-rx-mask = <1>; dai-tdm-slot-num = <2>; dai-tdm-slot-width = <16>; - system-clock-frequency = <256000>; + system-clock-frequency = <512000>; }; tdmacodec: codec { sound-dai = <&dummy_codec>; @@ -1321,6 +1321,7 @@ &clkaudio CLKID_AUDIO_MCLK_B &clkaudio CLKID_AUDIO_RESAMPLE_A>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*same with toddr_src * TDMIN_A, 0 @@ -1348,6 +1349,7 @@ &clkaudio CLKID_AUDIO_MCLK_F &clkaudio CLKID_AUDIO_RESAMPLE_B>; clock-names = "resample_pll", "resample_src", "resample_clk"; + src-clk-freq = <491520000>; /*this resample is only used for loopback_A.*/ capture_sample_rate = <16000>;