mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 01:59:02 +00:00
7d7aa2fd92
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From 09ad53f0267e4b5433c27c77b3945d584ac0a6ba Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Tue, 22 Oct 2019 08:47:29 +0100
|
|
Subject: [PATCH] rpi-wm8804-soundcard: Fixed MCLKDIV for Allo Digione
|
|
|
|
The Allo Digione board wants a fixed MCLKDIV of 256.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/3296
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
sound/soc/bcm/rpi-wm8804-soundcard.c | 10 +++++++---
|
|
1 file changed, 7 insertions(+), 3 deletions(-)
|
|
|
|
--- a/sound/soc/bcm/rpi-wm8804-soundcard.c
|
|
+++ b/sound/soc/bcm/rpi-wm8804-soundcard.c
|
|
@@ -66,6 +66,11 @@ static struct gpio_desc *snd_clk44gpio;
|
|
static struct gpio_desc *snd_clk48gpio;
|
|
static int wm8804_samplerate = 0;
|
|
|
|
+/* Forward declarations */
|
|
+static struct snd_soc_dai_link snd_allo_digione_dai[];
|
|
+static struct snd_soc_card snd_rpi_wm8804;
|
|
+
|
|
+
|
|
#define CLK_44EN_RATE 22579200UL
|
|
#define CLK_48EN_RATE 24576000UL
|
|
|
|
@@ -90,11 +95,10 @@ static unsigned int snd_rpi_wm8804_enabl
|
|
static void snd_rpi_wm8804_clk_cfg(unsigned int samplerate,
|
|
struct wm8804_clk_cfg *clk_cfg)
|
|
{
|
|
- clk_cfg->mclk_freq = 0;
|
|
- clk_cfg->mclk_div = 1;
|
|
clk_cfg->sysclk_freq = 27000000;
|
|
|
|
- if (samplerate <= 96000) {
|
|
+ if (samplerate <= 96000 ||
|
|
+ snd_rpi_wm8804.dai_link == snd_allo_digione_dai) {
|
|
clk_cfg->mclk_freq = samplerate * 256;
|
|
clk_cfg->mclk_div = WM8804_MCLKDIV_256FS;
|
|
} else {
|