armbian/linux
0
0
Fork 0
mirror of https://github.com/armbian/linux.git synced 2026-01-06 10:13:00 -08:00
Code Issues Packages Projects Releases Wiki Activity

FROMLIST: ASoC: hdmi-codec: Use HDMI notifications to add jack support

Browse Source 
Use HDMI connection / disconnection notifications to update an ALSA
jack object. Also make a copy of the ELD block after every change.

Conflicts:
	sound/soc/codecs/Kconfig
	sound/soc/codecs/hdmi-codec.c

(am from https://patchwork.kernel.org/patch/8887251/)
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Change-Id: I5f4a931c3b91c2b230ce5a61b60f191628d93105
This commit is contained in:
Philipp Zabel
2016-04-20 11:00:00 +02:00
committed by Huang, Tao
parent 0e3070da06
commit bbf5af445f
3 changed files with 85 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,6 +98,12 @@ struct hdmi_codec_pdata {
void *data;
};
struct snd_soc_codec;
struct snd_soc_jack;
int hdmi_codec_set_jack_detect(struct snd_soc_codec *codec,
struct snd_soc_jack *jack);
#define HDMI_CODEC_DRV_NAME "hdmi-audio-codec"
#endif /* __HDMI_CODEC_H__ */

1
sound/soc/codecs/Kconfig
View File

@@ -472,6 +472,7 @@ config SND_SOC_ES8323
config SND_SOC_HDMI_CODEC
tristate
select HDMI_NOTIFIERS
select SND_PCM_ELD
select SND_PCM_IEC958
select HDMI

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

@@ -12,9 +12,12 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*/
#include <linux/hdmi-notifier.h>
#include <linux/module.h>
#include <linux/notifier.h>
#include <linux/string.h>
#include <sound/core.h>
#include <sound/jack.h>
#include <sound/pcm.h>
#include <sound/pcm_params.h>
#include <sound/soc.h>
@@ -27,11 +30,16 @@
struct hdmi_codec_priv {
struct hdmi_codec_pdata hcd;
struct snd_soc_dai_driver *daidrv;
struct snd_soc_jack *jack;
struct hdmi_codec_daifmt daifmt[2];
struct mutex current_stream_lock;
struct snd_pcm_substream *current_stream;
struct snd_pcm_hw_constraint_list ratec;
struct mutex eld_lock;
uint8_t eld[MAX_ELD_BYTES];
struct device *dev;
struct notifier_block nb;
unsigned int jack_status;
};
static const struct snd_soc_dapm_widget hdmi_widgets[] = {
@@ -103,7 +111,7 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
struct hdmi_codec_priv *hcp = snd_soc_dai_get_drvdata(dai);
int ret = 0;
int ret;
dev_dbg(dai->dev, "%s()\n", __func__);
@@ -122,17 +130,16 @@ static int hdmi_codec_startup(struct snd_pcm_substream *substream,
}
if (hcp->hcd.ops->get_eld) {
mutex_lock(&hcp->eld_lock);
ret = hcp->hcd.ops->get_eld(dai->dev->parent, hcp->hcd.data,
hcp->eld, sizeof(hcp->eld));
if (!ret) {
if (!ret)
ret = snd_pcm_hw_constraint_eld(substream->runtime,
hcp->eld);
if (ret)
return ret;
}
mutex_unlock(&hcp->eld_lock);
}
return 0;
return ret;
}
static void hdmi_codec_shutdown(struct snd_pcm_substream *substream,
@@ -355,6 +362,63 @@ static struct snd_soc_codec_driver hdmi_codec = {
.num_dapm_routes = ARRAY_SIZE(hdmi_routes),
};
static void hdmi_codec_jack_report(struct hdmi_codec_priv *hcp,
unsigned int jack_status)
{
if (!hcp->jack)
return;
if (jack_status != hcp->jack_status) {
snd_soc_jack_report(hcp->jack, jack_status, SND_JACK_LINEOUT);
hcp->jack_status = jack_status;
}
}
static int hdmi_codec_notify(struct notifier_block *nb, unsigned long event,
void *data)
{
struct hdmi_codec_priv *hcp = container_of(nb, struct hdmi_codec_priv,
nb);
union hdmi_event *event_block = data;
if (hcp->dev->parent != event_block->base.source)
return NOTIFY_OK;
if (!hcp->jack)
return NOTIFY_OK;
switch (event) {
case HDMI_CONNECTED:
hdmi_codec_jack_report(hcp, SND_JACK_LINEOUT);
break;
case HDMI_DISCONNECTED:
hdmi_codec_jack_report(hcp, 0);
break;
case HDMI_NEW_ELD:
hdmi_codec_jack_report(hcp, SND_JACK_LINEOUT);
mutex_lock(&hcp->eld_lock);
memcpy(hcp->eld, event_block->eld.eld, sizeof(hcp->eld));
mutex_unlock(&hcp->eld_lock);
break;
}
return NOTIFY_OK;
}
int hdmi_codec_set_jack_detect(struct snd_soc_codec *codec,
struct snd_soc_jack *jack)
{
struct hdmi_codec_priv *hcp = snd_soc_codec_get_drvdata(codec);
hcp->jack = jack;
hcp->nb.notifier_call = hdmi_codec_notify;
hdmi_register_notifier(&hcp->nb);
return 0;
}
EXPORT_SYMBOL_GPL(hdmi_codec_set_jack_detect);
static int hdmi_codec_probe(struct platform_device *pdev)
{
struct hdmi_codec_pdata *hcd = pdev->dev.platform_data;
@@ -383,6 +447,7 @@ static int hdmi_codec_probe(struct platform_device *pdev)
hcp->hcd = *hcd;
mutex_init(&hcp->current_stream_lock);
mutex_init(&hcp->eld_lock);
hcp->daidrv = devm_kzalloc(dev, dai_count * sizeof(*hcp->daidrv),
GFP_KERNEL);
@@ -399,6 +464,8 @@ static int hdmi_codec_probe(struct platform_device *pdev)
if (hcd->spdif)
hcp->daidrv[i] = hdmi_spdif_dai;
dev_set_drvdata(dev, hcp);
ret = snd_soc_register_codec(dev, &hdmi_codec, hcp->daidrv,
dai_count);
if (ret) {
@@ -407,12 +474,16 @@ static int hdmi_codec_probe(struct platform_device *pdev)
return ret;
}
dev_set_drvdata(dev, hcp);
hcp->dev = dev;
return 0;
}
static int hdmi_codec_remove(struct platform_device *pdev)
{
struct hdmi_codec_priv *hcp = platform_get_drvdata(pdev);
hdmi_unregister_notifier(&hcp->nb);
snd_soc_unregister_codec(&pdev->dev);
return 0;
}