From 117679fd006411c176e376296917243245adb959 Mon Sep 17 00:00:00 2001
From: Ronan Le Martret <ronan.lemartret@iot.bzh>
Date: Thu, 5 Nov 2020 09:59:43 +0000
Subject: [PATCH] [RCAR] Fix the soundcard ak4613 audio sink.

Now (RCAR BSP 4.1.0) the card ak4613 got two device (the new one is for
the hdmi), so we must specify the device in the wireplumber
configuration.

Bug-AGL: SPEC-3661

Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Change-Id: I6fdf4fdc22d93a0558874e447ec5c4254f13d238
Signed-off-by: Ronan Le Martret <ronan.lemartret@iot.bzh>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/25510
Reviewed-by: Scott Murray <scott.murray@konsulko.com>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
---
 .../wireplumber-board-config-agl/30-ak4613-audio-sink.endpoint           | 1 +
 .../wireplumber-board-config-agl/30-rcarsound-audio-sink.endpoint        | 1 +
 2 files changed, 2 insertions(+)

diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/30-ak4613-audio-sink.endpoint b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/30-ak4613-audio-sink.endpoint
index afc4303eb..4405f7b7a 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/30-ak4613-audio-sink.endpoint
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/30-ak4613-audio-sink.endpoint
@@ -3,6 +3,7 @@ priority = 30
 properties = [
   { name = "media.class", value = "Audio/Sink" },
   { name = "api.alsa.card.id", value = "ak4613" },
+  { name = "api.alsa.pcm.device", value = "0" },
 ]
 
 [endpoint]
diff --git a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/30-rcarsound-audio-sink.endpoint b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/30-rcarsound-audio-sink.endpoint
index 53f9d0df7..0c7b20805 100644
--- a/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/30-rcarsound-audio-sink.endpoint
+++ b/meta-pipewire/recipes-multimedia/wireplumber/wireplumber-board-config-agl/30-rcarsound-audio-sink.endpoint
@@ -3,6 +3,7 @@ priority = 30
 properties = [
   { name = "media.class", value = "Audio/Sink" },
   { name = "api.alsa.card.id", value = "rcarsound" },
+  { name = "api.alsa.pcm.device", value = "0" },
 ]
 
 [endpoint]
-- 
2.16.6