* [alsa-devel] [PATCH 0/4] ASoC: mediatek: mt8183-da7219: pick fixes from mt8183-mt6358
@ 2020-02-03 8:27 Tzung-Bi Shih
2020-02-03 8:27 ` [alsa-devel] [PATCH 1/4] ASoC: mediatek: mt8183-da7219: change supported formats of DL2 and UL1 Tzung-Bi Shih
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Tzung-Bi Shih @ 2020-02-03 8:27 UTC (permalink / raw)
To: broonie; +Cc: tzungbi, alsa-devel, dgreid, cychiang
Cherry-picks fixes from mt8183-mt6358-ts3a227-max98357 machine driver.
The 1st patch from commit 1df1e5457cd1 ("ASoC: Mediatek: MT8183: change
supported formats of DL2 and UL1").
The 2nd patch from commit 6191cbde5ff0 ("ASoC: mediatek: mt8183: switch
tdm pins gpio function when playback on or off").
The 3rd patch from commit 8e58c521bcb8 ("ASoC: mediatek: mt8183: tdm hw
support tdm out and 8ch i2s out").
The 4th patch squashes the following:
- commit 63ba8e4d04ab ("ASoC: mediatek: mt8183: move card registration
to the end of probe")
- commit 95d779b4b8e7 ("ASoC: mediatek: mt8183: move headset jack to
card-specific storage")
- commit e5b3ae3e8c47 ("ASoC: mediatek: mt8183: fix space issues")
Tzung-Bi Shih (4):
ASoC: mediatek: mt8183-da7219: change supported formats of DL2 and UL1
ASoC: mediatek: mt8183-da7219: pull TDM GPIO pins down when probed
ASoC: mediatek: mt8183-da7219: support TDM out and 8ch I2S out
ASoC: mediatek: mt8183-da7219: apply some refactors
.../mediatek/mt8183/mt8183-da7219-max98357.c | 164 ++++++++++++++++--
1 file changed, 147 insertions(+), 17 deletions(-)
--
2.25.0.341.g760bfbb309-goog
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 5+ messages in thread
* [alsa-devel] [PATCH 1/4] ASoC: mediatek: mt8183-da7219: change supported formats of DL2 and UL1
2020-02-03 8:27 [alsa-devel] [PATCH 0/4] ASoC: mediatek: mt8183-da7219: pick fixes from mt8183-mt6358 Tzung-Bi Shih
@ 2020-02-03 8:27 ` Tzung-Bi Shih
2020-02-03 8:27 ` [alsa-devel] [PATCH 2/4] ASoC: mediatek: mt8183-da7219: pull TDM GPIO pins down when probed Tzung-Bi Shih
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Tzung-Bi Shih @ 2020-02-03 8:27 UTC (permalink / raw)
To: broonie; +Cc: tzungbi, alsa-devel, dgreid, cychiang
DL2 and UL1 are for BTSCO. Provides only 16-bit, mono, 8kHz and
16kHz to userspace.
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
.../mediatek/mt8183/mt8183-da7219-max98357.c | 42 +++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
index c65493721e90..b7d4bfd04b37 100644
--- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
@@ -116,6 +116,46 @@ static int mt8183_i2s_hw_params_fixup(struct snd_soc_pcm_runtime *rtd,
return 0;
}
+static int
+mt8183_da7219_max98357_bt_sco_startup(
+ struct snd_pcm_substream *substream)
+{
+ static const unsigned int rates[] = {
+ 8000, 16000
+ };
+ static const struct snd_pcm_hw_constraint_list constraints_rates = {
+ .count = ARRAY_SIZE(rates),
+ .list = rates,
+ .mask = 0,
+ };
+ static const unsigned int channels[] = {
+ 1,
+ };
+ static const struct snd_pcm_hw_constraint_list constraints_channels = {
+ .count = ARRAY_SIZE(channels),
+ .list = channels,
+ .mask = 0,
+ };
+
+ struct snd_pcm_runtime *runtime = substream->runtime;
+
+ snd_pcm_hw_constraint_list(runtime, 0,
+ SNDRV_PCM_HW_PARAM_RATE, &constraints_rates);
+ runtime->hw.channels_max = 1;
+ snd_pcm_hw_constraint_list(runtime, 0,
+ SNDRV_PCM_HW_PARAM_CHANNELS,
+ &constraints_channels);
+
+ runtime->hw.formats = SNDRV_PCM_FMTBIT_S16_LE;
+ snd_pcm_hw_constraint_msbits(runtime, 0, 16, 16);
+
+ return 0;
+}
+
+static const struct snd_soc_ops mt8183_da7219_max98357_bt_sco_ops = {
+ .startup = mt8183_da7219_max98357_bt_sco_startup,
+};
+
/* FE */
SND_SOC_DAILINK_DEFS(playback1,
DAILINK_COMP_ARRAY(COMP_CPU("DL1")),
@@ -222,6 +262,7 @@ static struct snd_soc_dai_link mt8183_da7219_max98357_dai_links[] = {
SND_SOC_DPCM_TRIGGER_PRE},
.dynamic = 1,
.dpcm_playback = 1,
+ .ops = &mt8183_da7219_max98357_bt_sco_ops,
SND_SOC_DAILINK_REG(playback2),
},
{
@@ -240,6 +281,7 @@ static struct snd_soc_dai_link mt8183_da7219_max98357_dai_links[] = {
SND_SOC_DPCM_TRIGGER_PRE},
.dynamic = 1,
.dpcm_capture = 1,
+ .ops = &mt8183_da7219_max98357_bt_sco_ops,
SND_SOC_DAILINK_REG(capture1),
},
{
--
2.25.0.341.g760bfbb309-goog
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [alsa-devel] [PATCH 2/4] ASoC: mediatek: mt8183-da7219: pull TDM GPIO pins down when probed
2020-02-03 8:27 [alsa-devel] [PATCH 0/4] ASoC: mediatek: mt8183-da7219: pick fixes from mt8183-mt6358 Tzung-Bi Shih
2020-02-03 8:27 ` [alsa-devel] [PATCH 1/4] ASoC: mediatek: mt8183-da7219: change supported formats of DL2 and UL1 Tzung-Bi Shih
@ 2020-02-03 8:27 ` Tzung-Bi Shih
2020-02-03 8:27 ` [alsa-devel] [PATCH 3/4] ASoC: mediatek: mt8183-da7219: support TDM out and 8ch I2S out Tzung-Bi Shih
2020-02-03 8:27 ` [alsa-devel] [PATCH 4/4] ASoC: mediatek: mt8183-da7219: apply some refactors Tzung-Bi Shih
3 siblings, 0 replies; 5+ messages in thread
From: Tzung-Bi Shih @ 2020-02-03 8:27 UTC (permalink / raw)
To: broonie; +Cc: tzungbi, alsa-devel, dgreid, cychiang
1. Switch TDM GPIO pins according to playback on or off.
2. Pull TDM GPIO pins down when probed to avoid current leakage.
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
.../mediatek/mt8183/mt8183-da7219-max98357.c | 104 +++++++++++++++++-
1 file changed, 98 insertions(+), 6 deletions(-)
diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
index b7d4bfd04b37..450fb1efa239 100644
--- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
@@ -18,6 +18,22 @@
static struct snd_soc_jack headset_jack;
+enum PINCTRL_PIN_STATE {
+ PIN_STATE_DEFAULT = 0,
+ PIN_TDM_OUT_ON,
+ PIN_TDM_OUT_OFF,
+ PIN_STATE_MAX
+};
+
+static const char * const mt8183_pin_str[PIN_STATE_MAX] = {
+ "default", "aud_tdm_out_on", "aud_tdm_out_off",
+};
+
+struct mt8183_da7219_max98357_priv {
+ struct pinctrl *pinctrl;
+ struct pinctrl_state *pin_states[PIN_STATE_MAX];
+};
+
static int mt8183_mt6358_i2s_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params)
{
@@ -244,6 +260,47 @@ SND_SOC_DAILINK_DEFS(tdm,
DAILINK_COMP_ARRAY(COMP_DUMMY()),
DAILINK_COMP_ARRAY(COMP_EMPTY()));
+static int mt8183_da7219_tdm_startup(struct snd_pcm_substream *substream)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct mt8183_da7219_max98357_priv *priv =
+ snd_soc_card_get_drvdata(rtd->card);
+ int ret;
+
+ if (IS_ERR(priv->pin_states[PIN_TDM_OUT_ON]))
+ return PTR_ERR(priv->pin_states[PIN_TDM_OUT_ON]);
+
+ ret = pinctrl_select_state(priv->pinctrl,
+ priv->pin_states[PIN_TDM_OUT_ON]);
+ if (ret)
+ dev_err(rtd->card->dev, "%s failed to select state %d\n",
+ __func__, ret);
+
+ return ret;
+}
+
+static void mt8183_da7219_tdm_shutdown(struct snd_pcm_substream *substream)
+{
+ struct snd_soc_pcm_runtime *rtd = substream->private_data;
+ struct mt8183_da7219_max98357_priv *priv =
+ snd_soc_card_get_drvdata(rtd->card);
+ int ret;
+
+ if (IS_ERR(priv->pin_states[PIN_TDM_OUT_OFF]))
+ return;
+
+ ret = pinctrl_select_state(priv->pinctrl,
+ priv->pin_states[PIN_TDM_OUT_OFF]);
+ if (ret)
+ dev_err(rtd->card->dev, "%s failed to select state %d\n",
+ __func__, ret);
+}
+
+static struct snd_soc_ops mt8183_da7219_tdm_ops = {
+ .startup = mt8183_da7219_tdm_startup,
+ .shutdown = mt8183_da7219_tdm_shutdown,
+};
+
static struct snd_soc_dai_link mt8183_da7219_max98357_dai_links[] = {
/* FE */
{
@@ -395,6 +452,8 @@ static struct snd_soc_dai_link mt8183_da7219_max98357_dai_links[] = {
.no_pcm = 1,
.dpcm_playback = 1,
.ignore_suspend = 1,
+ .be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
+ .ops = &mt8183_da7219_tdm_ops,
SND_SOC_DAILINK_REG(tdm),
},
};
@@ -451,7 +510,7 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)
struct snd_soc_card *card = &mt8183_da7219_max98357_card;
struct device_node *platform_node;
struct snd_soc_dai_link *dai_link;
- struct pinctrl *default_pins;
+ struct mt8183_da7219_max98357_priv *priv;
int ret, i;
card->dev = &pdev->dev;
@@ -485,12 +544,45 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)
return ret;
}
- default_pins =
- devm_pinctrl_get_select(&pdev->dev, PINCTRL_STATE_DEFAULT);
- if (IS_ERR(default_pins)) {
- dev_err(&pdev->dev, "%s set pins failed\n",
+ priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
+
+ snd_soc_card_set_drvdata(card, priv);
+
+ priv->pinctrl = devm_pinctrl_get(&pdev->dev);
+ if (IS_ERR(priv->pinctrl)) {
+ dev_err(&pdev->dev, "%s devm_pinctrl_get failed\n",
__func__);
- return PTR_ERR(default_pins);
+ return PTR_ERR(priv->pinctrl);
+ }
+
+ for (i = 0; i < PIN_STATE_MAX; i++) {
+ priv->pin_states[i] = pinctrl_lookup_state(priv->pinctrl,
+ mt8183_pin_str[i]);
+ if (IS_ERR(priv->pin_states[i])) {
+ ret = PTR_ERR(priv->pin_states[i]);
+ dev_info(&pdev->dev, "%s Can't find pin state %s %d\n",
+ __func__, mt8183_pin_str[i], ret);
+ }
+ }
+
+ if (!IS_ERR(priv->pin_states[PIN_TDM_OUT_OFF])) {
+ ret = pinctrl_select_state(priv->pinctrl,
+ priv->pin_states[PIN_TDM_OUT_OFF]);
+ if (ret)
+ dev_info(&pdev->dev,
+ "%s failed to select state %d\n",
+ __func__, ret);
+ }
+
+ if (!IS_ERR(priv->pin_states[PIN_STATE_DEFAULT])) {
+ ret = pinctrl_select_state(priv->pinctrl,
+ priv->pin_states[PIN_STATE_DEFAULT]);
+ if (ret)
+ dev_info(&pdev->dev,
+ "%s failed to select state %d\n",
+ __func__, ret);
}
return ret;
--
2.25.0.341.g760bfbb309-goog
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [alsa-devel] [PATCH 3/4] ASoC: mediatek: mt8183-da7219: support TDM out and 8ch I2S out
2020-02-03 8:27 [alsa-devel] [PATCH 0/4] ASoC: mediatek: mt8183-da7219: pick fixes from mt8183-mt6358 Tzung-Bi Shih
2020-02-03 8:27 ` [alsa-devel] [PATCH 1/4] ASoC: mediatek: mt8183-da7219: change supported formats of DL2 and UL1 Tzung-Bi Shih
2020-02-03 8:27 ` [alsa-devel] [PATCH 2/4] ASoC: mediatek: mt8183-da7219: pull TDM GPIO pins down when probed Tzung-Bi Shih
@ 2020-02-03 8:27 ` Tzung-Bi Shih
2020-02-03 8:27 ` [alsa-devel] [PATCH 4/4] ASoC: mediatek: mt8183-da7219: apply some refactors Tzung-Bi Shih
3 siblings, 0 replies; 5+ messages in thread
From: Tzung-Bi Shih @ 2020-02-03 8:27 UTC (permalink / raw)
To: broonie; +Cc: tzungbi, alsa-devel, dgreid, cychiang
Supports TDM out and 8ch I2S out.
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
index 450fb1efa239..7052210e8325 100644
--- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
@@ -450,6 +450,9 @@ static struct snd_soc_dai_link mt8183_da7219_max98357_dai_links[] = {
{
.name = "TDM",
.no_pcm = 1,
+ .dai_fmt = SND_SOC_DAIFMT_I2S |
+ SND_SOC_DAIFMT_IB_IF |
+ SND_SOC_DAIFMT_CBM_CFM,
.dpcm_playback = 1,
.ignore_suspend = 1,
.be_hw_params_fixup = mt8183_i2s_hw_params_fixup,
--
2.25.0.341.g760bfbb309-goog
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [alsa-devel] [PATCH 4/4] ASoC: mediatek: mt8183-da7219: apply some refactors
2020-02-03 8:27 [alsa-devel] [PATCH 0/4] ASoC: mediatek: mt8183-da7219: pick fixes from mt8183-mt6358 Tzung-Bi Shih
` (2 preceding siblings ...)
2020-02-03 8:27 ` [alsa-devel] [PATCH 3/4] ASoC: mediatek: mt8183-da7219: support TDM out and 8ch I2S out Tzung-Bi Shih
@ 2020-02-03 8:27 ` Tzung-Bi Shih
3 siblings, 0 replies; 5+ messages in thread
From: Tzung-Bi Shih @ 2020-02-03 8:27 UTC (permalink / raw)
To: broonie; +Cc: tzungbi, alsa-devel, dgreid, cychiang
1. Moves headset jack to card-specific storage.
2. Removes trailing blank line.
3. Moves card registration to the end of probe.
Signed-off-by: Tzung-Bi Shih <tzungbi@google.com>
---
.../mediatek/mt8183/mt8183-da7219-max98357.c | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
index 7052210e8325..ecc8082a824d 100644
--- a/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
+++ b/sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c
@@ -16,8 +16,6 @@
#include "../../codecs/da7219-aad.h"
#include "../../codecs/da7219.h"
-static struct snd_soc_jack headset_jack;
-
enum PINCTRL_PIN_STATE {
PIN_STATE_DEFAULT = 0,
PIN_TDM_OUT_ON,
@@ -32,6 +30,7 @@ static const char * const mt8183_pin_str[PIN_STATE_MAX] = {
struct mt8183_da7219_max98357_priv {
struct pinctrl *pinctrl;
struct pinctrl_state *pin_states[PIN_STATE_MAX];
+ struct snd_soc_jack headset_jack;
};
static int mt8183_mt6358_i2s_hw_params(struct snd_pcm_substream *substream,
@@ -491,6 +490,8 @@ static int
mt8183_da7219_max98357_headset_init(struct snd_soc_component *component)
{
int ret;
+ struct mt8183_da7219_max98357_priv *priv =
+ snd_soc_card_get_drvdata(component->card);
/* Enable Headset and 4 Buttons Jack detection */
ret = snd_soc_card_jack_new(&mt8183_da7219_max98357_card,
@@ -498,12 +499,12 @@ mt8183_da7219_max98357_headset_init(struct snd_soc_component *component)
SND_JACK_HEADSET |
SND_JACK_BTN_0 | SND_JACK_BTN_1 |
SND_JACK_BTN_2 | SND_JACK_BTN_3,
- &headset_jack,
+ &priv->headset_jack,
NULL, 0);
if (ret)
return ret;
- da7219_aad_jack_det(component, &headset_jack);
+ da7219_aad_jack_det(component, &priv->headset_jack);
return ret;
}
@@ -540,13 +541,6 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)
return -EINVAL;
}
- ret = devm_snd_soc_register_card(&pdev->dev, card);
- if (ret) {
- dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n",
- __func__, ret);
- return ret;
- }
-
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv)
return -ENOMEM;
@@ -588,7 +582,7 @@ static int mt8183_da7219_max98357_dev_probe(struct platform_device *pdev)
__func__, ret);
}
- return ret;
+ return devm_snd_soc_register_card(&pdev->dev, card);
}
#ifdef CONFIG_OF
@@ -615,4 +609,3 @@ MODULE_DESCRIPTION("MT8183-DA7219-MAX98357 ALSA SoC machine driver");
MODULE_AUTHOR("Shunli Wang <shunli.wang@mediatek.com>");
MODULE_LICENSE("GPL v2");
MODULE_ALIAS("mt8183_da7219_max98357 soc card");
-
--
2.25.0.341.g760bfbb309-goog
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-02-03 8:31 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-03 8:27 [alsa-devel] [PATCH 0/4] ASoC: mediatek: mt8183-da7219: pick fixes from mt8183-mt6358 Tzung-Bi Shih
2020-02-03 8:27 ` [alsa-devel] [PATCH 1/4] ASoC: mediatek: mt8183-da7219: change supported formats of DL2 and UL1 Tzung-Bi Shih
2020-02-03 8:27 ` [alsa-devel] [PATCH 2/4] ASoC: mediatek: mt8183-da7219: pull TDM GPIO pins down when probed Tzung-Bi Shih
2020-02-03 8:27 ` [alsa-devel] [PATCH 3/4] ASoC: mediatek: mt8183-da7219: support TDM out and 8ch I2S out Tzung-Bi Shih
2020-02-03 8:27 ` [alsa-devel] [PATCH 4/4] ASoC: mediatek: mt8183-da7219: apply some refactors Tzung-Bi Shih
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.