From e12a6e769d80c09a6d68793880f789be645d4dd2 Mon Sep 17 00:00:00 2001
From: Christophe Priouzeau <christophe.priouzeau@st.com>
Date: Wed, 9 Oct 2019 11:24:57 +0200
Subject: [PATCH] AUDIO: update configuration

- Define recording sources in Pulseaudio,
for STM32MP1 eval and disco boards.

- Set headset microphone linked to audio codec as default
 capture source on STM32MP1 eval and dk boards.

ALSA: change front devices configuration
ALSA: add default device for disco board

Signed-off-by: Christophe Priouzeau <christophe.priouzeau@st.com>
---
 ...add-card-configs-for-stm32mp1-boards.patch | 36 +++++++++++--------
 .../pulseaudio/pulseaudio/system.pa           |  7 ++++
 2 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/recipes-bsp/alsa/alsa-lib/0001-conf-add-card-configs-for-stm32mp1-boards.patch b/recipes-bsp/alsa/alsa-lib/0001-conf-add-card-configs-for-stm32mp1-boards.patch
index 8777de5..4302bed 100644
--- a/recipes-bsp/alsa/alsa-lib/0001-conf-add-card-configs-for-stm32mp1-boards.patch
+++ b/recipes-bsp/alsa/alsa-lib/0001-conf-add-card-configs-for-stm32mp1-boards.patch
@@ -1,6 +1,6 @@
-From aedc2bda681ddc3ba59682bf3dd24e6588a93670 Mon Sep 17 00:00:00 2001
+From d1e2b81cd739cc7019f3881b54328a583e437efa Mon Sep 17 00:00:00 2001
 From: Olivier Moysan <olivier.moysan@st.com>
-Date: Wed, 12 Dec 2018 16:00:08 +0100
+Date: Thu, 25 Apr 2019 11:47:16 +0200
 Subject: [PATCH 1/1] conf: add card configs for stm32mp1 boards
 
 Add card configuration files for STM32MP1x-EV
@@ -9,10 +9,10 @@ and STM32MP1x-DK boards.
 Signed-off-by: Olivier Moysan <olivier.moysan@st.com>
 ---
  src/conf/cards/Makefile.am     |  4 ++-
- src/conf/cards/STM32MP1DK.conf | 34 +++++++++++++++++++++
- src/conf/cards/STM32MP1EV.conf | 69 ++++++++++++++++++++++++++++++++++++++++++
+ src/conf/cards/STM32MP1DK.conf | 47 +++++++++++++++++++++++++++++++
+ src/conf/cards/STM32MP1EV.conf | 64 ++++++++++++++++++++++++++++++++++++++++++
  src/conf/cards/aliases.conf    |  2 ++
- 4 files changed, 108 insertions(+), 1 deletion(-)
+ 4 files changed, 116 insertions(+), 1 deletion(-)
  create mode 100644 src/conf/cards/STM32MP1DK.conf
  create mode 100644 src/conf/cards/STM32MP1EV.conf
 
@@ -33,10 +33,10 @@ index 00999f0186d6..e565357df72c 100644
  cfg_files += aliases.alisp
 diff --git a/src/conf/cards/STM32MP1DK.conf b/src/conf/cards/STM32MP1DK.conf
 new file mode 100644
-index 000000000000..7c7d9216e5bd
+index 000000000000..0a81fbe67149
 --- /dev/null
 +++ b/src/conf/cards/STM32MP1DK.conf
-@@ -0,0 +1,34 @@
+@@ -0,0 +1,47 @@
 +<confdir:pcm/front.conf>
 +
 +STM32MP1DK.pcm.front.0 {
@@ -48,6 +48,19 @@ index 000000000000..7c7d9216e5bd
 +                card $CARD
 +                device 0
 +        }
++}
++
++<confdir:pcm/default.conf>
++
++STM32MP1DK.pcm.default {
++        @args [ CARD ]
++        @args.CARD { type string }
++        type asym
++        playback.pcm {
++                type hw
++                card $CARD
++                device 0
++        }
 +        capture.pcm {
 +                type hw
 +                card $CARD
@@ -73,10 +86,10 @@ index 000000000000..7c7d9216e5bd
 +}
 diff --git a/src/conf/cards/STM32MP1EV.conf b/src/conf/cards/STM32MP1EV.conf
 new file mode 100644
-index 000000000000..56b4bf419c8b
+index 000000000000..2b0ae406c071
 --- /dev/null
 +++ b/src/conf/cards/STM32MP1EV.conf
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,64 @@
 +<confdir:pcm/front.conf>
 +
 +STM32MP1EV.pcm.front.0 {
@@ -88,11 +101,6 @@ index 000000000000..56b4bf419c8b
 +                card $CARD
 +                device 0
 +        }
-+        capture.pcm {
-+                type hw
-+                card $CARD
-+                device 1
-+        }
 +}
 +
 +<confdir:pcm/default.conf>
diff --git a/recipes-multimedia/pulseaudio/pulseaudio/system.pa b/recipes-multimedia/pulseaudio/pulseaudio/system.pa
index e2ea2b7..b829206 100644
--- a/recipes-multimedia/pulseaudio/pulseaudio/system.pa
+++ b/recipes-multimedia/pulseaudio/pulseaudio/system.pa
@@ -67,3 +67,10 @@ load-module module-bluetooth-discover
 load-module module-bluetooth-policy
 .endif
 
+load-module module-alsa-source device=record_codec source_name=analog_input
+load-module module-alsa-source device=record_spdif source_name=iec958_input
+load-module module-alsa-source device=record_dfsdm0 source_name=dmic1_input
+load-module module-alsa-source device=record_dfsdm1 source_name=dmic2_input
+load-module module-alsa-source device=record_dfsdm2 source_name=dmic3_input
+load-module module-alsa-source device=record_dfsdm3 source_name=dmic4_input
+set-default-source analog_input