[packages/kernel] updated rpi-wm8804 patch; fixed config entry

[atler]

commit 798c76a118fd9bedac60c7b1ff4584509064771d
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Dec 30 19:50:06 2020 +0100

    updated rpi-wm8804 patch; fixed config entry

 kernel-arm.config |  2 +-
 rpi-wm8804.patch  | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/kernel-arm.config b/kernel-arm.config
index 6bb407d5..59ee184f 100644
--- a/kernel-arm.config
+++ b/kernel-arm.config
@@ -1064,9 +1064,9 @@ SMC91X arm=m
 SND_ARM arm=y
 SND_ARMAACI arm=m
 SND_AUDIO_GRAPH_CARD arm=m
-SND_BCM2708_SOC_HIFIBERRY_DIGI arm=m
 SND_BCM2835 arm=m
 SND_BCM2835_SOC_I2S arm=m
+SND_RPI_WM8804_SOUNDCARD arm=m
 SND_SOC_CPCAP arm=m
 SND_SOC_CX2072X arm=m
 SND_SOC_DA7213 arm=m
diff --git a/rpi-wm8804.patch b/rpi-wm8804.patch
index c557a9cc..8280db45 100644
--- a/rpi-wm8804.patch
+++ b/rpi-wm8804.patch
@@ -1,16 +1,15 @@
 --- linux-5.9.orig/sound/soc/bcm/Kconfig	2020-10-11 23:15:50.000000000 +0200
 +++ linux-5.9/sound/soc/bcm/Kconfig	2020-12-14 01:08:25.450035831 +0100
-@@ -26,3 +26,10 @@
+@@ -26,3 +26,9 @@
  	  DSL/PON chips (bcm63158, bcm63178)
  
  	  If you don't know what to do here, say N
 +
-+config SND_BCM2708_SOC_HIFIBERRY_DIGI
-+	tristate "Support for HifiBerry Digi"
-+	depends on SND_BCM2708_SOC_I2S || SND_BCM2835_SOC_I2S
-+	select SND_SOC_WM8804
++config SND_RPI_WM8804_SOUNDCARD
++	tristate "Support for Raspberry Pi generic WM8804 soundcards"
 +	help
-+	  Say Y or M if you want to add support for HifiBerry Digi S/PDIF output board.
++	  Say Y or M if you want to add support for the Raspberry Pi
++	  generic driver for WM8804 based soundcards.
 --- linux-5.9.orig/sound/soc/bcm/Makefile	2020-10-11 23:15:50.000000000 +0200
 +++ linux-5.9/sound/soc/bcm/Makefile	2020-12-14 01:05:51.274295380 +0100
 @@ -12,4 +12,8 @@
@@ -143,9 +142,9 @@
 +		struct snd_pcm_hw_params *params)
 +{
 +	struct snd_soc_pcm_runtime *rtd = substream->private_data;
-+	struct snd_soc_dai *codec_dai = rtd->codec_dai;
-+	struct snd_soc_component *component = rtd->codec_dai->component;
-+	struct snd_soc_dai *cpu_dai = rtd->cpu_dai;
++	struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0);
++	struct snd_soc_component *component = codec_dai->component;
++	struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0);
 +	int sampling_freq = 1;
 +	int ret;
 +	struct wm8804_clk_cfg clk_cfg;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/e4269853725c4006cfb2533f97ff3c3a716c2d1c