From: Jiaxin Yu <jiaxin.yu@mediatek.com>
To: <broonie@kernel.org>, <andrzej.hajda@intel.com>,
<neil.armstrong@linaro.org>, <robert.foss@linaro.org>,
<Laurent.pinchart@ideasonboard.com>,
<kuninori.morimoto.gx@renesas.com>,
<angelogioacchino.delregno@collabora.com>,
<nfraprado@collabora.com>
Cc: <chunxu.li@mediatek.com>,
<ajye_huang@compal.corp-partner.google.com>,
<allen-kh.cheng@mediatek.com>, <dri-devel@lists.freedesktop.org>,
<alsa-devel@alsa-project.org>,
<linux-arm-kernel@lists.infradead.org>,
<linux-mediatek@lists.infradead.org>,
<linux-kernel@vger.kernel.org>,
<Project_Global_Chrome_Upstream_Group@mediatek.com>,
Jiaxin Yu <jiaxin.yu@mediatek.com>
Subject: [v3 1/3] ASoC: hdmi-codec: Add event handler for hdmi TX
Date: Mon, 31 Jul 2023 02:08:01 +0800 [thread overview]
Message-ID: <20230730180803.22570-2-jiaxin.yu@mediatek.com> (raw)
In-Reply-To: <20230730180803.22570-1-jiaxin.yu@mediatek.com>
If the speaker and hdmi are connect to the same port of I2S,
when try to switch to speaker playback, we will find that hdmi
is always turned on automatically. The connection as follows:
==> hdmi-codec ==> it6505(HDMI output)
DL1(FE) ==> I2S3(BE)
==> rt1015p(SPEAKER output)
So in order to separately control their power on/off, we have
added a dapm widget to notify each output. Also the machine driver
need add a _PIN_SWITCH() on the output of the device that will
cause DAPM to keep the device powered down when not in use.
The purpose of adding .trigger callback here is to enable hdmi-codec
to notify the dp output driver to power on or off device.
Signed-off-by: Jiaxin Yu <jiaxin.yu@mediatek.com>
---
include/sound/hdmi-codec.h | 6 ++++++
sound/soc/codecs/hdmi-codec.c | 32 ++++++++++++++++++++++++++++++--
2 files changed, 36 insertions(+), 2 deletions(-)
diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h
index 9b162ac1e08e..ea834a838754 100644
--- a/include/sound/hdmi-codec.h
+++ b/include/sound/hdmi-codec.h
@@ -81,6 +81,12 @@ struct hdmi_codec_ops {
struct hdmi_codec_daifmt *fmt,
struct hdmi_codec_params *hparms);
+ /*
+ * PCM trigger callback.
+ * Optional
+ */
+ int (*trigger)(struct device *dev, int cmd);
+
/*
* Shuts down the audio stream.
* Mandatory
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c
index d21f69f05342..6766b55c9b56 100644
--- a/sound/soc/codecs/hdmi-codec.c
+++ b/sound/soc/codecs/hdmi-codec.c
@@ -276,7 +276,31 @@ struct hdmi_codec_priv {
u8 iec_status[AES_IEC958_STATUS_SIZE];
};
+static int hdmi_tx_event(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol, int event)
+{
+ struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
+ struct hdmi_codec_priv *hcp = snd_soc_component_get_drvdata(component);
+
+ switch (event) {
+ case SND_SOC_DAPM_PRE_PMU:
+ if (hcp->hcd.ops->trigger)
+ hcp->hcd.ops->trigger(component->dev->parent, SNDRV_PCM_TRIGGER_START);
+ break;
+ case SND_SOC_DAPM_POST_PMD:
+ if (hcp->hcd.ops->trigger)
+ hcp->hcd.ops->trigger(component->dev->parent, SNDRV_PCM_TRIGGER_STOP);
+ break;
+ default:
+ break;
+ }
+
+ return 0;
+}
+
static const struct snd_soc_dapm_widget hdmi_widgets[] = {
+ SND_SOC_DAPM_OUT_DRV_E("SDB", SND_SOC_NOPM, 0, 0, NULL, 0, hdmi_tx_event,
+ SND_SOC_DAPM_POST_PMD | SND_SOC_DAPM_PRE_PMU),
SND_SOC_DAPM_OUTPUT("TX"),
SND_SOC_DAPM_OUTPUT("RX"),
};
@@ -831,9 +855,13 @@ static int hdmi_dai_probe(struct snd_soc_dai *dai)
struct hdmi_codec_daifmt *daifmt;
struct snd_soc_dapm_route route[] = {
{
- .sink = "TX",
+ .sink = "SDB",
.source = dai->driver->playback.stream_name,
},
+ {
+ .sink = "TX",
+ .source = "SDB",
+ },
{
.sink = dai->driver->capture.stream_name,
.source = "RX",
@@ -848,7 +876,7 @@ static int hdmi_dai_probe(struct snd_soc_dai *dai)
if (!route[i].source || !route[i].sink)
continue;
- ret = snd_soc_dapm_add_routes(dapm, &route[i], 1);
+ ret = snd_soc_dapm_add_routes(dapm, route, ARRAY_SIZE(route));
if (ret)
return ret;
}
--
2.25.1
next prev parent reply other threads:[~2023-07-30 18:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-30 18:08 [v3 0/3] ASoC: mediatek:mt8186: fix both the speaker and hdmi Jiaxin Yu
2023-07-30 18:08 ` Jiaxin Yu [this message]
2023-07-30 18:08 ` [v3 2/3] ASoC: mediatek: mt8186: correct the HDMI widgets Jiaxin Yu
2023-07-31 11:50 ` Mark Brown
2023-08-02 14:52 ` Jiaxin Yu (俞家鑫)
2023-08-02 16:38 ` Mark Brown
2023-08-03 7:20 ` Jiaxin Yu (俞家鑫)
2023-08-03 19:33 ` Mark Brown
2024-01-31 11:42 ` AngeloGioacchino Del Regno
2024-01-31 12:25 ` Jiaxin Yu (俞家鑫)
2024-01-31 12:37 ` AngeloGioacchino Del Regno
2023-07-30 18:08 ` [v3 3/3] drm/bridge: it6505: Add audio support Jiaxin Yu
2023-11-21 12:54 ` AngeloGioacchino Del Regno
2023-11-28 3:17 ` Chen-Yu Tsai
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230730180803.22570-2-jiaxin.yu@mediatek.com \
--to=jiaxin.yu@mediatek.com \
--cc=Laurent.pinchart@ideasonboard.com \
--cc=Project_Global_Chrome_Upstream_Group@mediatek.com \
--cc=ajye_huang@compal.corp-partner.google.com \
--cc=allen-kh.cheng@mediatek.com \
--cc=alsa-devel@alsa-project.org \
--cc=andrzej.hajda@intel.com \
--cc=angelogioacchino.delregno@collabora.com \
--cc=broonie@kernel.org \
--cc=chunxu.li@mediatek.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mediatek@lists.infradead.org \
--cc=neil.armstrong@linaro.org \
--cc=nfraprado@collabora.com \
--cc=robert.foss@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®