leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge commit 'efc9194bcff84' ("ASoC: hdmi-codec: callback function will be called with private data") into drm-tda998x-devel

Browse Source 
This commit is required for the TDA998x ASoC support, so to avoid build
errors, merge this commit into this branch prior to commiting Jiri's
patches.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2016-09-07 13:08:48 +01:00
commit 3ef500a53f
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,18 +53,19 @@ struct hdmi_codec_params {
int channels; int channels;
}; };
struct hdmi_codec_pdata;
struct hdmi_codec_ops { struct hdmi_codec_ops {
/* /*
* Called when ASoC starts an audio stream setup. * Called when ASoC starts an audio stream setup.
* Optional * Optional
*/ */
int (*audio_startup)(struct device *dev); int (*audio_startup)(struct device *dev, void *data);
/* /*
* Configures HDMI-encoder for audio stream. * Configures HDMI-encoder for audio stream.
* Mandatory * Mandatory
*/ */
int (*hw_params)(struct device *dev, int (*hw_params)(struct device *dev, void *data,
struct hdmi_codec_daifmt *fmt, struct hdmi_codec_daifmt *fmt,
struct hdmi_codec_params *hparms); struct hdmi_codec_params *hparms);
@ -72,19 +73,20 @@ struct hdmi_codec_ops {
* Shuts down the audio stream. * Shuts down the audio stream.
* Mandatory * Mandatory
*/ */
void (*audio_shutdown)(struct device *dev); void (*audio_shutdown)(struct device *dev, void *data);
/* /*
* Mute/unmute HDMI audio stream. * Mute/unmute HDMI audio stream.
* Optional * Optional
*/ */
int (*digital_mute)(struct device *dev, bool enable); int (*digital_mute)(struct device *dev, void *data, bool enable);
/* /*
* Provides EDID-Like-Data from connected HDMI device. * Provides EDID-Like-Data from connected HDMI device.
* Optional * Optional
*/ */
int (*get_eld)(struct device *dev, uint8_t *buf, size_t len); int (*get_eld)(struct device *dev, void *data,
uint8_t *buf, size_t len);
}; };
/* HDMI codec initalization data */ /* HDMI codec initalization data */
@ -93,6 +95,7 @@ struct hdmi_codec_pdata {
uint i2s:1; uint i2s:1;
uint spdif:1; uint spdif:1;
int max_i2s_channels; int max_i2s_channels;
void *data;
}; };
#define HDMI_CODEC_DRV_NAME "hdmi-audio-codec" #define HDMI_CODEC_DRV_NAME "hdmi-audio-codec"

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

@ -112,7 +112,7 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream,
return ret; return ret;
if (hcp->hcd.ops->audio_startup) { if (hcp->hcd.ops->audio_startup) {
ret = hcp->hcd.ops->audio_startup(dai->dev->parent); ret = hcp->hcd.ops->audio_startup(dai->dev->parent, hcp->hcd.data);
if (ret) { if (ret) {
mutex_lock(&hcp->current_stream_lock); mutex_lock(&hcp->current_stream_lock);
hcp->current_stream = NULL; hcp->current_stream = NULL;
@ -122,8 +122,8 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream,
} }
if (hcp->hcd.ops->get_eld) { if (hcp->hcd.ops->get_eld) {
ret = hcp->hcd.ops->get_eld(dai->dev->parent, hcp->eld, ret = hcp->hcd.ops->get_eld(dai->dev->parent, hcp->hcd.data,
sizeof(hcp->eld)); hcp->eld, sizeof(hcp->eld));
if (!ret) { if (!ret) {
ret = snd_pcm_hw_constraint_eld(substream->runtime, ret = snd_pcm_hw_constraint_eld(substream->runtime,
@ -144,7 +144,7 @@ static void hdmi_codec_shutdown(struct snd_pcm_substream *substream,
WARN_ON(hcp->current_stream != substream); WARN_ON(hcp->current_stream != substream);
hcp->hcd.ops->audio_shutdown(dai->dev->parent); hcp->hcd.ops->audio_shutdown(dai->dev->parent, hcp->hcd.data);
mutex_lock(&hcp->current_stream_lock); mutex_lock(&hcp->current_stream_lock);
hcp->current_stream = NULL; hcp->current_stream = NULL;
@ -195,8 +195,8 @@ static int hdmi_codec_hw_params(struct snd_pcm_substream *substream,
hp.sample_rate = params_rate(params); hp.sample_rate = params_rate(params);
hp.channels = params_channels(params); hp.channels = params_channels(params);
return hcp->hcd.ops->hw_params(dai->dev->parent, &hcp->daifmt[dai->id], return hcp->hcd.ops->hw_params(dai->dev->parent, hcp->hcd.data,
&hp); &hcp->daifmt[dai->id], &hp);
} }
static int hdmi_codec_set_fmt(struct snd_soc_dai *dai, static int hdmi_codec_set_fmt(struct snd_soc_dai *dai,
@ -280,7 +280,8 @@ static int hdmi_codec_digital_mute(struct snd_soc_dai *dai, int mute)
dev_dbg(dai->dev, "%s()\n", __func__); dev_dbg(dai->dev, "%s()\n", __func__);
if (hcp->hcd.ops->digital_mute) if (hcp->hcd.ops->digital_mute)
return hcp->hcd.ops->digital_mute(dai->dev->parent, mute); return hcp->hcd.ops->digital_mute(dai->dev->parent,
hcp->hcd.data, mute);
return 0; return 0;
} }