From ed0a47dc5077af44e92cd29b37d8f9ec680ddddd Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Thu, 21 Mar 2019 23:32:31 +0000
Subject: [PATCH] alarm/firmware-raspberrypi to 5-1

---
 alarm/firmware-raspberrypi/PKGBUILD        | 11 ++++++----
 alarm/firmware-raspberrypi/RPi-WM8804.conf | 24 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)
 create mode 100644 alarm/firmware-raspberrypi/RPi-WM8804.conf

diff --git a/alarm/firmware-raspberrypi/PKGBUILD b/alarm/firmware-raspberrypi/PKGBUILD
index 55741be9a..c1ebe4b47 100644
--- a/alarm/firmware-raspberrypi/PKGBUILD
+++ b/alarm/firmware-raspberrypi/PKGBUILD
@@ -3,7 +3,7 @@
 buildarch=28
 
 pkgname=firmware-raspberrypi
-pkgver=4
+pkgver=5
 pkgrel=1
 pkgdesc="Additional firmware for Raspberry Pi"
 arch=('any')
@@ -16,16 +16,19 @@ source=('https://archlinuxarm.org/builder/src/bcm43430/7.45.98.38/brcmfmac43430-
         'https://archlinuxarm.org/builder/src/bcm43455/7.45.154/brcmfmac43455-sdio.bin'
         'https://archlinuxarm.org/builder/src/bcm43455/7.45.154/brcmfmac43455-sdio.clm_blob'
         'https://archlinuxarm.org/builder/src/bcm43455/7.45.154/brcmfmac43455-sdio.txt'
-        'https://archlinuxarm.org/builder/src/bcm43455/BCM4345C0.hcd')
+        'https://archlinuxarm.org/builder/src/bcm43455/BCM4345C0.hcd'
+        'RPi-WM8804.conf')
 sha256sums=('996b7ef7cbdb8ea3855fa516acb57630ff03a449fd3bb23e84789f2f04b4faf5'
             'e4ce7ad5ce72406f958ed758539b65d958d1c0eb3e46e3f8e9f02b510d88e0b0'
             '8dd70b9003d39cb6175b4f3cd509666dad66ad23d3be1a68385817fb814c8930'
             '0f1817f50649df707f521dec9f2d5905e4c01939c8aabfa9a06b2ce0a36952ee'
             '8e2250518bc789e53109728c3c0a6124bc3801a75a1cb4966125753cf1f0252e'
             '15698c62457bcf25e60d063e6c666d6e1b7dacdf2b03e6d14ebbc619de6da6b7'
-            '1788c58ecedd61b380e0dd120844ed61e5fbbea0a58e84e6293685eb3384fddc')
+            '1788c58ecedd61b380e0dd120844ed61e5fbbea0a58e84e6293685eb3384fddc'
+            'f978fbc40db75ba3213a4472023496d0716706eb1a6f078f207ac027c5753f43')
 
 package() {
-  install -d "${pkgdir}/usr/lib/firmware/updates/brcm"
+  install -d "${pkgdir}/usr/lib/firmware/updates/brcm" "${pkgdir}/usr/share/alsa/cards/"
   install -m 0644 *.bin *.txt *.clm_blob *.hcd "${pkgdir}/usr/lib/firmware/updates/brcm"
+  install -m 0644 RPi-WM8804.conf "${pkgdir}/usr/share/alsa/cards/"
 }
diff --git a/alarm/firmware-raspberrypi/RPi-WM8804.conf b/alarm/firmware-raspberrypi/RPi-WM8804.conf
new file mode 100644
index 000000000..9a01e28ce
--- /dev/null
+++ b/alarm/firmware-raspberrypi/RPi-WM8804.conf
@@ -0,0 +1,24 @@
+<confdir:pcm/iec958.conf>
+RPi-WM8804.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
+    }
+}