[RCAR] adjust asound.state for new BSP 3.21/YP3.1

Alsa sound card name has changed in BSP 3.21 for YP3.1: old name 'ak4613' has
been replaced by 'rcarsound'.

Specific fix for Ebisu board also becomes useless (alsa-state.bbappenda) and
is removed.

This change adjusts the card name while keeping the volume levels as before:
* 20% on DVC Out
* 10% on DVC In

Bug-AGL: SPEC-3380

Change-Id: Ic23c9b4c218ab275d5bd299911886cb40ebc8dc1
Signed-off-by: Stephane Desneux <stephane.desneux@iot.bzh>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24572
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend
index 38c5e70..44c2a2b 100644 (file)
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state.bbappend
@@ -4,6 +4,3 @@ COMPATIBLE_MACHINE = "(salvator-x|m3ulcb|h3ulcb|ebisu)"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-do_configure_append_ebisu () {
-       sed -i 's/state.ak4613\ {/state.rcarsound\ {/g' ${WORKDIR}/asound.state
-}

diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state/asound.state b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state/asound.state
index 1235394..ef01082 100644 (file)
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state/asound.state
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-bsp/alsa-state/alsa-state/asound.state
@@ -1,4 +1,4 @@
-state.ak4613 {
+state.rcarsound {
        control.1 {
                iface MIXER
                name 'Digital Playback Volume1'
@@ -98,8 +98,8 @@ state.ak4613 {
        control.7 {
                iface MIXER
                name 'DVC Out Playback Volume'
-               value.0 1677721
-               value.1 1677721
+               value.0 1677647
+               value.1 1677647
                comment {
                        access 'read write'
                        type INTEGER
@@ -220,8 +220,8 @@ state.ak4613 {
        control.14 {
                iface MIXER
                name 'DVC In Capture Volume'
-               value.0 838861
-               value.1 838861
+               value.0 838870
+               value.1 838870
                comment {
                        access 'read write'
                        type INTEGER