mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
8299d1f057
Rebased RPi foundation patches on linux 5.10.59, removed applied and reverted patches, wireless patches and defconfig patches. bcm2708: boot tested on RPi B+ v1.2 bcm2709: boot tested on RPi 4B v1.1 4G bcm2711: boot tested on RPi 4B v1.1 4G Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
114 lines
3.5 KiB
Diff
114 lines
3.5 KiB
Diff
From 011a6244136c86e03c77866d6ef9b8eac65fc575 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Wed, 28 Apr 2021 15:29:51 +0200
|
|
Subject: [PATCH] ASoC: hdmi-codec: Add iec958 controls
|
|
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
sound/soc/codecs/hdmi-codec.c | 66 +++++++++++++++++++++++++++++++++--
|
|
1 file changed, 64 insertions(+), 2 deletions(-)
|
|
|
|
--- a/sound/soc/codecs/hdmi-codec.c
|
|
+++ b/sound/soc/codecs/hdmi-codec.c
|
|
@@ -278,6 +278,7 @@ struct hdmi_codec_priv {
|
|
bool busy;
|
|
struct snd_soc_jack *jack;
|
|
unsigned int jack_status;
|
|
+ u8 iec_status[5];
|
|
};
|
|
|
|
static const struct snd_soc_dapm_widget hdmi_widgets[] = {
|
|
@@ -385,6 +386,47 @@ static int hdmi_codec_chmap_ctl_get(stru
|
|
return 0;
|
|
}
|
|
|
|
+static int hdmi_codec_iec958_info(struct snd_kcontrol *kcontrol,
|
|
+ struct snd_ctl_elem_info *uinfo)
|
|
+{
|
|
+ uinfo->type = SNDRV_CTL_ELEM_TYPE_IEC958;
|
|
+ uinfo->count = 1;
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int hdmi_codec_iec958_default_get(struct snd_kcontrol *kcontrol,
|
|
+ struct snd_ctl_elem_value *ucontrol)
|
|
+{
|
|
+ struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
|
|
+ struct hdmi_codec_priv *hcp = snd_soc_component_get_drvdata(component);
|
|
+
|
|
+ memcpy(ucontrol->value.iec958.status, hcp->iec_status,
|
|
+ sizeof(hcp->iec_status));
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int hdmi_codec_iec958_default_put(struct snd_kcontrol *kcontrol,
|
|
+ struct snd_ctl_elem_value *ucontrol)
|
|
+{
|
|
+ struct snd_soc_component *component = snd_kcontrol_chip(kcontrol);
|
|
+ struct hdmi_codec_priv *hcp = snd_soc_component_get_drvdata(component);
|
|
+
|
|
+ memcpy(hcp->iec_status, ucontrol->value.iec958.status,
|
|
+ sizeof(hcp->iec_status));
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
+static int hdmi_codec_iec958_mask_get(struct snd_kcontrol *kcontrol,
|
|
+ struct snd_ctl_elem_value *ucontrol)
|
|
+{
|
|
+ memset(ucontrol->value.iec958.status, 0xff,
|
|
+ sizeof_field(struct hdmi_codec_priv, iec_status));
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
static int hdmi_codec_startup(struct snd_pcm_substream *substream,
|
|
struct snd_soc_dai *dai)
|
|
{
|
|
@@ -458,8 +500,9 @@ static int hdmi_codec_hw_params(struct s
|
|
params_width(params), params_rate(params),
|
|
params_channels(params));
|
|
|
|
- ret = snd_pcm_create_iec958_consumer_hw_params(params, hp.iec.status,
|
|
- sizeof(hp.iec.status));
|
|
+ memcpy(hp.iec.status, hcp->iec_status, sizeof(hp->iec_status));
|
|
+ ret = snd_pcm_fill_iec958_consumer_hw_params(params, hp.iec.status,
|
|
+ sizeof(hp.iec.status));
|
|
if (ret < 0) {
|
|
dev_err(dai->dev, "Creating IEC958 channel status failed %d\n",
|
|
ret);
|
|
@@ -621,6 +664,20 @@ static const struct snd_soc_dai_ops hdmi
|
|
|
|
struct snd_kcontrol_new hdmi_codec_controls[] = {
|
|
{
|
|
+ .access = SNDRV_CTL_ELEM_ACCESS_READ,
|
|
+ .iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
|
+ .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, MASK),
|
|
+ .info = hdmi_codec_iec958_info,
|
|
+ .get = hdmi_codec_iec958_mask_get,
|
|
+ },
|
|
+ {
|
|
+ .iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
|
+ .name = SNDRV_CTL_NAME_IEC958("", PLAYBACK, DEFAULT),
|
|
+ .info = hdmi_codec_iec958_info,
|
|
+ .get = hdmi_codec_iec958_default_get,
|
|
+ .put = hdmi_codec_iec958_default_put,
|
|
+ },
|
|
+ {
|
|
.access = (SNDRV_CTL_ELEM_ACCESS_READ |
|
|
SNDRV_CTL_ELEM_ACCESS_VOLATILE),
|
|
.iface = SNDRV_CTL_ELEM_IFACE_PCM,
|
|
@@ -845,6 +902,11 @@ static int hdmi_codec_probe(struct platf
|
|
hcp->hcd = *hcd;
|
|
mutex_init(&hcp->lock);
|
|
|
|
+ ret = snd_pcm_create_iec958_consumer_default(hcp->iec_status,
|
|
+ sizeof(hcp->iec_status));
|
|
+ if (ret < 0)
|
|
+ return ret;
|
|
+
|
|
daidrv = devm_kcalloc(dev, dai_count, sizeof(*daidrv), GFP_KERNEL);
|
|
if (!daidrv)
|
|
return -ENOMEM;
|