jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-01 15:07:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3964 from jernejsk/audio_fix

Browse Source 
Allwinner: Fix HDMI audio
This commit is contained in:
Matthias Reichl 2019-11-08 23:35:40 +01:00 committed by GitHub
commit a0d479cb0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/Allwinner/devices/A64/patches/linux/01_a64_hdmi_audio.patch
View File

@ -30,7 +30,7 @@ index 0f69f35939755..0b44018361cbf 100644
+ compatible = "simple-audio-card"; + compatible = "simple-audio-card";
+ simple-audio-card,format = "i2s"; + simple-audio-card,format = "i2s";
+ simple-audio-card,name = "allwinner-hdmi"; + simple-audio-card,name = "allwinner-hdmi";
+ simple-audio-card,mclk-fs = <256>; + simple-audio-card,mclk-fs = <128>;
+ +
+ simple-audio-card,codec { + simple-audio-card,codec {
+ sound-dai = <&hdmi>; + sound-dai = <&hdmi>;

2
projects/Allwinner/devices/H3/patches/linux/16-H3-add-HDMI-sound-nodes.patch
View File

@ -10,7 +10,7 @@ index 8aa2befc..d3d70eac 100644
+ compatible = "simple-audio-card"; + compatible = "simple-audio-card";
+ simple-audio-card,format = "i2s"; + simple-audio-card,format = "i2s";
+ simple-audio-card,name = "allwinner-hdmi"; + simple-audio-card,name = "allwinner-hdmi";
+ simple-audio-card,mclk-fs = <256>; + simple-audio-card,mclk-fs = <128>;
+ +
+ simple-audio-card,codec { + simple-audio-card,codec {
+ sound-dai = <&hdmi>; + sound-dai = <&hdmi>;

2
projects/Allwinner/devices/H6/patches/linux/05-sound-hack.patch
View File

@ -20,7 +20,7 @@ index 62a0eae77639..f1c53aec6523 100644
+ compatible = "simple-audio-card"; + compatible = "simple-audio-card";
+ simple-audio-card,format = "i2s"; + simple-audio-card,format = "i2s";
+ simple-audio-card,name = "allwinner-hdmi"; + simple-audio-card,name = "allwinner-hdmi";
+ simple-audio-card,mclk-fs = <256>; + simple-audio-card,mclk-fs = <128>;
+ +
+ simple-audio-card,codec { + simple-audio-card,codec {
+ sound-dai = <&hdmi>; + sound-dai = <&hdmi>;

27
projects/Allwinner/patches/linux/0004-sun4i-i2s-improvements.patch
View File

@ -723,3 +723,30 @@ index d0a8d5810c0a..9a715a6bdbf9 100644
-- --
2.23.0 2.23.0
From 2da43795f6191505b2dd6e30938c3af4c90bf745 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@siol.net>
Date: Thu, 7 Nov 2019 07:36:11 +0100
Subject: [PATCH] sound: soc: sun4i-i2s: Fix rate calculation
Signed-off-by: Jernej Skrabec <jernej.skrabec@siol.net>
---
sound/soc/sunxi/sun4i-i2s.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c
index d0a8d5810c0a..6c4241cb6509 100644
--- a/sound/soc/sunxi/sun4i-i2s.c
+++ b/sound/soc/sunxi/sun4i-i2s.c
@@ -334,6 +334,9 @@ static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai,
return -EINVAL;
}
+ if (i2s->slot_width)
+ slot_width = i2s->slot_width;
+
bclk_parent_rate = i2s->variant->get_bclk_parent_rate(i2s);
bclk_div = sun4i_i2s_get_bclk_div(i2s, bclk_parent_rate,
rate, slots, slot_width);
--
2.24.0