From 6a7f7237ddd6afecddeb885868c81f1779cea137 Mon Sep 17 00:00:00 2001
From: Jonathan Aillet <jonathan.aillet@iot.bzh>
Date: Thu, 28 Jun 2018 22:00:54 +0200
Subject: Correct audio configurations for Rcar boards

Correct audio configurations for the following Rcar boards :
- M3
- M3/Kingfisher

Change-Id: Ie68be0385fb978b44dea4ce2afd4e9fdc0c8c45c
Signed-off-by: Jonathan Aillet <jonathan.aillet@iot.bzh>
---
 4a-hal-cfg-reference/hal-4a-rcar-m3.json   | 19 ++++++++++++-------
 4a-hal-cfg-reference/hal-4a-rcar-m3kf.json | 19 ++++++++++++-------
 2 files changed, 24 insertions(+), 14 deletions(-)

(limited to '4a-hal-cfg-reference')

diff --git a/4a-hal-cfg-reference/hal-4a-rcar-m3.json b/4a-hal-cfg-reference/hal-4a-rcar-m3.json
index 0e5c67a..1ac757b 100644
--- a/4a-hal-cfg-reference/hal-4a-rcar-m3.json
+++ b/4a-hal-cfg-reference/hal-4a-rcar-m3.json
@@ -20,14 +20,14 @@
         {
             "uid": "agl-master-playback-volume",
             "alsa": {
-                "name": "Digital Playback Volume1",
+                "name": "DVC Out Playback Volume",
                 "value": 80
             }
         },
         {
             "uid": "agl-pcm-playback-volume",
             "alsa": {
-                "name": "Digital Playback Volume1",
+                "name": "DVC Out Playback Volume",
                 "value": 80
             }
         },
@@ -48,6 +48,7 @@
     "halmixer": {
         "uid": "rcar-m3",
         "mixerapi": "smixer",
+        "prefix": "m3",
         "ramps": [
             {
                 "uid": "ramp-very-fast",
@@ -84,12 +85,13 @@
             "uid": "RCAR-M3",
             "path": "/dev/snd/by-path/platform-sound",
             "params": {
-                "rate": 48000
+                "rate": 48000,
+                "format": "S24_LE"
             },
             "sink": {
                 "controls": {
                     "volume": {
-                        "name": "Digital Playback Volume1",
+                        "name": "DVC Out Playback Volume",
                         "value": 80
                     },
                     "mute": {
@@ -171,7 +173,8 @@
                 "volume": 60,
                 "mute": false,
                 "params": {
-                    "rate": 48000
+                    "rate": 48000,
+                    "format": "S16_LE"
                 }
             },
             {
@@ -181,7 +184,8 @@
                 "volume": 70,
                 "mute": false,
                 "params": {
-                    "rate": 48000
+                    "rate": 48000,
+                    "format": "S16_LE"
                 }
             },
             {
@@ -191,7 +195,8 @@
                 "volume": 60,
                 "mute": false,
                 "params": {
-                    "rate": 48000
+                    "rate": 48000,
+                    "format": "S16_LE"
                 }
             }
         ]
diff --git a/4a-hal-cfg-reference/hal-4a-rcar-m3kf.json b/4a-hal-cfg-reference/hal-4a-rcar-m3kf.json
index fb9f990..5f9820a 100644
--- a/4a-hal-cfg-reference/hal-4a-rcar-m3kf.json
+++ b/4a-hal-cfg-reference/hal-4a-rcar-m3kf.json
@@ -20,14 +20,14 @@
         {
             "uid": "agl-master-playback-volume",
             "alsa": {
-                "name": "Digital Playback Volume1",
+                "name": "DVC Out Playback Volume",
                 "value": 80
             }
         },
         {
             "uid": "agl-pcm-playback-volume",
             "alsa": {
-                "name": "Digital Playback Volume1",
+                "name": "DVC Out Playback Volume",
                 "value": 80
             }
         },
@@ -48,6 +48,7 @@
     "halmixer": {
         "uid": "rcar-m3",
         "mixerapi": "smixer",
+        "prefix": "m3kf",
         "ramps": [
             {
                 "uid": "ramp-very-fast",
@@ -84,12 +85,13 @@
             "uid": "RCAR-M3",
             "path": "/dev/snd/by-path/platform-sound@1",
             "params": {
-                "rate": 48000
+                "rate": 48000,
+                "format": "S24_LE"
             },
             "sink": {
                 "controls": {
                     "volume": {
-                        "name": "Digital Playback Volume1",
+                        "name": "DVC Out Playback Volume",
                         "value": 80
                     },
                     "mute": {
@@ -171,7 +173,8 @@
                 "volume": 60,
                 "mute": false,
                 "params": {
-                    "rate": 48000
+                    "rate": 48000,
+                    "format": "S16_LE"
                 }
             },
             {
@@ -181,7 +184,8 @@
                 "volume": 70,
                 "mute": false,
                 "params": {
-                    "rate": 48000
+                    "rate": 48000,
+                    "format": "S16_LE"
                 }
             },
             {
@@ -191,7 +195,8 @@
                 "volume": 60,
                 "mute": false,
                 "params": {
-                    "rate": 48000
+                    "rate": 48000,
+                    "format": "S16_LE"
                 }
             }
         ]
-- 
cgit 1.2.3-korg