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>
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From fd613a5d5dc7f023d7d983aee9d854fd3a41d669 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Thu, 9 Feb 2017 14:36:44 +0000
|
|
Subject: [PATCH] sound: Demote deferral errors to INFO level
|
|
|
|
At present there is no mechanism to specify driver load order,
|
|
which can lead to deferrals and repeated retries until successful.
|
|
Since this situation is expected, reduce the dmesg level to
|
|
INFO and mention that the operation will be retried.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
sound/soc/soc-core.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
--- a/sound/soc/soc-core.c
|
|
+++ b/sound/soc/soc-core.c
|
|
@@ -868,8 +868,8 @@ static int soc_bind_dai_link(struct snd_
|
|
cpu_dai_component.dai_name = dai_link->cpu_dai_name;
|
|
rtd->cpu_dai = snd_soc_find_dai(&cpu_dai_component);
|
|
if (!rtd->cpu_dai) {
|
|
- dev_info(card->dev, "ASoC: CPU DAI %s not registered\n",
|
|
- dai_link->cpu_dai_name);
|
|
+ dev_info(card->dev, "ASoC: CPU DAI %s not registered - will retry\n",
|
|
+ dai_link->cpu_dai_name);
|
|
goto _err_defer;
|
|
}
|
|
snd_soc_rtdcom_add(rtd, rtd->cpu_dai->component);
|
|
@@ -881,7 +881,7 @@ static int soc_bind_dai_link(struct snd_
|
|
for (i = 0; i < rtd->num_codecs; i++) {
|
|
codec_dais[i] = snd_soc_find_dai(&codecs[i]);
|
|
if (!codec_dais[i]) {
|
|
- dev_err(card->dev, "ASoC: CODEC DAI %s not registered\n",
|
|
+ dev_info(card->dev, "ASoC: CODEC DAI %s not registered - will retry\n",
|
|
codecs[i].dai_name);
|
|
goto _err_defer;
|
|
}
|