From ff25fa7745f04397456e8dc6baf7cbefd19cf215 Mon Sep 17 00:00:00 2001
From: Matthias Reichl <hias@horus.com>
Date: Sat, 25 Aug 2018 19:52:37 +0200
Subject: [PATCH] RPi: fix Alsa card confs for new driver on kernel 4.18

Signed-off-by: Matthias Reichl <hias@horus.com>
---
 .../usr/share/alsa/cards/HifiberryDigi.conf   | 24 -------------------
 .../usr/share/alsa/cards/IQAudIODigi.conf     | 24 -------------------
 .../usr/share/alsa/cards/JustBoomDigi.conf    | 24 -------------------
 .../{AlloDigiOne.conf => RPi-WM8804.conf}     |  2 +-
 4 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 projects/RPi/filesystem/usr/share/alsa/cards/HifiberryDigi.conf
 delete mode 100644 projects/RPi/filesystem/usr/share/alsa/cards/IQAudIODigi.conf
 delete mode 100644 projects/RPi/filesystem/usr/share/alsa/cards/JustBoomDigi.conf
 rename projects/RPi/filesystem/usr/share/alsa/cards/{AlloDigiOne.conf => RPi-WM8804.conf} (92%)

diff --git a/projects/RPi/filesystem/usr/share/alsa/cards/HifiberryDigi.conf b/projects/RPi/filesystem/usr/share/alsa/cards/HifiberryDigi.conf
deleted file mode 100644
index a277314988..0000000000
--- a/projects/RPi/filesystem/usr/share/alsa/cards/HifiberryDigi.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<confdir:pcm/iec958.conf>
-HifiberryDigi.pcm.iec958.0 {
-    @args [ CARD AES0 AES1 AES2 AES3 ]
-    @args.CARD {
-        type string
-    }
-    @args.AES0 {
-        type integer
-    }
-    @args.AES1 {
-        type integer
-    }
-    @args.AES2 {
-        type integer
-    }
-    @args.AES3 {
-        type integer
-    }
-    type hooks
-    slave.pcm {
-        type hw
-        card $CARD
-    }
-}
diff --git a/projects/RPi/filesystem/usr/share/alsa/cards/IQAudIODigi.conf b/projects/RPi/filesystem/usr/share/alsa/cards/IQAudIODigi.conf
deleted file mode 100644
index dd342062ae..0000000000
--- a/projects/RPi/filesystem/usr/share/alsa/cards/IQAudIODigi.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<confdir:pcm/iec958.conf>
-IQAudIODigi.pcm.iec958.0 {
-    @args [ CARD AES0 AES1 AES2 AES3 ]
-    @args.CARD {
-        type string
-    }
-    @args.AES0 {
-        type integer
-    }
-    @args.AES1 {
-        type integer
-    }
-    @args.AES2 {
-        type integer
-    }
-    @args.AES3 {
-        type integer
-    }
-    type hooks
-    slave.pcm {
-        type hw
-        card $CARD
-    }
-}
diff --git a/projects/RPi/filesystem/usr/share/alsa/cards/JustBoomDigi.conf b/projects/RPi/filesystem/usr/share/alsa/cards/JustBoomDigi.conf
deleted file mode 100644
index f598c680b2..0000000000
--- a/projects/RPi/filesystem/usr/share/alsa/cards/JustBoomDigi.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<confdir:pcm/iec958.conf>
-JustBoomDigi.pcm.iec958.0 {
-    @args [ CARD AES0 AES1 AES2 AES3 ]
-    @args.CARD {
-        type string
-    }
-    @args.AES0 {
-        type integer
-    }
-    @args.AES1 {
-        type integer
-    }
-    @args.AES2 {
-        type integer
-    }
-    @args.AES3 {
-        type integer
-    }
-    type hooks
-    slave.pcm {
-        type hw
-        card $CARD
-    }
-}
diff --git a/projects/RPi/filesystem/usr/share/alsa/cards/AlloDigiOne.conf b/projects/RPi/filesystem/usr/share/alsa/cards/RPi-WM8804.conf
similarity index 92%
rename from projects/RPi/filesystem/usr/share/alsa/cards/AlloDigiOne.conf
rename to projects/RPi/filesystem/usr/share/alsa/cards/RPi-WM8804.conf
index a3f4a32569..9a01e28ce0 100644
--- a/projects/RPi/filesystem/usr/share/alsa/cards/AlloDigiOne.conf
+++ b/projects/RPi/filesystem/usr/share/alsa/cards/RPi-WM8804.conf
@@ -1,5 +1,5 @@
 <confdir:pcm/iec958.conf>
-AlloDigiOne.pcm.iec958.0 {
+RPi-WM8804.pcm.iec958.0 {
     @args [ CARD AES0 AES1 AES2 AES3 ]
     @args.CARD {
         type string