sugar/linux
1
0
Fork 0
Code Activity

ASoC: hdmi-codec: pass data to get_dai_id too

Browse Source 
The upcoming DRM connector HDMI codec implementation is going to use
codec-specific data in the .get_dai_id to get drm_connector. Pass data
to the callback, as it is done with other hdmi_codec_ops callbacks.

Acked-by: Mark Brown <broonie@kernel.org>
Tested-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241224-drm-bridge-hdmi-connector-v10-1-dc89577cd438@linaro.org
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
This commit is contained in:
Dmitry Baryshkov
2024-12-24 03:47:53 +02:00
parent fee7aaee11
commit 6af45d7df1
8 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/gpu/drm/bridge/adv7511/adv7511_audio.c
View File

@@ -204,7 +204,8 @@ static void audio_shutdown(struct device *dev, void *data)
}
static int adv7511_hdmi_i2s_get_dai_id(struct snd_soc_component *component,
struct device_node *endpoint)
struct device_node *endpoint,
void *data)
{
struct of_endpoint of_ep;
int ret;

3
drivers/gpu/drm/bridge/analogix/anx7625.c
View File

@@ -1952,7 +1952,8 @@ static void anx7625_audio_shutdown(struct device *dev, void *data)
}
static int anx7625_hdmi_i2s_get_dai_id(struct snd_soc_component *component,
struct device_node *endpoint)
struct device_node *endpoint,
void *data)
{
struct of_endpoint of_ep;
int ret;

3
drivers/gpu/drm/bridge/lontium-lt9611.c
View File

@@ -1047,7 +1047,8 @@ static void lt9611_audio_shutdown(struct device *dev, void *data)
}
static int lt9611_hdmi_i2s_get_dai_id(struct snd_soc_component *component,
struct device_node *endpoint)
struct device_node *endpoint,
void *data)
{
struct of_endpoint of_ep;
int ret;

3
drivers/gpu/drm/bridge/lontium-lt9611uxc.c
View File

@@ -522,7 +522,8 @@ static void lt9611uxc_audio_shutdown(struct device *dev, void *data)
}
static int lt9611uxc_hdmi_i2s_get_dai_id(struct snd_soc_component *component,
struct device_node *endpoint)
struct device_node *endpoint,
void *data)
{
struct of_endpoint of_ep;
int ret;

3
drivers/gpu/drm/bridge/sii902x.c
View File

@@ -815,7 +815,8 @@ static int sii902x_audio_get_eld(struct device *dev, void *data,
}
static int sii902x_audio_get_dai_id(struct snd_soc_component *component,
struct device_node *endpoint)
struct device_node *endpoint,
void *data)
{
struct of_endpoint of_ep;
int ret;

3
drivers/gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c
View File

@@ -148,7 +148,8 @@ static int dw_hdmi_i2s_get_eld(struct device *dev, void *data, uint8_t *buf,
}
static int dw_hdmi_i2s_get_dai_id(struct snd_soc_component *component,
struct device_node *endpoint)
struct device_node *endpoint,
void *data)
{
struct of_endpoint of_ep;
int ret;

3
include/sound/hdmi-codec.h
View File

@@ -105,7 +105,8 @@ struct hdmi_codec_ops {
* Optional
*/
int (*get_dai_id)(struct snd_soc_component *comment,
struct device_node *endpoint);
struct device_node *endpoint,
void *data);
/*
* Hook callback function to handle connector plug event.

2
sound/soc/codecs/hdmi-codec.c
View File

@@ -995,7 +995,7 @@ static int hdmi_of_xlate_dai_id(struct snd_soc_component *component,
int ret = -ENOTSUPP; /* see snd_soc_get_dai_id() */
if (hcp->hcd.ops->get_dai_id)
ret = hcp->hcd.ops->get_dai_id(component, endpoint);
ret = hcp->hcd.ops->get_dai_id(component, endpoint, hcp->hcd.data);
return ret;
}