[PATCH 0/4] ASoC: mediatek: Update MT8195 machine driver
Thes series of patches adds support for RT5682s headset codec and create a new machine driver for SOF support. Patches are based on broonie tree "for-next" branch.
Trevor Wu (4): ASoC: mediatek: mt8195: add headset codec rt5682s support dt-bindings: mediatek: mt8195: add model property ASoC: mediatek: mt8195: separate the common code from machine driver ASoC: mediatek: mt8195: add machine driver for MT8195 SOF support
.../sound/mt8195-mt6359-rt1011-rt5682.yaml | 4 + .../sound/mt8195-mt6359-rt1019-rt5682.yaml | 4 + sound/soc/mediatek/Kconfig | 2 + sound/soc/mediatek/mt8195/Makefile | 16 +- sound/soc/mediatek/mt8195/mt8195-common.c | 398 ++++++++++++ sound/soc/mediatek/mt8195/mt8195-common.h | 33 + .../mt8195/mt8195-mt6359-rt1011-rt5682.c | 591 +----------------- .../mt8195/mt8195-mt6359-rt1019-rt5682-sof.c | 557 +++++++++++++++++ .../mt8195/mt8195-mt6359-rt1019-rt5682.c | 551 +--------------- .../mediatek/mt8195/mt8195-realtek-common.c | 161 +++++ .../mediatek/mt8195/mt8195-realtek-common.h | 34 + 11 files changed, 1267 insertions(+), 1084 deletions(-) create mode 100644 sound/soc/mediatek/mt8195/mt8195-common.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-common.h create mode 100644 sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682-sof.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-realtek-common.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-realtek-common.h
mt8195 machine driver adds rt5682s support in this patch. Card name can be specified from dts by model property, and driver makes use of the name to distinguish which headset codec is on the board.
Signed-off-by: Trevor Wu trevor.wu@mediatek.com --- sound/soc/mediatek/Kconfig | 2 ++ .../mt8195/mt8195-mt6359-rt1011-rt5682.c | 29 +++++++++++++----- .../mt8195/mt8195-mt6359-rt1019-rt5682.c | 30 ++++++++++++++----- 3 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/sound/soc/mediatek/Kconfig b/sound/soc/mediatek/Kconfig index 3b1ddea26a9e..9306b7ca2644 100644 --- a/sound/soc/mediatek/Kconfig +++ b/sound/soc/mediatek/Kconfig @@ -205,6 +205,7 @@ config SND_SOC_MT8195_MT6359_RT1019_RT5682 select SND_SOC_MT6359 select SND_SOC_RT1015P select SND_SOC_RT5682_I2C + select SND_SOC_RT5682S select SND_SOC_DMIC select SND_SOC_HDMI_CODEC help @@ -220,6 +221,7 @@ config SND_SOC_MT8195_MT6359_RT1011_RT5682 select SND_SOC_MT6359 select SND_SOC_RT1011 select SND_SOC_RT5682_I2C + select SND_SOC_RT5682S select SND_SOC_DMIC select SND_SOC_HDMI_CODEC help diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c index e103102d7ef6..797f155c882b 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c @@ -27,6 +27,9 @@ #define RT5682_CODEC_DAI "rt5682-aif1" #define RT5682_DEV0_NAME "rt5682.2-001a"
+#define RT5682S_CODEC_DAI "rt5682s-aif1" +#define RT5682S_DEV0_NAME "rt5682s.2-001a" + struct mt8195_mt6359_rt1011_rt5682_priv { struct device_node *platform_node; struct device_node *hdmi_node; @@ -691,14 +694,12 @@ SND_SOC_DAILINK_DEFS(ETDM1_IN_BE,
SND_SOC_DAILINK_DEFS(ETDM2_IN_BE, DAILINK_COMP_ARRAY(COMP_CPU("ETDM2_IN")), - DAILINK_COMP_ARRAY(COMP_CODEC(RT5682_DEV0_NAME, - RT5682_CODEC_DAI)), + DAILINK_COMP_ARRAY(COMP_DUMMY()), DAILINK_COMP_ARRAY(COMP_EMPTY()));
SND_SOC_DAILINK_DEFS(ETDM1_OUT_BE, DAILINK_COMP_ARRAY(COMP_CPU("ETDM1_OUT")), - DAILINK_COMP_ARRAY(COMP_CODEC(RT5682_DEV0_NAME, - RT5682_CODEC_DAI)), + DAILINK_COMP_ARRAY(COMP_DUMMY()), DAILINK_COMP_ARRAY(COMP_EMPTY()));
SND_SOC_DAILINK_DEFS(ETDM2_OUT_BE, @@ -1046,9 +1047,19 @@ static int mt8195_mt6359_rt1011_rt5682_dev_probe(struct platform_device *pdev) struct snd_soc_card *card = &mt8195_mt6359_rt1011_rt5682_soc_card; struct snd_soc_dai_link *dai_link; struct mt8195_mt6359_rt1011_rt5682_priv *priv; + int is5682s = 0; int ret, i;
card->dev = &pdev->dev; + ret = snd_soc_of_parse_card_name(card, "model"); + if (ret) { + dev_err(&pdev->dev, "%s new card name parsing error %d\n", + __func__, ret); + return ret; + } + + if (strstr(card->name, "_5682s")) + is5682s = 1;
priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -1078,9 +1089,7 @@ static int mt8195_mt6359_rt1011_rt5682_dev_probe(struct platform_device *pdev) dai_link->codecs->dai_name = "i2s-hifi"; dai_link->init = mt8195_dptx_codec_init; } - } - - if (strcmp(dai_link->name, "ETDM3_OUT_BE") == 0) { + } else if (strcmp(dai_link->name, "ETDM3_OUT_BE") == 0) { priv->hdmi_node = of_parse_phandle(pdev->dev.of_node, "mediatek,hdmi-codec", 0); @@ -1092,6 +1101,12 @@ static int mt8195_mt6359_rt1011_rt5682_dev_probe(struct platform_device *pdev) dai_link->codecs->dai_name = "i2s-hifi"; dai_link->init = mt8195_hdmi_codec_init; } + } else if (strcmp(dai_link->name, "ETDM1_OUT_BE") == 0 || + strcmp(dai_link->name, "ETDM2_IN_BE") == 0) { + dai_link->codecs->name = + is5682s ? RT5682S_DEV0_NAME : RT5682_DEV0_NAME; + dai_link->codecs->dai_name = + is5682s ? RT5682S_CODEC_DAI : RT5682_CODEC_DAI; } }
diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c index 95abaadcd842..7209c70acf6e 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c @@ -25,6 +25,9 @@ #define RT5682_CODEC_DAI "rt5682-aif1" #define RT5682_DEV0_NAME "rt5682.2-001a"
+#define RT5682S_CODEC_DAI "rt5682s-aif1" +#define RT5682S_DEV0_NAME "rt5682s.2-001a" + struct mt8195_mt6359_rt1019_rt5682_priv { struct device_node *platform_node; struct device_node *hdmi_node; @@ -661,14 +664,12 @@ SND_SOC_DAILINK_DEFS(ETDM1_IN_BE,
SND_SOC_DAILINK_DEFS(ETDM2_IN_BE, DAILINK_COMP_ARRAY(COMP_CPU("ETDM2_IN")), - DAILINK_COMP_ARRAY(COMP_CODEC(RT5682_DEV0_NAME, - RT5682_CODEC_DAI)), + DAILINK_COMP_ARRAY(COMP_DUMMY()), DAILINK_COMP_ARRAY(COMP_EMPTY()));
SND_SOC_DAILINK_DEFS(ETDM1_OUT_BE, DAILINK_COMP_ARRAY(COMP_CPU("ETDM1_OUT")), - DAILINK_COMP_ARRAY(COMP_CODEC(RT5682_DEV0_NAME, - RT5682_CODEC_DAI)), + DAILINK_COMP_ARRAY(COMP_DUMMY()), DAILINK_COMP_ARRAY(COMP_EMPTY()));
SND_SOC_DAILINK_DEFS(ETDM2_OUT_BE, @@ -999,10 +1000,21 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) struct snd_soc_card *card = &mt8195_mt6359_rt1019_rt5682_soc_card; struct snd_soc_dai_link *dai_link; struct mt8195_mt6359_rt1019_rt5682_priv *priv; + int is5682s = 0; int ret, i;
card->dev = &pdev->dev;
+ ret = snd_soc_of_parse_card_name(card, "model"); + if (ret) { + dev_err(&pdev->dev, "%s new card name parsing error %d\n", + __func__, ret); + return ret; + } + + if (strstr(card->name, "_5682s")) + is5682s = 1; + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; @@ -1031,9 +1043,7 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) dai_link->codecs->dai_name = "i2s-hifi"; dai_link->init = mt8195_dptx_codec_init; } - } - - if (strcmp(dai_link->name, "ETDM3_OUT_BE") == 0) { + } else if (strcmp(dai_link->name, "ETDM3_OUT_BE") == 0) { priv->hdmi_node = of_parse_phandle(pdev->dev.of_node, "mediatek,hdmi-codec", 0); @@ -1045,6 +1055,12 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) dai_link->codecs->dai_name = "i2s-hifi"; dai_link->init = mt8195_hdmi_codec_init; } + } else if (strcmp(dai_link->name, "ETDM1_OUT_BE") == 0 || + strcmp(dai_link->name, "ETDM2_IN_BE") == 0) { + dai_link->codecs->name = + is5682s ? RT5682S_DEV0_NAME : RT5682_DEV0_NAME; + dai_link->codecs->dai_name = + is5682s ? RT5682S_CODEC_DAI : RT5682_CODEC_DAI; } }
This patch adds the description of model property used to specify card name from dts.
Signed-off-by: Trevor Wu trevor.wu@mediatek.com --- .../bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml | 4 ++++ .../bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml | 4 ++++ 2 files changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml index d354c30d3377..cf6ad7933e23 100644 --- a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml +++ b/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml @@ -16,6 +16,10 @@ properties: compatible: const: mediatek,mt8195_mt6359_rt1011_rt5682
+ model: + $ref: /schemas/types.yaml#/definitions/string + description: User specified audio sound card name + mediatek,platform: $ref: "/schemas/types.yaml#/definitions/phandle" description: The phandle of MT8195 ASoC platform. diff --git a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml b/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml index 20bc0ffd0e34..e6786dece9a3 100644 --- a/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml +++ b/Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml @@ -16,6 +16,10 @@ properties: compatible: const: mediatek,mt8195_mt6359_rt1019_rt5682
+ model: + $ref: /schemas/types.yaml#/definitions/string + description: User specified audio sound card name + mediatek,platform: $ref: "/schemas/types.yaml#/definitions/phandle" description: The phandle of MT8195 ASoC platform.
On Wed, 03 Nov 2021 18:00:38 +0800, Trevor Wu wrote:
This patch adds the description of model property used to specify card name from dts.
Signed-off-by: Trevor Wu trevor.wu@mediatek.com
.../bindings/sound/mt8195-mt6359-rt1011-rt5682.yaml | 4 ++++ .../bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml | 4 ++++ 2 files changed, 8 insertions(+)
Acked-by: Rob Herring robh@kernel.org
Because we will add DSP support, an new machine driver for the same board is required. BE and codec configuration will use the same code when machine driver is designed for the same board.
Separate common code which can be used in multiple machine drivers so that the common code can be reused when a new machine driver is created.
Signed-off-by: Trevor Wu trevor.wu@mediatek.com --- sound/soc/mediatek/mt8195/Makefile | 11 +- sound/soc/mediatek/mt8195/mt8195-common.c | 398 ++++++++++++ sound/soc/mediatek/mt8195/mt8195-common.h | 33 + .../mt8195/mt8195-mt6359-rt1011-rt5682.c | 568 +----------------- .../mt8195/mt8195-mt6359-rt1019-rt5682.c | 527 +--------------- .../mediatek/mt8195/mt8195-realtek-common.c | 161 +++++ .../mediatek/mt8195/mt8195-realtek-common.h | 34 ++ 7 files changed, 656 insertions(+), 1076 deletions(-) create mode 100644 sound/soc/mediatek/mt8195/mt8195-common.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-common.h create mode 100644 sound/soc/mediatek/mt8195/mt8195-realtek-common.c create mode 100644 sound/soc/mediatek/mt8195/mt8195-realtek-common.h
diff --git a/sound/soc/mediatek/mt8195/Makefile b/sound/soc/mediatek/mt8195/Makefile index e5f0df5010b6..2edcd2855847 100644 --- a/sound/soc/mediatek/mt8195/Makefile +++ b/sound/soc/mediatek/mt8195/Makefile @@ -12,5 +12,12 @@ snd-soc-mt8195-afe-objs := \ obj-$(CONFIG_SND_SOC_MT8195) += snd-soc-mt8195-afe.o
# machine driver -obj-$(CONFIG_SND_SOC_MT8195_MT6359_RT1019_RT5682) += mt8195-mt6359-rt1019-rt5682.o -obj-$(CONFIG_SND_SOC_MT8195_MT6359_RT1011_RT5682) += mt8195-mt6359-rt1011-rt5682.o +snd-soc-mt8195-rt-common-objs := mt8195-common.o mt8195-realtek-common.o + +obj-$(CONFIG_SND_SOC_MT8195_MT6359_RT1019_RT5682) += \ + snd-soc-mt8195-rt-common.o \ + mt8195-mt6359-rt1019-rt5682.o + +obj-$(CONFIG_SND_SOC_MT8195_MT6359_RT1011_RT5682) += \ + snd-soc-mt8195-rt-common.o \ + mt8195-mt6359-rt1011-rt5682.o diff --git a/sound/soc/mediatek/mt8195/mt8195-common.c b/sound/soc/mediatek/mt8195/mt8195-common.c new file mode 100644 index 000000000000..97f238fa3414 --- /dev/null +++ b/sound/soc/mediatek/mt8195/mt8195-common.c @@ -0,0 +1,398 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * mt8195-common.c -- common code for MT8195 ALSA SoC machine driver + * + * Copyright (c) 2021 MediaTek Inc. + * Author: Trevor Wu trevor.wu@mediatek.com + */ + +#include <linux/input.h> +#include <linux/pm_runtime.h> +#include <sound/jack.h> +#include <sound/pcm_params.h> +#include <sound/soc.h> +#include "../../codecs/mt6359.h" +#include "../common/mtk-afe-platform-driver.h" +#include "mt8195-afe-common.h" +#include "mt8195-common.h" + +#define CKSYS_AUD_TOP_CFG 0x032c +#define CKSYS_AUD_TOP_MON 0x0330 + +static int mt8195_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_component *cmpnt_afe = + snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); + struct snd_soc_component *cmpnt_codec = + asoc_rtd_to_codec(rtd, 0)->component; + struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); + struct mt8195_afe_private *afe_priv = afe->platform_priv; + struct mtkaif_param *param = &afe_priv->mtkaif_params; + int chosen_phase_1, chosen_phase_2, chosen_phase_3; + int prev_cycle_1, prev_cycle_2, prev_cycle_3; + int test_done_1, test_done_2, test_done_3; + int cycle_1, cycle_2, cycle_3; + int mtkaif_chosen_phase[MT8195_MTKAIF_MISO_NUM]; + int mtkaif_phase_cycle[MT8195_MTKAIF_MISO_NUM]; + int mtkaif_calibration_num_phase; + bool mtkaif_calibration_ok; + unsigned int monitor; + int counter; + int phase; + int i; + + dev_dbg(afe->dev, "%s(), start\n", __func__); + + param->mtkaif_calibration_ok = false; + for (i = 0; i < MT8195_MTKAIF_MISO_NUM; i++) { + param->mtkaif_chosen_phase[i] = -1; + param->mtkaif_phase_cycle[i] = 0; + mtkaif_chosen_phase[i] = -1; + mtkaif_phase_cycle[i] = 0; + } + + if (IS_ERR(afe_priv->topckgen)) { + dev_info(afe->dev, "%s() Cannot find topckgen controller\n", + __func__); + return 0; + } + + pm_runtime_get_sync(afe->dev); + mt6359_mtkaif_calibration_enable(cmpnt_codec); + + /* set test type to synchronizer pulse */ + regmap_update_bits(afe_priv->topckgen, + CKSYS_AUD_TOP_CFG, 0xffff, 0x4); + mtkaif_calibration_num_phase = 42; /* mt6359: 0 ~ 42 */ + mtkaif_calibration_ok = true; + + for (phase = 0; + phase <= mtkaif_calibration_num_phase && mtkaif_calibration_ok; + phase++) { + mt6359_set_mtkaif_calibration_phase(cmpnt_codec, + phase, phase, phase); + + regmap_update_bits(afe_priv->topckgen, + CKSYS_AUD_TOP_CFG, 0x1, 0x1); + + test_done_1 = 0; + test_done_2 = 0; + test_done_3 = 0; + cycle_1 = -1; + cycle_2 = -1; + cycle_3 = -1; + counter = 0; + while (!(test_done_1 & test_done_2 & test_done_3)) { + regmap_read(afe_priv->topckgen, + CKSYS_AUD_TOP_MON, &monitor); + test_done_1 = (monitor >> 28) & 0x1; + test_done_2 = (monitor >> 29) & 0x1; + test_done_3 = (monitor >> 30) & 0x1; + if (test_done_1 == 1) + cycle_1 = monitor & 0xf; + + if (test_done_2 == 1) + cycle_2 = (monitor >> 4) & 0xf; + + if (test_done_3 == 1) + cycle_3 = (monitor >> 8) & 0xf; + + /* handle if never test done */ + if (++counter > 10000) { + dev_info(afe->dev, "%s(), test fail, cycle_1 %d, cycle_2 %d, cycle_3 %d, monitor 0x%x\n", + __func__, + cycle_1, cycle_2, cycle_3, monitor); + mtkaif_calibration_ok = false; + break; + } + } + + if (phase == 0) { + prev_cycle_1 = cycle_1; + prev_cycle_2 = cycle_2; + prev_cycle_3 = cycle_3; + } + + if (cycle_1 != prev_cycle_1 && + mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] < 0) { + mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] = phase - 1; + mtkaif_phase_cycle[MT8195_MTKAIF_MISO_0] = prev_cycle_1; + } + + if (cycle_2 != prev_cycle_2 && + mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] < 0) { + mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] = phase - 1; + mtkaif_phase_cycle[MT8195_MTKAIF_MISO_1] = prev_cycle_2; + } + + if (cycle_3 != prev_cycle_3 && + mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] < 0) { + mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] = phase - 1; + mtkaif_phase_cycle[MT8195_MTKAIF_MISO_2] = prev_cycle_3; + } + + regmap_update_bits(afe_priv->topckgen, + CKSYS_AUD_TOP_CFG, 0x1, 0x0); + + if (mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] >= 0 && + mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] >= 0 && + mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] >= 0) + break; + } + + if (mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] < 0) { + mtkaif_calibration_ok = false; + chosen_phase_1 = 0; + } else { + chosen_phase_1 = mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0]; + } + + if (mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] < 0) { + mtkaif_calibration_ok = false; + chosen_phase_2 = 0; + } else { + chosen_phase_2 = mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1]; + } + + if (mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] < 0) { + mtkaif_calibration_ok = false; + chosen_phase_3 = 0; + } else { + chosen_phase_3 = mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2]; + } + + mt6359_set_mtkaif_calibration_phase(cmpnt_codec, + chosen_phase_1, + chosen_phase_2, + chosen_phase_3); + + mt6359_mtkaif_calibration_disable(cmpnt_codec); + pm_runtime_put(afe->dev); + + param->mtkaif_calibration_ok = mtkaif_calibration_ok; + param->mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] = chosen_phase_1; + param->mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] = chosen_phase_2; + param->mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] = chosen_phase_3; + for (i = 0; i < MT8195_MTKAIF_MISO_NUM; i++) + param->mtkaif_phase_cycle[i] = mtkaif_phase_cycle[i]; + + dev_info(afe->dev, "%s(), end, calibration ok %d\n", + __func__, param->mtkaif_calibration_ok); + + return 0; +} + +int mt8195_mt6359_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_component *cmpnt_codec = + asoc_rtd_to_codec(rtd, 0)->component; + + /* set mtkaif protocol */ + mt6359_set_mtkaif_protocol(cmpnt_codec, + MT6359_MTKAIF_PROTOCOL_2_CLK_P2); + + /* mtkaif calibration */ + mt8195_mt6359_mtkaif_calibration(rtd); + + return 0; +} + +static int mt8195_dptx_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + + return snd_soc_dai_set_sysclk(cpu_dai, 0, params_rate(params) * 256, + SND_SOC_CLOCK_OUT); +} + +const struct snd_soc_ops mt8195_dptx_ops = { + .hw_params = mt8195_dptx_hw_params, +}; + +int mt8195_dptx_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) + +{ + /* fix BE i2s format to 32bit, clean param mask first */ + snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), + 0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST); + + params_set_format(params, SNDRV_PCM_FORMAT_S24_LE); + + return 0; +} + +int mt8195_dptx_codec_init(struct snd_soc_pcm_runtime *rtd) +{ + struct mt8195_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_component *cmpnt_codec = + asoc_rtd_to_codec(rtd, 0)->component; + int ret; + + ret = snd_soc_card_jack_new(rtd->card, "DP Jack", SND_JACK_LINEOUT, + &priv->dp_jack, NULL, 0); + if (ret) + return ret; + + return snd_soc_component_set_jack(cmpnt_codec, &priv->dp_jack, NULL); +} + +int mt8195_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd) +{ + struct mt8195_priv *priv = snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_component *cmpnt_codec = + asoc_rtd_to_codec(rtd, 0)->component; + int ret; + + ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT, + &priv->hdmi_jack, NULL, 0); + if (ret) + return ret; + + return snd_soc_component_set_jack(cmpnt_codec, &priv->hdmi_jack, NULL); +} + +static int mt8195_hdmitx_dptx_startup(struct snd_pcm_substream *substream) +{ + static const unsigned int rates[] = { + 48000 + }; + static const unsigned int channels[] = { + 2, 4, 6, 8 + }; + static const struct snd_pcm_hw_constraint_list constraints_rates = { + .count = ARRAY_SIZE(rates), + .list = rates, + .mask = 0, + }; + static const struct snd_pcm_hw_constraint_list constraints_channels = { + .count = ARRAY_SIZE(channels), + .list = channels, + .mask = 0, + }; + + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + int ret; + + ret = snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &constraints_rates); + if (ret < 0) { + dev_err(rtd->dev, "hw_constraint_list rate failed\n"); + return ret; + } + + ret = snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_CHANNELS, + &constraints_channels); + if (ret < 0) { + dev_err(rtd->dev, "hw_constraint_list channel failed\n"); + return ret; + } + + return 0; +} + +const struct snd_soc_ops mt8195_hdmitx_dptx_playback_ops = { + .startup = mt8195_hdmitx_dptx_startup, +}; + +static int mt8195_playback_startup(struct snd_pcm_substream *substream) +{ + static const unsigned int rates[] = { + 48000 + }; + static const unsigned int channels[] = { + 2 + }; + static const struct snd_pcm_hw_constraint_list constraints_rates = { + .count = ARRAY_SIZE(rates), + .list = rates, + .mask = 0, + }; + static const struct snd_pcm_hw_constraint_list constraints_channels = { + .count = ARRAY_SIZE(channels), + .list = channels, + .mask = 0, + }; + + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + int ret; + + ret = snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &constraints_rates); + if (ret < 0) { + dev_err(rtd->dev, "hw_constraint_list rate failed\n"); + return ret; + } + + ret = snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_CHANNELS, + &constraints_channels); + if (ret < 0) { + dev_err(rtd->dev, "hw_constraint_list channel failed\n"); + return ret; + } + + return 0; +} + +const struct snd_soc_ops mt8195_playback_ops = { + .startup = mt8195_playback_startup, +}; + +static int mt8195_capture_startup(struct snd_pcm_substream *substream) +{ + static const unsigned int rates[] = { + 48000 + }; + static const unsigned int channels[] = { + 1, 2 + }; + static const struct snd_pcm_hw_constraint_list constraints_rates = { + .count = ARRAY_SIZE(rates), + .list = rates, + .mask = 0, + }; + static const struct snd_pcm_hw_constraint_list constraints_channels = { + .count = ARRAY_SIZE(channels), + .list = channels, + .mask = 0, + }; + + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_pcm_runtime *runtime = substream->runtime; + int ret; + + ret = snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_RATE, + &constraints_rates); + if (ret < 0) { + dev_err(rtd->dev, "hw_constraint_list rate failed\n"); + return ret; + } + + ret = snd_pcm_hw_constraint_list(runtime, 0, + SNDRV_PCM_HW_PARAM_CHANNELS, + &constraints_channels); + if (ret < 0) { + dev_err(rtd->dev, "hw_constraint_list channel failed\n"); + return ret; + } + + return 0; +} + +const struct snd_soc_ops mt8195_capture_ops = { + .startup = mt8195_capture_startup, +}; + +const struct dev_pm_ops mt8195_pm_ops = { + .poweroff = snd_soc_poweroff, + .restore = snd_soc_resume, +}; diff --git a/sound/soc/mediatek/mt8195/mt8195-common.h b/sound/soc/mediatek/mt8195/mt8195-common.h new file mode 100644 index 000000000000..7a834ce8b49a --- /dev/null +++ b/sound/soc/mediatek/mt8195/mt8195-common.h @@ -0,0 +1,33 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * mt8195-common.h -- Mediatek 8195 common header for machine driver + * + * Copyright (c) 2021 MediaTek Inc. + * Author: Trevor Wu trevor.wu@mediatek.com + */ + +#ifndef _MT_8195_COMMON_H_ +#define _MT_8195_COMMON_H_ + +struct mt8195_priv { + struct device_node *platform_node; + struct device_node *hdmi_node; + struct device_node *dp_node; + struct snd_soc_jack headset_jack; + struct snd_soc_jack dp_jack; + struct snd_soc_jack hdmi_jack; +}; + +extern const struct snd_soc_ops mt8195_hdmitx_dptx_playback_ops; +extern const struct snd_soc_ops mt8195_dptx_ops; +extern const struct snd_soc_ops mt8195_playback_ops; +extern const struct snd_soc_ops mt8195_capture_ops; +extern const struct dev_pm_ops mt8195_pm_ops; + +int mt8195_mt6359_init(struct snd_soc_pcm_runtime *rtd); +int mt8195_dptx_codec_init(struct snd_soc_pcm_runtime *rtd); +int mt8195_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd); +int mt8195_dptx_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params); + +#endif diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c index 797f155c882b..49a0268e2525 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1011-rt5682.c @@ -7,40 +7,13 @@ // Author: Trevor Wu trevor.wu@mediatek.com //
-#include <linux/input.h> #include <linux/module.h> -#include <linux/pm_runtime.h> -#include <sound/jack.h> -#include <sound/pcm_params.h> -#include <sound/rt5682.h> #include <sound/soc.h> -#include "../../codecs/mt6359.h" -#include "../../codecs/rt1011.h" -#include "../../codecs/rt5682.h" -#include "../common/mtk-afe-platform-driver.h" -#include "mt8195-afe-common.h" - -#define RT1011_CODEC_DAI "rt1011-aif" -#define RT1011_DEV0_NAME "rt1011.2-0038" -#define RT1011_DEV1_NAME "rt1011.2-0039" - -#define RT5682_CODEC_DAI "rt5682-aif1" -#define RT5682_DEV0_NAME "rt5682.2-001a" - -#define RT5682S_CODEC_DAI "rt5682s-aif1" -#define RT5682S_DEV0_NAME "rt5682s.2-001a" - -struct mt8195_mt6359_rt1011_rt5682_priv { - struct device_node *platform_node; - struct device_node *hdmi_node; - struct device_node *dp_node; - struct snd_soc_jack headset_jack; - struct snd_soc_jack dp_jack; - struct snd_soc_jack hdmi_jack; -}; +#include "mt8195-common.h" +#include "mt8195-realtek-common.h"
static const struct snd_soc_dapm_widget -mt8195_mt6359_rt1011_rt5682_widgets[] = { + mt8195_mt6359_rt1011_rt5682_widgets[] = { SND_SOC_DAPM_SPK("Left Speaker", NULL), SND_SOC_DAPM_SPK("Right Speaker", NULL), SND_SOC_DAPM_HP("Headphone Jack", NULL), @@ -64,507 +37,6 @@ static const struct snd_kcontrol_new mt8195_mt6359_rt1011_rt5682_controls[] = { SOC_DAPM_PIN_SWITCH("Headset Mic"), };
-static int mt8195_rt5682_etdm_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - unsigned int rate = params_rate(params); - int bitwidth; - int ret; - - bitwidth = snd_pcm_format_width(params_format(params)); - if (bitwidth < 0) { - dev_err(card->dev, "invalid bit width: %d\n", bitwidth); - return bitwidth; - } - - ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x00, 0x0, 0x2, bitwidth); - if (ret) { - dev_err(card->dev, "failed to set tdm slot\n"); - return ret; - } - - ret = snd_soc_dai_set_pll(codec_dai, RT5682_PLL1, RT5682_PLL1_S_BCLK1, - rate * 64, rate * 512); - if (ret) { - dev_err(card->dev, "failed to set pll\n"); - return ret; - } - - ret = snd_soc_dai_set_sysclk(codec_dai, RT5682_SCLK_S_PLL1, - rate * 512, SND_SOC_CLOCK_IN); - if (ret) { - dev_err(card->dev, "failed to set sysclk\n"); - return ret; - } - - return snd_soc_dai_set_sysclk(cpu_dai, 0, rate * 128, - SND_SOC_CLOCK_OUT); -} - -static const struct snd_soc_ops mt8195_rt5682_etdm_ops = { - .hw_params = mt8195_rt5682_etdm_hw_params, -}; - -static int mt8195_rt1011_etdm_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_soc_dai *codec_dai; - struct snd_soc_card *card = rtd->card; - int srate, i, ret = 0; - - srate = params_rate(params); - - for_each_rtd_codec_dais(rtd, i, codec_dai) { - ret = snd_soc_dai_set_pll(codec_dai, 0, RT1011_PLL1_S_BCLK, - 64 * srate, 256 * srate); - if (ret < 0) { - dev_err(card->dev, "codec_dai clock not set\n"); - return ret; - } - - ret = snd_soc_dai_set_sysclk(codec_dai, - RT1011_FS_SYS_PRE_S_PLL1, - 256 * srate, SND_SOC_CLOCK_IN); - if (ret < 0) { - dev_err(card->dev, "codec_dai clock not set\n"); - return ret; - } - } - return ret; -} - -static const struct snd_soc_ops mt8195_rt1011_etdm_ops = { - .hw_params = mt8195_rt1011_etdm_hw_params, -}; - -#define CKSYS_AUD_TOP_CFG 0x032c -#define CKSYS_AUD_TOP_MON 0x0330 - -static int mt8195_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_component *cmpnt_afe = - snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); - struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; - struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); - struct mt8195_afe_private *afe_priv = afe->platform_priv; - struct mtkaif_param *param = &afe_priv->mtkaif_params; - int chosen_phase_1, chosen_phase_2, chosen_phase_3; - int prev_cycle_1, prev_cycle_2, prev_cycle_3; - int test_done_1, test_done_2, test_done_3; - int cycle_1, cycle_2, cycle_3; - int mtkaif_chosen_phase[MT8195_MTKAIF_MISO_NUM]; - int mtkaif_phase_cycle[MT8195_MTKAIF_MISO_NUM]; - int mtkaif_calibration_num_phase; - bool mtkaif_calibration_ok; - unsigned int monitor; - int counter; - int phase; - int i; - - dev_dbg(afe->dev, "%s(), start\n", __func__); - - param->mtkaif_calibration_ok = false; - for (i = 0; i < MT8195_MTKAIF_MISO_NUM; i++) { - param->mtkaif_chosen_phase[i] = -1; - param->mtkaif_phase_cycle[i] = 0; - mtkaif_chosen_phase[i] = -1; - mtkaif_phase_cycle[i] = 0; - } - - if (IS_ERR(afe_priv->topckgen)) { - dev_info(afe->dev, "%s() Cannot find topckgen controller\n", - __func__); - return 0; - } - - pm_runtime_get_sync(afe->dev); - mt6359_mtkaif_calibration_enable(cmpnt_codec); - - /* set test type to synchronizer pulse */ - regmap_update_bits(afe_priv->topckgen, - CKSYS_AUD_TOP_CFG, 0xffff, 0x4); - mtkaif_calibration_num_phase = 42; /* mt6359: 0 ~ 42 */ - mtkaif_calibration_ok = true; - - for (phase = 0; - phase <= mtkaif_calibration_num_phase && mtkaif_calibration_ok; - phase++) { - mt6359_set_mtkaif_calibration_phase(cmpnt_codec, - phase, phase, phase); - - regmap_update_bits(afe_priv->topckgen, - CKSYS_AUD_TOP_CFG, 0x1, 0x1); - - test_done_1 = 0; - test_done_2 = 0; - test_done_3 = 0; - cycle_1 = -1; - cycle_2 = -1; - cycle_3 = -1; - counter = 0; - while (!(test_done_1 & test_done_2 & test_done_3)) { - regmap_read(afe_priv->topckgen, - CKSYS_AUD_TOP_MON, &monitor); - test_done_1 = (monitor >> 28) & 0x1; - test_done_2 = (monitor >> 29) & 0x1; - test_done_3 = (monitor >> 30) & 0x1; - if (test_done_1 == 1) - cycle_1 = monitor & 0xf; - - if (test_done_2 == 1) - cycle_2 = (monitor >> 4) & 0xf; - - if (test_done_3 == 1) - cycle_3 = (monitor >> 8) & 0xf; - - /* handle if never test done */ - if (++counter > 10000) { - dev_info(afe->dev, "%s(), test fail, cycle_1 %d, cycle_2 %d, cycle_3 %d, monitor 0x%x\n", - __func__, - cycle_1, cycle_2, cycle_3, monitor); - mtkaif_calibration_ok = false; - break; - } - } - - if (phase == 0) { - prev_cycle_1 = cycle_1; - prev_cycle_2 = cycle_2; - prev_cycle_3 = cycle_3; - } - - if (cycle_1 != prev_cycle_1 && - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] < 0) { - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] = phase - 1; - mtkaif_phase_cycle[MT8195_MTKAIF_MISO_0] = prev_cycle_1; - } - - if (cycle_2 != prev_cycle_2 && - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] < 0) { - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] = phase - 1; - mtkaif_phase_cycle[MT8195_MTKAIF_MISO_1] = prev_cycle_2; - } - - if (cycle_3 != prev_cycle_3 && - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] < 0) { - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] = phase - 1; - mtkaif_phase_cycle[MT8195_MTKAIF_MISO_2] = prev_cycle_3; - } - - regmap_update_bits(afe_priv->topckgen, - CKSYS_AUD_TOP_CFG, 0x1, 0x0); - - if (mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] >= 0 && - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] >= 0 && - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] >= 0) - break; - } - - if (mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] < 0) { - mtkaif_calibration_ok = false; - chosen_phase_1 = 0; - } else { - chosen_phase_1 = mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0]; - } - - if (mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] < 0) { - mtkaif_calibration_ok = false; - chosen_phase_2 = 0; - } else { - chosen_phase_2 = mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1]; - } - - if (mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] < 0) { - mtkaif_calibration_ok = false; - chosen_phase_3 = 0; - } else { - chosen_phase_3 = mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2]; - } - - mt6359_set_mtkaif_calibration_phase(cmpnt_codec, - chosen_phase_1, - chosen_phase_2, - chosen_phase_3); - - mt6359_mtkaif_calibration_disable(cmpnt_codec); - pm_runtime_put(afe->dev); - - param->mtkaif_calibration_ok = mtkaif_calibration_ok; - param->mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] = chosen_phase_1; - param->mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] = chosen_phase_2; - param->mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] = chosen_phase_3; - for (i = 0; i < MT8195_MTKAIF_MISO_NUM; i++) - param->mtkaif_phase_cycle[i] = mtkaif_phase_cycle[i]; - - dev_info(afe->dev, "%s(), end, calibration ok %d\n", - __func__, param->mtkaif_calibration_ok); - - return 0; -} - -static int mt8195_mt6359_init(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; - - /* set mtkaif protocol */ - mt6359_set_mtkaif_protocol(cmpnt_codec, - MT6359_MTKAIF_PROTOCOL_2_CLK_P2); - - /* mtkaif calibration */ - mt8195_mt6359_mtkaif_calibration(rtd); - - return 0; -} - -static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; - struct mt8195_mt6359_rt1011_rt5682_priv *priv = - snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_jack *jack = &priv->headset_jack; - int ret; - - ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", - SND_JACK_HEADSET | SND_JACK_BTN_0 | - SND_JACK_BTN_1 | SND_JACK_BTN_2 | - SND_JACK_BTN_3, - jack, NULL, 0); - if (ret) { - dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret); - return ret; - } - - snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); - snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); - snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); - snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); - - ret = snd_soc_component_set_jack(cmpnt_codec, jack, NULL); - if (ret) { - dev_err(rtd->dev, "Headset Jack set failed: %d\n", ret); - return ret; - } - - return 0; -}; - -static int mt8195_etdm_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, - struct snd_pcm_hw_params *params) -{ - /* fix BE i2s format to 32bit, clean param mask first */ - snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), - 0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST); - - params_set_format(params, SNDRV_PCM_FORMAT_S24_LE); - - return 0; -} - -static int mt8195_hdmitx_dptx_startup(struct snd_pcm_substream *substream) -{ - static const unsigned int rates[] = { - 48000 - }; - static const unsigned int channels[] = { - 2, 4, 6, 8 - }; - static const struct snd_pcm_hw_constraint_list constraints_rates = { - .count = ARRAY_SIZE(rates), - .list = rates, - .mask = 0, - }; - static const struct snd_pcm_hw_constraint_list constraints_channels = { - .count = ARRAY_SIZE(channels), - .list = channels, - .mask = 0, - }; - - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_pcm_runtime *runtime = substream->runtime; - int ret; - - ret = snd_pcm_hw_constraint_list(runtime, 0, - SNDRV_PCM_HW_PARAM_RATE, - &constraints_rates); - if (ret < 0) { - dev_err(rtd->dev, "hw_constraint_list rate failed\n"); - return ret; - } - - ret = snd_pcm_hw_constraint_list(runtime, 0, - SNDRV_PCM_HW_PARAM_CHANNELS, - &constraints_channels); - if (ret < 0) { - dev_err(rtd->dev, "hw_constraint_list channel failed\n"); - return ret; - } - - return 0; -} - -static const struct snd_soc_ops mt8195_hdmitx_dptx_playback_ops = { - .startup = mt8195_hdmitx_dptx_startup, -}; - -static int mt8195_dptx_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - - return snd_soc_dai_set_sysclk(cpu_dai, 0, params_rate(params) * 256, - SND_SOC_CLOCK_OUT); -} - -static struct snd_soc_ops mt8195_dptx_ops = { - .hw_params = mt8195_dptx_hw_params, -}; - -static int mt8195_dptx_codec_init(struct snd_soc_pcm_runtime *rtd) -{ - struct mt8195_mt6359_rt1011_rt5682_priv *priv = - snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; - int ret; - - ret = snd_soc_card_jack_new(rtd->card, "DP Jack", SND_JACK_LINEOUT, - &priv->dp_jack, NULL, 0); - if (ret) - return ret; - - return snd_soc_component_set_jack(cmpnt_codec, &priv->dp_jack, NULL); -} - -static int mt8195_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd) -{ - struct mt8195_mt6359_rt1011_rt5682_priv *priv = - snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; - int ret; - - ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT, - &priv->hdmi_jack, NULL, 0); - if (ret) - return ret; - - return snd_soc_component_set_jack(cmpnt_codec, &priv->hdmi_jack, NULL); -} - -static int mt8195_dptx_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, - struct snd_pcm_hw_params *params) - -{ - /* fix BE i2s format to 32bit, clean param mask first */ - snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), - 0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST); - - params_set_format(params, SNDRV_PCM_FORMAT_S24_LE); - - return 0; -} - -static int mt8195_playback_startup(struct snd_pcm_substream *substream) -{ - static const unsigned int rates[] = { - 48000 - }; - static const unsigned int channels[] = { - 2 - }; - static const struct snd_pcm_hw_constraint_list constraints_rates = { - .count = ARRAY_SIZE(rates), - .list = rates, - .mask = 0, - }; - static const struct snd_pcm_hw_constraint_list constraints_channels = { - .count = ARRAY_SIZE(channels), - .list = channels, - .mask = 0, - }; - - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_pcm_runtime *runtime = substream->runtime; - int ret; - - ret = snd_pcm_hw_constraint_list(runtime, 0, - SNDRV_PCM_HW_PARAM_RATE, - &constraints_rates); - if (ret < 0) { - dev_err(rtd->dev, "hw_constraint_list rate failed\n"); - return ret; - } - - ret = snd_pcm_hw_constraint_list(runtime, 0, - SNDRV_PCM_HW_PARAM_CHANNELS, - &constraints_channels); - if (ret < 0) { - dev_err(rtd->dev, "hw_constraint_list channel failed\n"); - return ret; - } - - return 0; -} - -static const struct snd_soc_ops mt8195_playback_ops = { - .startup = mt8195_playback_startup, -}; - -static int mt8195_capture_startup(struct snd_pcm_substream *substream) -{ - static const unsigned int rates[] = { - 48000 - }; - static const unsigned int channels[] = { - 1, 2 - }; - static const struct snd_pcm_hw_constraint_list constraints_rates = { - .count = ARRAY_SIZE(rates), - .list = rates, - .mask = 0, - }; - static const struct snd_pcm_hw_constraint_list constraints_channels = { - .count = ARRAY_SIZE(channels), - .list = channels, - .mask = 0, - }; - - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_pcm_runtime *runtime = substream->runtime; - int ret; - - ret = snd_pcm_hw_constraint_list(runtime, 0, - SNDRV_PCM_HW_PARAM_RATE, - &constraints_rates); - if (ret < 0) { - dev_err(rtd->dev, "hw_constraint_list rate failed\n"); - return ret; - } - - ret = snd_pcm_hw_constraint_list(runtime, 0, - SNDRV_PCM_HW_PARAM_CHANNELS, - &constraints_channels); - if (ret < 0) { - dev_err(rtd->dev, "hw_constraint_list channel failed\n"); - return ret; - } - - return 0; -} - -static const struct snd_soc_ops mt8195_capture_ops = { - .startup = mt8195_capture_startup, -}; - enum { DAI_LINK_DL2_FE, DAI_LINK_DL3_FE, @@ -959,7 +431,7 @@ static struct snd_soc_dai_link mt8195_mt6359_rt1011_rt5682_dai_links[] = { .dpcm_capture = 1, .init = mt8195_rt5682_init, .ops = &mt8195_rt5682_etdm_ops, - .be_hw_params_fixup = mt8195_etdm_hw_params_fixup, + .be_hw_params_fixup = mt8195_etdm_rt_hw_params_fixup, SND_SOC_DAILINK_REG(ETDM2_IN_BE), }, [DAI_LINK_ETDM1_OUT_BE] = { @@ -970,7 +442,7 @@ static struct snd_soc_dai_link mt8195_mt6359_rt1011_rt5682_dai_links[] = { SND_SOC_DAIFMT_CBS_CFS, .dpcm_playback = 1, .ops = &mt8195_rt5682_etdm_ops, - .be_hw_params_fixup = mt8195_etdm_hw_params_fixup, + .be_hw_params_fixup = mt8195_etdm_rt_hw_params_fixup, SND_SOC_DAILINK_REG(ETDM1_OUT_BE), }, [DAI_LINK_ETDM2_OUT_BE] = { @@ -981,7 +453,7 @@ static struct snd_soc_dai_link mt8195_mt6359_rt1011_rt5682_dai_links[] = { SND_SOC_DAIFMT_CBS_CFS, .dpcm_playback = 1, .ops = &mt8195_rt1011_etdm_ops, - .be_hw_params_fixup = mt8195_etdm_hw_params_fixup, + .be_hw_params_fixup = mt8195_etdm_rt_hw_params_fixup, SND_SOC_DAILINK_REG(ETDM2_OUT_BE), }, [DAI_LINK_ETDM3_OUT_BE] = { @@ -1016,17 +488,6 @@ static struct snd_soc_dai_link mt8195_mt6359_rt1011_rt5682_dai_links[] = { }, };
-static struct snd_soc_codec_conf rt1011_amp_conf[] = { - { - .dlc = COMP_CODEC_CONF(RT1011_DEV0_NAME), - .name_prefix = "Left", - }, - { - .dlc = COMP_CODEC_CONF(RT1011_DEV1_NAME), - .name_prefix = "Right", - }, -}; - static struct snd_soc_card mt8195_mt6359_rt1011_rt5682_soc_card = { .name = "mt8195_r1011_5682", .owner = THIS_MODULE, @@ -1038,15 +499,13 @@ static struct snd_soc_card mt8195_mt6359_rt1011_rt5682_soc_card = { .num_dapm_widgets = ARRAY_SIZE(mt8195_mt6359_rt1011_rt5682_widgets), .dapm_routes = mt8195_mt6359_rt1011_rt5682_routes, .num_dapm_routes = ARRAY_SIZE(mt8195_mt6359_rt1011_rt5682_routes), - .codec_conf = rt1011_amp_conf, - .num_configs = ARRAY_SIZE(rt1011_amp_conf), };
static int mt8195_mt6359_rt1011_rt5682_dev_probe(struct platform_device *pdev) { struct snd_soc_card *card = &mt8195_mt6359_rt1011_rt5682_soc_card; struct snd_soc_dai_link *dai_link; - struct mt8195_mt6359_rt1011_rt5682_priv *priv; + struct mt8195_priv *priv; int is5682s = 0; int ret, i;
@@ -1080,7 +539,6 @@ static int mt8195_mt6359_rt1011_rt5682_dev_probe(struct platform_device *pdev) priv->dp_node = of_parse_phandle(pdev->dev.of_node, "mediatek,dptx-codec", 0); - if (!priv->dp_node) { dev_dbg(&pdev->dev, "No property 'dptx-codec'\n"); } else { @@ -1112,6 +570,8 @@ static int mt8195_mt6359_rt1011_rt5682_dev_probe(struct platform_device *pdev)
snd_soc_card_set_drvdata(card, priv);
+ mt8195_rt1011_codec_conf(card); + ret = devm_snd_soc_register_card(&pdev->dev, card); if (ret) { dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", @@ -1127,8 +587,7 @@ static int mt8195_mt6359_rt1011_rt5682_dev_probe(struct platform_device *pdev) static int mt8195_mt6359_rt1011_rt5682_dev_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); - struct mt8195_mt6359_rt1011_rt5682_priv *priv = - snd_soc_card_get_drvdata(card); + struct mt8195_priv *priv = snd_soc_card_get_drvdata(card);
of_node_put(priv->hdmi_node); of_node_put(priv->dp_node); @@ -1144,18 +603,13 @@ static const struct of_device_id mt8195_mt6359_rt1011_rt5682_dt_match[] = { }; #endif
-static const struct dev_pm_ops mt8195_mt6359_rt1011_rt5682_pm_ops = { - .poweroff = snd_soc_poweroff, - .restore = snd_soc_resume, -}; - static struct platform_driver mt8195_mt6359_rt1011_rt5682_driver = { .driver = { .name = "mt8195_mt6359_rt1011_rt5682", #ifdef CONFIG_OF .of_match_table = mt8195_mt6359_rt1011_rt5682_dt_match, #endif - .pm = &mt8195_mt6359_rt1011_rt5682_pm_ops, + .pm = &mt8195_pm_ops, }, .probe = mt8195_mt6359_rt1011_rt5682_dev_probe, .remove = mt8195_mt6359_rt1011_rt5682_dev_remove, diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c index 7209c70acf6e..1f3d5cf6fa4c 100644 --- a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682.c @@ -1,41 +1,16 @@ // SPDX-License-Identifier: GPL-2.0 // // mt8195-mt6359-rt1019-rt5682.c -- -// MT8195-MT6359-RT1019-RT6358 ALSA SoC machine driver +// MT8195-MT6359-RT1019-RT5682 ALSA SoC machine driver // // Copyright (c) 2021 MediaTek Inc. // Author: Trevor Wu trevor.wu@mediatek.com //
-#include <linux/input.h> #include <linux/module.h> -#include <linux/pm_runtime.h> -#include <sound/jack.h> -#include <sound/pcm_params.h> -#include <sound/rt5682.h> #include <sound/soc.h> -#include "../../codecs/mt6359.h" -#include "../../codecs/rt5682.h" -#include "../common/mtk-afe-platform-driver.h" -#include "mt8195-afe-common.h" - -#define RT1019_CODEC_DAI "HiFi" -#define RT1019_DEV0_NAME "rt1019p" - -#define RT5682_CODEC_DAI "rt5682-aif1" -#define RT5682_DEV0_NAME "rt5682.2-001a" - -#define RT5682S_CODEC_DAI "rt5682s-aif1" -#define RT5682S_DEV0_NAME "rt5682s.2-001a" - -struct mt8195_mt6359_rt1019_rt5682_priv { - struct device_node *platform_node; - struct device_node *hdmi_node; - struct device_node *dp_node; - struct snd_soc_jack headset_jack; - struct snd_soc_jack dp_jack; - struct snd_soc_jack hdmi_jack; -}; +#include "mt8195-common.h" +#include "mt8195-realtek-common.h"
static const struct snd_soc_dapm_widget mt8195_mt6359_rt1019_rt5682_widgets[] = { @@ -59,482 +34,6 @@ static const struct snd_kcontrol_new mt8195_mt6359_rt1019_rt5682_controls[] = { SOC_DAPM_PIN_SWITCH("Headset Mic"), };
-static int mt8195_rt5682_etdm_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_card *card = rtd->card; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); - unsigned int rate = params_rate(params); - unsigned int mclk_fs_ratio = 128; - unsigned int mclk_fs = rate * mclk_fs_ratio; - int bitwidth; - int ret; - - bitwidth = snd_pcm_format_width(params_format(params)); - if (bitwidth < 0) { - dev_err(card->dev, "invalid bit width: %d\n", bitwidth); - return bitwidth; - } - - ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x00, 0x0, 0x2, bitwidth); - if (ret) { - dev_err(card->dev, "failed to set tdm slot\n"); - return ret; - } - - ret = snd_soc_dai_set_pll(codec_dai, RT5682_PLL1, - RT5682_PLL1_S_BCLK1, - params_rate(params) * 64, - params_rate(params) * 512); - if (ret) { - dev_err(card->dev, "failed to set pll\n"); - return ret; - } - - ret = snd_soc_dai_set_sysclk(codec_dai, - RT5682_SCLK_S_PLL1, - params_rate(params) * 512, - SND_SOC_CLOCK_IN); - if (ret) { - dev_err(card->dev, "failed to set sysclk\n"); - return ret; - } - - return snd_soc_dai_set_sysclk(cpu_dai, 0, mclk_fs, SND_SOC_CLOCK_OUT); -} - -static const struct snd_soc_ops mt8195_rt5682_etdm_ops = { - .hw_params = mt8195_rt5682_etdm_hw_params, -}; - -#define CKSYS_AUD_TOP_CFG 0x032c -#define CKSYS_AUD_TOP_MON 0x0330 - -static int mt8195_mt6359_mtkaif_calibration(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_component *cmpnt_afe = - snd_soc_rtdcom_lookup(rtd, AFE_PCM_NAME); - struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; - struct mtk_base_afe *afe = snd_soc_component_get_drvdata(cmpnt_afe); - struct mt8195_afe_private *afe_priv = afe->platform_priv; - struct mtkaif_param *param = &afe_priv->mtkaif_params; - int phase; - unsigned int monitor; - int mtkaif_calibration_num_phase; - int test_done_1, test_done_2, test_done_3; - int cycle_1, cycle_2, cycle_3; - int prev_cycle_1, prev_cycle_2, prev_cycle_3; - int chosen_phase_1, chosen_phase_2, chosen_phase_3; - int counter; - bool mtkaif_calibration_ok; - int mtkaif_chosen_phase[MT8195_MTKAIF_MISO_NUM]; - int mtkaif_phase_cycle[MT8195_MTKAIF_MISO_NUM]; - int i; - - dev_info(afe->dev, "%s(), start\n", __func__); - - param->mtkaif_calibration_ok = false; - for (i = 0; i < MT8195_MTKAIF_MISO_NUM; i++) { - param->mtkaif_chosen_phase[i] = -1; - param->mtkaif_phase_cycle[i] = 0; - mtkaif_chosen_phase[i] = -1; - mtkaif_phase_cycle[i] = 0; - } - - if (IS_ERR(afe_priv->topckgen)) { - dev_info(afe->dev, "%s() Cannot find topckgen controller\n", - __func__); - return 0; - } - - pm_runtime_get_sync(afe->dev); - mt6359_mtkaif_calibration_enable(cmpnt_codec); - - /* set test type to synchronizer pulse */ - regmap_update_bits(afe_priv->topckgen, - CKSYS_AUD_TOP_CFG, 0xffff, 0x4); - mtkaif_calibration_num_phase = 42; /* mt6359: 0 ~ 42 */ - mtkaif_calibration_ok = true; - - for (phase = 0; - phase <= mtkaif_calibration_num_phase && mtkaif_calibration_ok; - phase++) { - mt6359_set_mtkaif_calibration_phase(cmpnt_codec, - phase, phase, phase); - - regmap_update_bits(afe_priv->topckgen, - CKSYS_AUD_TOP_CFG, 0x1, 0x1); - - test_done_1 = 0; - test_done_2 = 0; - test_done_3 = 0; - cycle_1 = -1; - cycle_2 = -1; - cycle_3 = -1; - counter = 0; - while (!(test_done_1 & test_done_2 & test_done_3)) { - regmap_read(afe_priv->topckgen, - CKSYS_AUD_TOP_MON, &monitor); - test_done_1 = (monitor >> 28) & 0x1; - test_done_2 = (monitor >> 29) & 0x1; - test_done_3 = (monitor >> 30) & 0x1; - if (test_done_1 == 1) - cycle_1 = monitor & 0xf; - - if (test_done_2 == 1) - cycle_2 = (monitor >> 4) & 0xf; - - if (test_done_3 == 1) - cycle_3 = (monitor >> 8) & 0xf; - - /* handle if never test done */ - if (++counter > 10000) { - dev_info(afe->dev, "%s(), test fail, cycle_1 %d, cycle_2 %d, cycle_3 %d, monitor 0x%x\n", - __func__, - cycle_1, cycle_2, cycle_3, monitor); - mtkaif_calibration_ok = false; - break; - } - } - - if (phase == 0) { - prev_cycle_1 = cycle_1; - prev_cycle_2 = cycle_2; - prev_cycle_3 = cycle_3; - } - - if (cycle_1 != prev_cycle_1 && - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] < 0) { - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] = phase - 1; - mtkaif_phase_cycle[MT8195_MTKAIF_MISO_0] = prev_cycle_1; - } - - if (cycle_2 != prev_cycle_2 && - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] < 0) { - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] = phase - 1; - mtkaif_phase_cycle[MT8195_MTKAIF_MISO_1] = prev_cycle_2; - } - - if (cycle_3 != prev_cycle_3 && - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] < 0) { - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] = phase - 1; - mtkaif_phase_cycle[MT8195_MTKAIF_MISO_2] = prev_cycle_3; - } - - regmap_update_bits(afe_priv->topckgen, - CKSYS_AUD_TOP_CFG, 0x1, 0x0); - - if (mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] >= 0 && - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] >= 0 && - mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] >= 0) - break; - } - - if (mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] < 0) { - mtkaif_calibration_ok = false; - chosen_phase_1 = 0; - } else { - chosen_phase_1 = mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0]; - } - - if (mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] < 0) { - mtkaif_calibration_ok = false; - chosen_phase_2 = 0; - } else { - chosen_phase_2 = mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1]; - } - - if (mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] < 0) { - mtkaif_calibration_ok = false; - chosen_phase_3 = 0; - } else { - chosen_phase_3 = mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2]; - } - - mt6359_set_mtkaif_calibration_phase(cmpnt_codec, - chosen_phase_1, - chosen_phase_2, - chosen_phase_3); - - mt6359_mtkaif_calibration_disable(cmpnt_codec); - pm_runtime_put(afe->dev); - - param->mtkaif_calibration_ok = mtkaif_calibration_ok; - param->mtkaif_chosen_phase[MT8195_MTKAIF_MISO_0] = chosen_phase_1; - param->mtkaif_chosen_phase[MT8195_MTKAIF_MISO_1] = chosen_phase_2; - param->mtkaif_chosen_phase[MT8195_MTKAIF_MISO_2] = chosen_phase_3; - for (i = 0; i < MT8195_MTKAIF_MISO_NUM; i++) - param->mtkaif_phase_cycle[i] = mtkaif_phase_cycle[i]; - - dev_info(afe->dev, "%s(), end, calibration ok %d\n", - __func__, param->mtkaif_calibration_ok); - - return 0; -} - -static int mt8195_mt6359_init(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; - - /* set mtkaif protocol */ - mt6359_set_mtkaif_protocol(cmpnt_codec, - MT6359_MTKAIF_PROTOCOL_2_CLK_P2); - - /* mtkaif calibration */ - mt8195_mt6359_mtkaif_calibration(rtd); - - return 0; -} - -static int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd) -{ - struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; - struct mt8195_mt6359_rt1019_rt5682_priv *priv = - snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_jack *jack = &priv->headset_jack; - int ret; - - ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", - SND_JACK_HEADSET | SND_JACK_BTN_0 | - SND_JACK_BTN_1 | SND_JACK_BTN_2 | - SND_JACK_BTN_3, - jack, NULL, 0); - if (ret) { - dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret); - return ret; - } - - snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); - snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); - snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); - snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); - - ret = snd_soc_component_set_jack(cmpnt_codec, jack, NULL); - if (ret) { - dev_err(rtd->dev, "Headset Jack set failed: %d\n", ret); - return ret; - } - - return 0; -}; - -static int mt8195_etdm_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, - struct snd_pcm_hw_params *params) -{ - /* fix BE i2s format to 32bit, clean param mask first */ - snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), - 0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST); - - params_set_format(params, SNDRV_PCM_FORMAT_S24_LE); - - return 0; -} - -static int mt8195_hdmitx_dptx_startup(struct snd_pcm_substream *substream) -{ - static const unsigned int rates[] = { - 48000 - }; - static const unsigned int channels[] = { - 2, 4, 6, 8 - }; - static const struct snd_pcm_hw_constraint_list constraints_rates = { - .count = ARRAY_SIZE(rates), - .list = rates, - .mask = 0, - }; - static const struct snd_pcm_hw_constraint_list constraints_channels = { - .count = ARRAY_SIZE(channels), - .list = channels, - .mask = 0, - }; - - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_pcm_runtime *runtime = substream->runtime; - int ret; - - ret = snd_pcm_hw_constraint_list(runtime, 0, - SNDRV_PCM_HW_PARAM_RATE, - &constraints_rates); - if (ret < 0) { - dev_err(rtd->dev, "hw_constraint_list rate failed\n"); - return ret; - } - - ret = snd_pcm_hw_constraint_list(runtime, 0, - SNDRV_PCM_HW_PARAM_CHANNELS, - &constraints_channels); - if (ret < 0) { - dev_err(rtd->dev, "hw_constraint_list channel failed\n"); - return ret; - } - - return 0; -} - -static const struct snd_soc_ops mt8195_hdmitx_dptx_playback_ops = { - .startup = mt8195_hdmitx_dptx_startup, -}; - -static int mt8195_dptx_hw_params(struct snd_pcm_substream *substream, - struct snd_pcm_hw_params *params) -{ - struct snd_soc_pcm_runtime *rtd = substream->private_data; - struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); - unsigned int rate = params_rate(params); - unsigned int mclk_fs_ratio = 256; - unsigned int mclk_fs = rate * mclk_fs_ratio; - - return snd_soc_dai_set_sysclk(cpu_dai, 0, mclk_fs, - SND_SOC_CLOCK_OUT); -} - -static struct snd_soc_ops mt8195_dptx_ops = { - .hw_params = mt8195_dptx_hw_params, -}; - -static int mt8195_dptx_codec_init(struct snd_soc_pcm_runtime *rtd) -{ - struct mt8195_mt6359_rt1019_rt5682_priv *priv = - snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; - int ret = 0; - - ret = snd_soc_card_jack_new(rtd->card, "DP Jack", SND_JACK_LINEOUT, - &priv->dp_jack, NULL, 0); - if (ret) - return ret; - - return snd_soc_component_set_jack(cmpnt_codec, &priv->dp_jack, NULL); -} - -static int mt8195_hdmi_codec_init(struct snd_soc_pcm_runtime *rtd) -{ - struct mt8195_mt6359_rt1019_rt5682_priv *priv = - snd_soc_card_get_drvdata(rtd->card); - struct snd_soc_component *cmpnt_codec = - asoc_rtd_to_codec(rtd, 0)->component; - int ret = 0; - - ret = snd_soc_card_jack_new(rtd->card, "HDMI Jack", SND_JACK_LINEOUT, - &priv->hdmi_jack, NULL, 0); - if (ret) - return ret; - - return snd_soc_component_set_jack(cmpnt_codec, &priv->hdmi_jack, NULL); -} - -static int mt8195_dptx_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, - struct snd_pcm_hw_params *params) - -{ - /* fix BE i2s format to 32bit, clean param mask first */ - snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), - 0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST); - - params_set_format(params, SNDRV_PCM_FORMAT_S24_LE); - - return 0; -} - -static int mt8195_playback_startup(struct snd_pcm_substream *substream) -{ - static const unsigned int rates[] = { - 48000 - }; - static const unsigned int channels[] = { - 2 - }; - static const struct snd_pcm_hw_constraint_list constraints_rates = { - .count = ARRAY_SIZE(rates), - .list = rates, - .mask = 0, - }; - static const struct snd_pcm_hw_constraint_list constraints_channels = { - .count = ARRAY_SIZE(channels), - .list = channels, - .mask = 0, - }; - - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_pcm_runtime *runtime = substream->runtime; - int ret; - - ret = snd_pcm_hw_constraint_list(runtime, 0, - SNDRV_PCM_HW_PARAM_RATE, - &constraints_rates); - if (ret < 0) { - dev_err(rtd->dev, "hw_constraint_list rate failed\n"); - return ret; - } - - ret = snd_pcm_hw_constraint_list(runtime, 0, - SNDRV_PCM_HW_PARAM_CHANNELS, - &constraints_channels); - if (ret < 0) { - dev_err(rtd->dev, "hw_constraint_list channel failed\n"); - return ret; - } - - return 0; -} - -static const struct snd_soc_ops mt8195_playback_ops = { - .startup = mt8195_playback_startup, -}; - -static int mt8195_capture_startup(struct snd_pcm_substream *substream) -{ - static const unsigned int rates[] = { - 48000 - }; - static const unsigned int channels[] = { - 1, 2 - }; - static const struct snd_pcm_hw_constraint_list constraints_rates = { - .count = ARRAY_SIZE(rates), - .list = rates, - .mask = 0, - }; - static const struct snd_pcm_hw_constraint_list constraints_channels = { - .count = ARRAY_SIZE(channels), - .list = channels, - .mask = 0, - }; - - struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); - struct snd_pcm_runtime *runtime = substream->runtime; - int ret; - - ret = snd_pcm_hw_constraint_list(runtime, 0, - SNDRV_PCM_HW_PARAM_RATE, - &constraints_rates); - if (ret < 0) { - dev_err(rtd->dev, "hw_constraint_list rate failed\n"); - return ret; - } - - ret = snd_pcm_hw_constraint_list(runtime, 0, - SNDRV_PCM_HW_PARAM_CHANNELS, - &constraints_channels); - if (ret < 0) { - dev_err(rtd->dev, "hw_constraint_list channel failed\n"); - return ret; - } - - return 0; -} - -static const struct snd_soc_ops mt8195_capture_ops = { - .startup = mt8195_capture_startup, -}; - enum { DAI_LINK_DL2_FE, DAI_LINK_DL3_FE, @@ -927,7 +426,7 @@ static struct snd_soc_dai_link mt8195_mt6359_rt1019_rt5682_dai_links[] = { .dpcm_capture = 1, .init = mt8195_rt5682_init, .ops = &mt8195_rt5682_etdm_ops, - .be_hw_params_fixup = mt8195_etdm_hw_params_fixup, + .be_hw_params_fixup = mt8195_etdm_rt_hw_params_fixup, SND_SOC_DAILINK_REG(ETDM2_IN_BE), }, [DAI_LINK_ETDM1_OUT_BE] = { @@ -938,7 +437,7 @@ static struct snd_soc_dai_link mt8195_mt6359_rt1019_rt5682_dai_links[] = { SND_SOC_DAIFMT_CBS_CFS, .dpcm_playback = 1, .ops = &mt8195_rt5682_etdm_ops, - .be_hw_params_fixup = mt8195_etdm_hw_params_fixup, + .be_hw_params_fixup = mt8195_etdm_rt_hw_params_fixup, SND_SOC_DAILINK_REG(ETDM1_OUT_BE), }, [DAI_LINK_ETDM2_OUT_BE] = { @@ -999,7 +498,7 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) { struct snd_soc_card *card = &mt8195_mt6359_rt1019_rt5682_soc_card; struct snd_soc_dai_link *dai_link; - struct mt8195_mt6359_rt1019_rt5682_priv *priv; + struct mt8195_priv *priv; int is5682s = 0; int ret, i;
@@ -1021,6 +520,7 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev)
priv->platform_node = of_parse_phandle(pdev->dev.of_node, "mediatek,platform", 0); + if (!priv->platform_node) { dev_dbg(&pdev->dev, "Property 'platform' missing or invalid\n"); return -EINVAL; @@ -1034,7 +534,6 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) priv->dp_node = of_parse_phandle(pdev->dev.of_node, "mediatek,dptx-codec", 0); - if (!priv->dp_node) { dev_dbg(&pdev->dev, "No property 'dptx-codec'\n"); } else { @@ -1081,8 +580,7 @@ static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) static int mt8195_mt6359_rt1019_rt5682_dev_remove(struct platform_device *pdev) { struct snd_soc_card *card = platform_get_drvdata(pdev); - struct mt8195_mt6359_rt1019_rt5682_priv *priv = - snd_soc_card_get_drvdata(card); + struct mt8195_priv *priv = snd_soc_card_get_drvdata(card);
of_node_put(priv->hdmi_node); of_node_put(priv->dp_node); @@ -1098,18 +596,13 @@ static const struct of_device_id mt8195_mt6359_rt1019_rt5682_dt_match[] = { }; #endif
-static const struct dev_pm_ops mt8195_mt6359_rt1019_rt5682_pm_ops = { - .poweroff = snd_soc_poweroff, - .restore = snd_soc_resume, -}; - static struct platform_driver mt8195_mt6359_rt1019_rt5682_driver = { .driver = { .name = "mt8195_mt6359_rt1019_rt5682", #ifdef CONFIG_OF .of_match_table = mt8195_mt6359_rt1019_rt5682_dt_match, #endif - .pm = &mt8195_mt6359_rt1019_rt5682_pm_ops, + .pm = &mt8195_pm_ops, }, .probe = mt8195_mt6359_rt1019_rt5682_dev_probe, .remove = mt8195_mt6359_rt1019_rt5682_dev_remove, @@ -1120,5 +613,5 @@ module_platform_driver(mt8195_mt6359_rt1019_rt5682_driver); /* Module information */ MODULE_DESCRIPTION("MT8195-MT6359-RT1019-RT5682 ALSA SoC machine driver"); MODULE_AUTHOR("Trevor Wu trevor.wu@mediatek.com"); -MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL"); MODULE_ALIAS("mt8195_mt6359_rt1019_rt5682 soc card"); diff --git a/sound/soc/mediatek/mt8195/mt8195-realtek-common.c b/sound/soc/mediatek/mt8195/mt8195-realtek-common.c new file mode 100644 index 000000000000..2ca9ae571441 --- /dev/null +++ b/sound/soc/mediatek/mt8195/mt8195-realtek-common.c @@ -0,0 +1,161 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * mt8195-realtek-common.c -- + * common code for realtek codec used in mt8195 machine driver + * + * Copyright (c) 2021 MediaTek Inc. + * Author: Trevor Wu trevor.wu@mediatek.com + */ + +#include <linux/input.h> +#include <sound/jack.h> +#include <sound/pcm_params.h> +#include <sound/rt5682.h> +#include <sound/soc.h> +#include "../../codecs/rt1011.h" +#include "../../codecs/rt5682.h" +#include "mt8195-common.h" +#include "mt8195-realtek-common.h" + +int mt8195_etdm_rt_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + /* fix BE i2s format to 32bit, clean param mask first */ + snd_mask_reset_range(hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT), + 0, (__force unsigned int)SNDRV_PCM_FORMAT_LAST); + + params_set_format(params, SNDRV_PCM_FORMAT_S24_LE); + + return 0; +} + +static int mt8195_rt5682_etdm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = substream->private_data; + struct snd_soc_card *card = rtd->card; + struct snd_soc_dai *cpu_dai = asoc_rtd_to_cpu(rtd, 0); + struct snd_soc_dai *codec_dai = asoc_rtd_to_codec(rtd, 0); + unsigned int rate = params_rate(params); + int bitwidth; + int ret; + + bitwidth = snd_pcm_format_width(params_format(params)); + if (bitwidth < 0) { + dev_err(card->dev, "invalid bit width: %d\n", bitwidth); + return bitwidth; + } + + ret = snd_soc_dai_set_tdm_slot(codec_dai, 0x00, 0x0, 0x2, bitwidth); + if (ret) { + dev_err(card->dev, "failed to set tdm slot\n"); + return ret; + } + + ret = snd_soc_dai_set_pll(codec_dai, RT5682_PLL1, + RT5682_PLL1_S_BCLK1, + rate * 64, + rate * 512); + if (ret) { + dev_err(card->dev, "failed to set pll\n"); + return ret; + } + + ret = snd_soc_dai_set_sysclk(codec_dai, + RT5682_SCLK_S_PLL1, + rate * 512, + SND_SOC_CLOCK_IN); + if (ret) { + dev_err(card->dev, "failed to set sysclk\n"); + return ret; + } + + return snd_soc_dai_set_sysclk(cpu_dai, 0, rate * 128, + SND_SOC_CLOCK_OUT); +} + +const struct snd_soc_ops mt8195_rt5682_etdm_ops = { + .hw_params = mt8195_rt5682_etdm_hw_params, +}; + +int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd) +{ + struct snd_soc_component *cmpnt_codec = + asoc_rtd_to_codec(rtd, 0)->component; + struct mt8195_priv *priv = + snd_soc_card_get_drvdata(rtd->card); + struct snd_soc_jack *jack = &priv->headset_jack; + int ret; + + ret = snd_soc_card_jack_new(rtd->card, "Headset Jack", + SND_JACK_HEADSET | SND_JACK_BTN_0 | + SND_JACK_BTN_1 | SND_JACK_BTN_2 | + SND_JACK_BTN_3, + jack, NULL, 0); + if (ret) { + dev_err(rtd->dev, "Headset Jack creation failed: %d\n", ret); + return ret; + } + + snd_jack_set_key(jack->jack, SND_JACK_BTN_0, KEY_PLAYPAUSE); + snd_jack_set_key(jack->jack, SND_JACK_BTN_1, KEY_VOICECOMMAND); + snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); + snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); + + ret = snd_soc_component_set_jack(cmpnt_codec, jack, NULL); + if (ret) { + dev_err(rtd->dev, "Headset Jack set failed: %d\n", ret); + return ret; + } + + return 0; +}; + +static int mt8195_rt1011_etdm_hw_params(struct snd_pcm_substream *substream, + struct snd_pcm_hw_params *params) +{ + struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream); + struct snd_soc_card *card = rtd->card; + struct snd_soc_dai *codec_dai; + unsigned int rate = params_rate(params); + int i, ret = 0; + + for_each_rtd_codec_dais(rtd, i, codec_dai) { + ret = snd_soc_dai_set_pll(codec_dai, 0, RT1011_PLL1_S_BCLK, + 64 * rate, 256 * rate); + if (ret < 0) { + dev_err(card->dev, "codec_dai clock not set\n"); + return ret; + } + + ret = snd_soc_dai_set_sysclk(codec_dai, + RT1011_FS_SYS_PRE_S_PLL1, + 256 * rate, SND_SOC_CLOCK_IN); + if (ret < 0) { + dev_err(card->dev, "codec_dai clock not set\n"); + return ret; + } + } + return ret; +} + +const struct snd_soc_ops mt8195_rt1011_etdm_ops = { + .hw_params = mt8195_rt1011_etdm_hw_params, +}; + +static struct snd_soc_codec_conf rt1011_amp_conf[] = { + { + .dlc = COMP_CODEC_CONF(RT1011_DEV0_NAME), + .name_prefix = "Left", + }, + { + .dlc = COMP_CODEC_CONF(RT1011_DEV1_NAME), + .name_prefix = "Right", + }, +}; + +void mt8195_rt1011_codec_conf(struct snd_soc_card *card) +{ + card->codec_conf = rt1011_amp_conf; + card->num_configs = ARRAY_SIZE(rt1011_amp_conf); +} diff --git a/sound/soc/mediatek/mt8195/mt8195-realtek-common.h b/sound/soc/mediatek/mt8195/mt8195-realtek-common.h new file mode 100644 index 000000000000..4a2c6fe551e9 --- /dev/null +++ b/sound/soc/mediatek/mt8195/mt8195-realtek-common.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * mt8195-realtek-common.h -- + * Mediatek 8195 realtek common header for machine driver + * + * Copyright (c) 2021 MediaTek Inc. + * Author: Trevor Wu trevor.wu@mediatek.com + */ + +#ifndef _MT_8195_RT_COMMON_H_ +#define _MT_8195_RT_COMMON_H_ + +#define RT1019_CODEC_DAI "HiFi" +#define RT1019_DEV0_NAME "rt1019p" + +#define RT5682_CODEC_DAI "rt5682-aif1" +#define RT5682_DEV0_NAME "rt5682.2-001a" + +#define RT5682S_CODEC_DAI "rt5682s-aif1" +#define RT5682S_DEV0_NAME "rt5682s.2-001a" + +#define RT1011_CODEC_DAI "rt1011-aif" +#define RT1011_DEV0_NAME "rt1011.2-0038" +#define RT1011_DEV1_NAME "rt1011.2-0039" + +extern const struct snd_soc_ops mt8195_rt5682_etdm_ops; +extern const struct snd_soc_ops mt8195_rt1011_etdm_ops; + +int mt8195_etdm_rt_hw_params_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params); +int mt8195_rt5682_init(struct snd_soc_pcm_runtime *rtd); +void mt8195_rt1011_codec_conf(struct snd_soc_card *card); + +#endif
On Wed, Nov 03, 2021 at 06:00:39PM +0800, Trevor Wu wrote:
Because we will add DSP support, an new machine driver for the same board is required. BE and codec configuration will use the same code when machine driver is designed for the same board.
I don't follow why the DSP support requires a new driver? Shouldn't all systems with the DSP present be using it?
On Thu, 2021-11-04 at 15:39 +0000, Mark Brown wrote:
On Wed, Nov 03, 2021 at 06:00:39PM +0800, Trevor Wu wrote:
Because we will add DSP support, an new machine driver for the same board is required. BE and codec configuration will use the same code when machine driver is designed for the same board.
I don't follow why the DSP support requires a new driver? Shouldn't all systems with the DSP present be using it?
We need to keep the solution without DSP, so we can replace DSP solution with non-DSP when it's required. But when we introduce SOF for DSP control, there will be more routes in machine driver and device tree usage is different from the original. So it's hard to share the same driver for these two solutions.
Thanks, Trevor
Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek
On Fri, Nov 05, 2021 at 12:11:55PM +0800, Trevor Wu wrote:
On Thu, 2021-11-04 at 15:39 +0000, Mark Brown wrote:
I don't follow why the DSP support requires a new driver? Shouldn't all systems with the DSP present be using it?
We need to keep the solution without DSP, so we can replace DSP solution with non-DSP when it's required. But when we introduce SOF for DSP control, there will be more routes in machine driver and device tree usage is different from the original. So it's hard to share the same driver for these two solutions.
We shouldn't be requiring people to load completely different drivers based on software configuration, what if a system wants to bypass the DSP in some but not all configurations? Can we not just have controls allowing users to route round the DSP where appropriate?
On 11/5/21 10:38 AM, Mark Brown wrote:
On Fri, Nov 05, 2021 at 12:11:55PM +0800, Trevor Wu wrote:
On Thu, 2021-11-04 at 15:39 +0000, Mark Brown wrote:
I don't follow why the DSP support requires a new driver? Shouldn't all systems with the DSP present be using it?
We need to keep the solution without DSP, so we can replace DSP solution with non-DSP when it's required. But when we introduce SOF for DSP control, there will be more routes in machine driver and device tree usage is different from the original. So it's hard to share the same driver for these two solutions.
We shouldn't be requiring people to load completely different drivers based on software configuration, what if a system wants to bypass the DSP in some but not all configurations? Can we not just have controls allowing users to route round the DSP where appropriate?
It was my understanding the card relies on separate components
- a SOF-based component to provide support for DSP-managed interfaces - a 'non-SOF' component for 'regular' interfaces not handled by the DSP.
this was the basis for the changes discussed in https://github.com/thesofproject/linux/pull/3217 and https://github.com/thesofproject/linux/pull/3236
But indeed if the same interface can be managed by the DSP or not, depending on software choices it's a different problem altogether.
We've looked into this recently, if the choice to involve the DSP or not is at the interface level, it might be better to have both components expose different DAIs for the same interface, with some sort of run-time mutual exclusion, so that all possible/allowed permutations are allowed.
On Fri, Nov 05, 2021 at 11:16:05AM -0500, Pierre-Louis Bossart wrote:
On 11/5/21 10:38 AM, Mark Brown wrote:
We shouldn't be requiring people to load completely different drivers based on software configuration, what if a system wants to bypass the DSP in some but not all configurations? Can we not just have controls allowing users to route round the DSP where appropriate?
It was my understanding the card relies on separate components
- a SOF-based component to provide support for DSP-managed interfaces
- a 'non-SOF' component for 'regular' interfaces not handled by the DSP.
this was the basis for the changes discussed in https://github.com/thesofproject/linux/pull/3217 and https://github.com/thesofproject/linux/pull/3236
So it's actually supposed to end up as two different cards which can't possibly be interlinked? That doesn't seem to add up entirely given that there's stuff being moved out of the current card, and I thought these systems had a fairly comprehensive audio muxing capability. Trevor, could you be a bit more specific about what's actually going on here physically please?
But indeed if the same interface can be managed by the DSP or not, depending on software choices it's a different problem altogether.
We've looked into this recently, if the choice to involve the DSP or not is at the interface level, it might be better to have both components expose different DAIs for the same interface, with some sort of run-time mutual exclusion, so that all possible/allowed permutations are allowed.
Yes, if the interface can optionally be completely hidden by the DSP that's adding another layer of complication.
Hi Mark,
I am YC Hung from Mediatek. Let me show our block diagram as the link below for the sound card which support SOF.
https://user-images.githubusercontent.com/62316/132476344-923dfe3a-5305-43e5... In this sound card, there are two components , one is SOF based component and another is non-SOF based component(called Normal in the block). We want to reuse some BEs of Normal which can control Mediatek Audio Front End hardware power, clock , and DAI module and still keep some FEs(e.g. DPTX) then we can use it on the same sound card. Therefore, we use late_probe callback function "mt8195_mt6359_rt1019_rt5682_card_late_probe" to add route path from SOF widget to non-SOF BEs. For two patches https://github.com/thesofproject/linux/pull/3217 and https://github.com/thesofproject/linux/pull/3236, we want to keep FEs of non-SOF components and can reuse them. Please let me know if I am not clear enough.Thanks.
On Fri, 2021-11-05 at 16:41 +0000, Mark Brown wrote:
On Fri, Nov 05, 2021 at 11:16:05AM -0500, Pierre-Louis Bossart wrote:
On 11/5/21 10:38 AM, Mark Brown wrote:
We shouldn't be requiring people to load completely different drivers based on software configuration, what if a system wants to bypass the DSP in some but not all configurations? Can we not just have controls allowing users to route round the DSP where appropriate?
It was my understanding the card relies on separate components
- a SOF-based component to provide support for DSP-managed
interfaces
- a 'non-SOF' component for 'regular' interfaces not handled by the
DSP. this was the basis for the changes discussed in https://github.com/thesofproject/linux/pull/3217 and https://github.com/thesofproject/linux/pull/3236
So it's actually supposed to end up as two different cards which can't possibly be interlinked? That doesn't seem to add up entirely given that there's stuff being moved out of the current card, and I thought these systems had a fairly comprehensive audio muxing capability. Trevor, could you be a bit more specific about what's actually going on here physically please?
But indeed if the same interface can be managed by the DSP or not, depending on software choices it's a different problem altogether. We've looked into this recently, if the choice to involve the DSP or not is at the interface level, it might be better to have both components expose different DAIs for the same interface, with some sort of run-time mutual exclusion, so that all possible/allowed permutations are allowed.
Yes, if the interface can optionally be completely hidden by the DSP that's adding another layer of complication. _______________________________________________ Linux-mediatek mailing list Linux-mediatek@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-mediatek
On Mon, 2021-11-08 at 17:40 +0800, YC Hung wrote:
Hi Mark,
I am YC Hung from Mediatek. Let me show our block diagram as the link below for the sound card which support SOF.
https://user-images.githubusercontent.com/62316/132476344-923dfe3a-5305-43e5...
In this sound card, there are two components , one is SOF based component and another is non-SOF based component(called Normal in the block). We want to reuse some BEs of Normal which can control Mediatek Audio Front End hardware power, clock , and DAI module and still keep some FEs(e.g. DPTX) then we can use it on the same sound card. Therefore, we use late_probe callback function "mt8195_mt6359_rt1019_rt5682_card_late_probe" to add route path from SOF widget to non-SOF BEs. For two patches https://github.com/thesofproject/linux/pull/3217 and https://github.com/thesofproject/linux/pull/3236, we want to keep FEs of non-SOF components and can reuse them. Please let me know if I am not clear enough.Thanks.
On Fri, 2021-11-05 at 16:41 +0000, Mark Brown wrote:
On Fri, Nov 05, 2021 at 11:16:05AM -0500, Pierre-Louis Bossart wrote:
On 11/5/21 10:38 AM, Mark Brown wrote:
We shouldn't be requiring people to load completely different drivers based on software configuration, what if a system wants to bypass the DSP in some but not all configurations? Can we not just have controls allowing users to route round the DSP where appropriate?
It was my understanding the card relies on separate components
- a SOF-based component to provide support for DSP-managed
interfaces
- a 'non-SOF' component for 'regular' interfaces not handled by
the DSP. this was the basis for the changes discussed in https://github.com/thesofproject/linux/pull/3217 and https://github.com/thesofproject/linux/pull/3236
So it's actually supposed to end up as two different cards which can't possibly be interlinked? That doesn't seem to add up entirely given that there's stuff being moved out of the current card, and I thought these systems had a fairly comprehensive audio muxing capability. Trevor, could you be a bit more specific about what's actually going on here physically please?+++++++++
Hi Mark,
Is the reply from YC clear? Any suggestion would be appreciated. If you need more information, please let us know.
Additionally, it was my understanding you suggested that DSP routes should be configurable in some ways, and we should not just add a new driver for SOF in case we need to support some other interface combinations in the future. If I'm wrong, please kindly correct me.
Thanks, Trevor
On Tue, Nov 16, 2021 at 05:33:48PM +0800, Trevor Wu wrote:
Is the reply from YC clear? Any suggestion would be appreciated. If you need more information, please let us know.
Not really. It's super high level and only at the driver level, not talking about the hardware much. As far as I can see it's showing a single physical system and even seems to have what looks like it's supposed to be two cards connected together which really seems like it's a single device.
Additionally, it was my understanding you suggested that DSP routes should be configurable in some ways, and we should not just add a new driver for SOF in case we need to support some other interface combinations in the future. If I'm wrong, please kindly correct me.
Yes, I'd not expect a separate driver depending on system configuration.
This patch adds SOF support for mt8195 board with mt6359, rt1019 and rt5682. We define connection table "sof_conn_stream" and add route path to connect SOF driver path to backend of normal platform in the late probe callback.
Signed-off-by: Trevor Wu trevor.wu@mediatek.com Signed-off-by: YC Hung yc.hung@mediatek.com --- sound/soc/mediatek/mt8195/Makefile | 7 +- .../mt8195/mt8195-mt6359-rt1019-rt5682-sof.c | 557 ++++++++++++++++++ 2 files changed, 563 insertions(+), 1 deletion(-) create mode 100644 sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682-sof.c
diff --git a/sound/soc/mediatek/mt8195/Makefile b/sound/soc/mediatek/mt8195/Makefile index 2edcd2855847..6f1ad0048826 100644 --- a/sound/soc/mediatek/mt8195/Makefile +++ b/sound/soc/mediatek/mt8195/Makefile @@ -14,10 +14,15 @@ obj-$(CONFIG_SND_SOC_MT8195) += snd-soc-mt8195-afe.o # machine driver snd-soc-mt8195-rt-common-objs := mt8195-common.o mt8195-realtek-common.o
+ifneq ($(CONFIG_SND_SOC_SOF_MT8195),) +obj-$(CONFIG_SND_SOC_MT8195_MT6359_RT1019_RT5682) += \ + snd-soc-mt8195-rt-common.o \ + mt8195-mt6359-rt1019-rt5682-sof.o +else obj-$(CONFIG_SND_SOC_MT8195_MT6359_RT1019_RT5682) += \ snd-soc-mt8195-rt-common.o \ mt8195-mt6359-rt1019-rt5682.o - +endif obj-$(CONFIG_SND_SOC_MT8195_MT6359_RT1011_RT5682) += \ snd-soc-mt8195-rt-common.o \ mt8195-mt6359-rt1011-rt5682.o diff --git a/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682-sof.c b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682-sof.c new file mode 100644 index 000000000000..9d2be7a77c7c --- /dev/null +++ b/sound/soc/mediatek/mt8195/mt8195-mt6359-rt1019-rt5682-sof.c @@ -0,0 +1,557 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * mt8195-rt1019-rt5682-sof.c -- + * MT8195-MT6359-RT1019-RT5682 ALSA SoC machine driver for SOF + * + * Copyright (c) 2021 MediaTek Inc. + * Author: Trevor Wu trevor.wu@mediatek.com + * YC Hung yc.hung@mediatek.com + */ + +#include <linux/module.h> +#include <sound/soc.h> +#include <sound/sof.h> +#include "mt8195-common.h" +#include "mt8195-realtek-common.h" + +#define SOF_DMA_DL2 "SOF_DMA_DL2" +#define SOF_DMA_DL3 "SOF_DMA_DL3" +#define SOF_DMA_UL4 "SOF_DMA_UL4" +#define SOF_DMA_UL5 "SOF_DMA_UL5" + +struct sof_conn_stream { + const char *normal_link; + const char *sof_link; + const char *sof_dma; + int stream_dir; +}; + +static const struct snd_soc_dapm_widget + mt8195_mt6359_rt1019_rt5682_widgets[] = { + SND_SOC_DAPM_SPK("Speakers", NULL), + SND_SOC_DAPM_HP("Headphone Jack", NULL), + SND_SOC_DAPM_MIC("Headset Mic", NULL), + SND_SOC_DAPM_MIXER(SOF_DMA_DL2, SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_MIXER(SOF_DMA_DL3, SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_MIXER(SOF_DMA_UL4, SND_SOC_NOPM, 0, 0, NULL, 0), + SND_SOC_DAPM_MIXER(SOF_DMA_UL5, SND_SOC_NOPM, 0, 0, NULL, 0), +}; + +static const struct snd_soc_dapm_route mt8195_mt6359_rt1019_rt5682_routes[] = { + /* speaker */ + { "Speakers", NULL, "Speaker" }, + /* headset */ + { "Headphone Jack", NULL, "HPOL" }, + { "Headphone Jack", NULL, "HPOR" }, + { "IN1P", NULL, "Headset Mic" }, + /* SOF Uplink */ + {SOF_DMA_UL4, NULL, "O034"}, + {SOF_DMA_UL4, NULL, "O035"}, + {SOF_DMA_UL5, NULL, "O036"}, + {SOF_DMA_UL5, NULL, "O037"}, + /* SOF Downlink */ + {"I070", NULL, SOF_DMA_DL2}, + {"I071", NULL, SOF_DMA_DL2}, + {"I020", NULL, SOF_DMA_DL3}, + {"I021", NULL, SOF_DMA_DL3}, +}; + +static const struct snd_kcontrol_new mt8195_mt6359_rt1019_rt5682_controls[] = { + SOC_DAPM_PIN_SWITCH("Speakers"), + SOC_DAPM_PIN_SWITCH("Headphone Jack"), + SOC_DAPM_PIN_SWITCH("Headset Mic"), +}; + +enum { + DAI_LINK_DL10_FE, + DAI_LINK_DL_SRC_BE, + DAI_LINK_DPTX_BE, + DAI_LINK_ETDM1_IN_BE, + DAI_LINK_ETDM2_IN_BE, + DAI_LINK_ETDM1_OUT_BE, + DAI_LINK_ETDM2_OUT_BE, + DAI_LINK_ETDM3_OUT_BE, + DAI_LINK_PCM1_BE, + DAI_LINK_UL_SRC1_BE, + DAI_LINK_UL_SRC2_BE, + DAI_LINK_SOF_DL2_BE, + DAI_LINK_SOF_DL3_BE, + DAI_LINK_SOF_UL4_BE, + DAI_LINK_SOF_UL5_BE, +}; + +/* FE */ +SND_SOC_DAILINK_DEFS(DL10_FE, + DAILINK_COMP_ARRAY(COMP_CPU("DL10")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +/* BE */ +SND_SOC_DAILINK_DEFS(DL_SRC_BE, + DAILINK_COMP_ARRAY(COMP_CPU("DL_SRC")), + DAILINK_COMP_ARRAY(COMP_CODEC("mt6359-sound", + "mt6359-snd-codec-aif1")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(DPTX_BE, + DAILINK_COMP_ARRAY(COMP_CPU("DPTX")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(ETDM1_IN_BE, + DAILINK_COMP_ARRAY(COMP_CPU("ETDM1_IN")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(ETDM2_IN_BE, + DAILINK_COMP_ARRAY(COMP_CPU("ETDM2_IN")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(ETDM1_OUT_BE, + DAILINK_COMP_ARRAY(COMP_CPU("ETDM1_OUT")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(ETDM2_OUT_BE, + DAILINK_COMP_ARRAY(COMP_CPU("ETDM2_OUT")), + DAILINK_COMP_ARRAY(COMP_CODEC(RT1019_DEV0_NAME, + RT1019_CODEC_DAI)), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(ETDM3_OUT_BE, + DAILINK_COMP_ARRAY(COMP_CPU("ETDM3_OUT")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(PCM1_BE, + DAILINK_COMP_ARRAY(COMP_CPU("PCM1")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(UL_SRC1_BE, + DAILINK_COMP_ARRAY(COMP_CPU("UL_SRC1")), + DAILINK_COMP_ARRAY(COMP_CODEC("mt6359-sound", + "mt6359-snd-codec-aif1"), + COMP_CODEC("dmic-codec", + "dmic-hifi")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(UL_SRC2_BE, + DAILINK_COMP_ARRAY(COMP_CPU("UL_SRC2")), + DAILINK_COMP_ARRAY(COMP_CODEC("mt6359-sound", + "mt6359-snd-codec-aif2")), + DAILINK_COMP_ARRAY(COMP_EMPTY())); + +SND_SOC_DAILINK_DEFS(AFE_SOF_DL2, + DAILINK_COMP_ARRAY(COMP_CPU("SOF_DL2")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_PLATFORM("10803000.adsp"))); + +SND_SOC_DAILINK_DEFS(AFE_SOF_DL3, + DAILINK_COMP_ARRAY(COMP_CPU("SOF_DL3")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_PLATFORM("10803000.adsp"))); + +SND_SOC_DAILINK_DEFS(AFE_SOF_UL4, + DAILINK_COMP_ARRAY(COMP_CPU("SOF_UL4")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_PLATFORM("10803000.adsp"))); + +SND_SOC_DAILINK_DEFS(AFE_SOF_UL5, + DAILINK_COMP_ARRAY(COMP_CPU("SOF_UL5")), + DAILINK_COMP_ARRAY(COMP_DUMMY()), + DAILINK_COMP_ARRAY(COMP_PLATFORM("10803000.adsp"))); + +static const struct sof_conn_stream g_sof_conn_streams[] = { + { "ETDM2_OUT_BE", "AFE_SOF_DL2", SOF_DMA_DL2, SNDRV_PCM_STREAM_PLAYBACK}, + { "ETDM1_OUT_BE", "AFE_SOF_DL3", SOF_DMA_DL3, SNDRV_PCM_STREAM_PLAYBACK}, + { "UL_SRC1_BE", "AFE_SOF_UL4", SOF_DMA_UL4, SNDRV_PCM_STREAM_CAPTURE}, + { "ETDM2_IN_BE", "AFE_SOF_UL5", SOF_DMA_UL5, SNDRV_PCM_STREAM_CAPTURE}, +}; + +/* fixup the BE DAI link to match any values from topology */ +static int mt8195_dai_link_fixup(struct snd_soc_pcm_runtime *rtd, + struct snd_pcm_hw_params *params) +{ + int i, j, ret = 0; + struct snd_soc_card *card = rtd->card; + struct snd_soc_dai_link *sof_dai_link = NULL; + struct snd_soc_pcm_runtime *runtime; + struct snd_soc_dai *cpu_dai; + + for (i = 0; i < ARRAY_SIZE(g_sof_conn_streams); i++) { + const struct sof_conn_stream *conn = &g_sof_conn_streams[i]; + + if (strcmp(rtd->dai_link->name, conn->normal_link)) + continue; + + for_each_card_rtds(card, runtime) { + if (strcmp(runtime->dai_link->name, conn->sof_link)) + continue; + + for_each_rtd_cpu_dais(runtime, j, cpu_dai) { + if (cpu_dai->stream_active[conn->stream_dir] > 0) { + sof_dai_link = runtime->dai_link; + break; + } + } + break; + } + + if (sof_dai_link && sof_dai_link->be_hw_params_fixup) { + ret = sof_dai_link->be_hw_params_fixup(runtime, params); + if (!strcmp(rtd->dai_link->name, "ETDM2_IN_BE") || + !strcmp(rtd->dai_link->name, "ETDM1_OUT_BE")) { + mt8195_etdm_rt_hw_params_fixup(runtime, params); + } + break; + } + } + + return ret; +} + +static int mt8195_mt6359_rt1019_rt5682_card_late_probe(struct snd_soc_card *card) +{ + struct snd_soc_pcm_runtime *runtime; + struct snd_soc_component *sof_comp; + int i; + + /* 1. find sof component */ + for_each_card_rtds(card, runtime) { + for (i = 0; i < runtime->num_components; i++) { + if (!runtime->components[i]->driver->name) + continue; + if (!strcmp(runtime->components[i]->driver->name, "sof-audio-component")) { + sof_comp = runtime->components[i]; + break; + } + } + } + + if (!sof_comp) { + dev_info(card->dev, " probe without component\n"); + return 0; + } + /* 2. add route path and fixup callback */ + for (i = 0; i < ARRAY_SIZE(g_sof_conn_streams); i++) { + const struct sof_conn_stream *conn = &g_sof_conn_streams[i]; + struct snd_soc_pcm_runtime *sof_rtd = NULL; + struct snd_soc_pcm_runtime *normal_rtd = NULL; + struct snd_soc_pcm_runtime *rtd = NULL; + + for_each_card_rtds(card, rtd) { + if (!strcmp(rtd->dai_link->name, conn->sof_link)) { + sof_rtd = rtd; + continue; + } + if (!strcmp(rtd->dai_link->name, conn->normal_link)) { + normal_rtd = rtd; + continue; + } + if (normal_rtd && sof_rtd) + break; + } + if (normal_rtd && sof_rtd) { + int j; + struct snd_soc_dai *cpu_dai; + + for_each_rtd_cpu_dais(sof_rtd, j, cpu_dai) { + struct snd_soc_dapm_route route; + struct snd_soc_dapm_path *p = NULL; + struct snd_soc_dapm_widget *play_widget = + cpu_dai->playback_widget; + struct snd_soc_dapm_widget *cap_widget = + cpu_dai->capture_widget; + memset(&route, 0, sizeof(route)); + if (conn->stream_dir == SNDRV_PCM_STREAM_CAPTURE && + cap_widget) { + snd_soc_dapm_widget_for_each_sink_path(cap_widget, p) { + route.source = conn->sof_dma; + route.sink = p->sink->name; + snd_soc_dapm_add_routes(&card->dapm, &route, 1); + } + } else if (conn->stream_dir == SNDRV_PCM_STREAM_PLAYBACK && + play_widget){ + snd_soc_dapm_widget_for_each_source_path(play_widget, p) { + route.source = p->source->name; + route.sink = conn->sof_dma; + snd_soc_dapm_add_routes(&card->dapm, &route, 1); + } + } else { + dev_err(cpu_dai->dev, "stream dir and widget not pair\n"); + } + } + normal_rtd->dai_link->be_hw_params_fixup = mt8195_dai_link_fixup; + } + } + + return 0; +} + +static struct snd_soc_dai_link mt8195_mt6359_rt1019_rt5682_dai_links[] = { + /* FE */ + [DAI_LINK_DL10_FE] = { + .name = "DL10_FE", + .stream_name = "DL10 Playback", + .trigger = { + SND_SOC_DPCM_TRIGGER_POST, + SND_SOC_DPCM_TRIGGER_POST, + }, + .dynamic = 1, + .dpcm_playback = 1, + .ops = &mt8195_hdmitx_dptx_playback_ops, + SND_SOC_DAILINK_REG(DL10_FE), + }, + /* BE */ + [DAI_LINK_DL_SRC_BE] = { + .name = "DL_SRC_BE", + .init = mt8195_mt6359_init, + .no_pcm = 1, + .dpcm_playback = 1, + SND_SOC_DAILINK_REG(DL_SRC_BE), + }, + [DAI_LINK_DPTX_BE] = { + .name = "DPTX_BE", + .no_pcm = 1, + .dpcm_playback = 1, + .ops = &mt8195_dptx_ops, + .be_hw_params_fixup = mt8195_dptx_hw_params_fixup, + SND_SOC_DAILINK_REG(DPTX_BE), + }, + [DAI_LINK_ETDM1_IN_BE] = { + .name = "ETDM1_IN_BE", + .no_pcm = 1, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .dpcm_capture = 1, + SND_SOC_DAILINK_REG(ETDM1_IN_BE), + }, + [DAI_LINK_ETDM2_IN_BE] = { + .name = "ETDM2_IN_BE", + .no_pcm = 1, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .dpcm_capture = 1, + .init = mt8195_rt5682_init, + .ops = &mt8195_rt5682_etdm_ops, + .be_hw_params_fixup = mt8195_etdm_rt_hw_params_fixup, + SND_SOC_DAILINK_REG(ETDM2_IN_BE), + }, + [DAI_LINK_ETDM1_OUT_BE] = { + .name = "ETDM1_OUT_BE", + .no_pcm = 1, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .dpcm_playback = 1, + .ops = &mt8195_rt5682_etdm_ops, + .be_hw_params_fixup = mt8195_etdm_rt_hw_params_fixup, + SND_SOC_DAILINK_REG(ETDM1_OUT_BE), + }, + [DAI_LINK_ETDM2_OUT_BE] = { + .name = "ETDM2_OUT_BE", + .no_pcm = 1, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .dpcm_playback = 1, + SND_SOC_DAILINK_REG(ETDM2_OUT_BE), + }, + [DAI_LINK_ETDM3_OUT_BE] = { + .name = "ETDM3_OUT_BE", + .no_pcm = 1, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .dpcm_playback = 1, + SND_SOC_DAILINK_REG(ETDM3_OUT_BE), + }, + [DAI_LINK_PCM1_BE] = { + .name = "PCM1_BE", + .no_pcm = 1, + .dai_fmt = SND_SOC_DAIFMT_I2S | + SND_SOC_DAIFMT_NB_NF | + SND_SOC_DAIFMT_CBS_CFS, + .dpcm_capture = 1, + SND_SOC_DAILINK_REG(PCM1_BE), + }, + [DAI_LINK_UL_SRC1_BE] = { + .name = "UL_SRC1_BE", + .no_pcm = 1, + .dpcm_capture = 1, + SND_SOC_DAILINK_REG(UL_SRC1_BE), + }, + [DAI_LINK_UL_SRC2_BE] = { + .name = "UL_SRC2_BE", + .no_pcm = 1, + .dpcm_capture = 1, + SND_SOC_DAILINK_REG(UL_SRC2_BE), + }, + /* SOF BE */ + [DAI_LINK_SOF_DL2_BE] = { + .name = "AFE_SOF_DL2", + .no_pcm = 1, + .dpcm_playback = 1, + SND_SOC_DAILINK_REG(AFE_SOF_DL2), + }, + [DAI_LINK_SOF_DL3_BE] = { + .name = "AFE_SOF_DL3", + .no_pcm = 1, + .dpcm_playback = 1, + SND_SOC_DAILINK_REG(AFE_SOF_DL3), + }, + [DAI_LINK_SOF_UL4_BE] = { + .name = "AFE_SOF_UL4", + .no_pcm = 1, + .dpcm_capture = 1, + SND_SOC_DAILINK_REG(AFE_SOF_UL4), + }, + [DAI_LINK_SOF_UL5_BE] = { + .name = "AFE_SOF_UL5", + .no_pcm = 1, + .dpcm_capture = 1, + SND_SOC_DAILINK_REG(AFE_SOF_UL5), + }, +}; + +static struct snd_soc_card mt8195_mt6359_rt1019_rt5682_soc_card = { + .name = "mt8195_r1019_5682", + .owner = THIS_MODULE, + .dai_link = mt8195_mt6359_rt1019_rt5682_dai_links, + .num_links = ARRAY_SIZE(mt8195_mt6359_rt1019_rt5682_dai_links), + .controls = mt8195_mt6359_rt1019_rt5682_controls, + .num_controls = ARRAY_SIZE(mt8195_mt6359_rt1019_rt5682_controls), + .dapm_widgets = mt8195_mt6359_rt1019_rt5682_widgets, + .num_dapm_widgets = ARRAY_SIZE(mt8195_mt6359_rt1019_rt5682_widgets), + .dapm_routes = mt8195_mt6359_rt1019_rt5682_routes, + .num_dapm_routes = ARRAY_SIZE(mt8195_mt6359_rt1019_rt5682_routes), + .late_probe = mt8195_mt6359_rt1019_rt5682_card_late_probe, +}; + +static int mt8195_mt6359_rt1019_rt5682_dev_probe(struct platform_device *pdev) +{ + struct snd_soc_card *card = &mt8195_mt6359_rt1019_rt5682_soc_card; + struct snd_soc_dai_link *dai_link; + struct mt8195_priv *priv; + struct device_node *machine_node; + struct snd_soc_acpi_mach *mach; + int is5682s = 0; + int ret, i; + + card->dev = &pdev->dev; + mach = pdev->dev.platform_data; + machine_node = mach->pdata; + + ret = of_property_read_string_index(machine_node, "model", + 0, &card->name); + /* + * EINVAL means the property does not exist. This is fine providing + * card->name was previously set, which is checked later in + * snd_soc_register_card. + */ + if (ret < 0 && ret != -EINVAL) { + dev_err(card->dev, + "ASoC: Property 'model' could not be read: %d\n", + ret); + return ret; + } + + if (strstr(card->name, "_5682s")) + is5682s = 1; + + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->platform_node = of_parse_phandle(machine_node, + "mediatek,platform", 0); + + if (!priv->platform_node) { + dev_dbg(&pdev->dev, "Property 'platform' missing or invalid\n"); + return -EINVAL; + } + + for_each_card_prelinks(card, i, dai_link) { + if (!dai_link->platforms->name) + dai_link->platforms->of_node = priv->platform_node; + + if (strcmp(dai_link->name, "DPTX_BE") == 0) { + priv->dp_node = + of_parse_phandle(machine_node, + "mediatek,dptx-codec", 0); + if (!priv->dp_node) { + dev_dbg(&pdev->dev, "No property 'dptx-codec'\n"); + } else { + dai_link->codecs->of_node = priv->dp_node; + dai_link->codecs->name = NULL; + dai_link->codecs->dai_name = "i2s-hifi"; + dai_link->init = mt8195_dptx_codec_init; + } + } else if (strcmp(dai_link->name, "ETDM3_OUT_BE") == 0) { + priv->hdmi_node = + of_parse_phandle(machine_node, + "mediatek,hdmi-codec", 0); + if (!priv->hdmi_node) { + dev_dbg(&pdev->dev, "No property 'hdmi-codec'\n"); + } else { + dai_link->codecs->of_node = priv->hdmi_node; + dai_link->codecs->name = NULL; + dai_link->codecs->dai_name = "i2s-hifi"; + dai_link->init = mt8195_hdmi_codec_init; + } + } else if (strcmp(dai_link->name, "ETDM1_OUT_BE") == 0 || + strcmp(dai_link->name, "ETDM2_IN_BE") == 0) { + dai_link->codecs->name = + is5682s ? RT5682S_DEV0_NAME : RT5682_DEV0_NAME; + dai_link->codecs->dai_name = + is5682s ? RT5682S_CODEC_DAI : RT5682_CODEC_DAI; + } + } + + snd_soc_card_set_drvdata(card, priv); + + 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); + of_node_put(priv->hdmi_node); + of_node_put(priv->dp_node); + of_node_put(priv->platform_node); + } + + return ret; +} + +static int mt8195_mt6359_rt1019_rt5682_dev_remove(struct platform_device *pdev) +{ + struct snd_soc_card *card = platform_get_drvdata(pdev); + struct mt8195_priv *priv = snd_soc_card_get_drvdata(card); + + of_node_put(priv->hdmi_node); + of_node_put(priv->dp_node); + of_node_put(priv->platform_node); + + return 0; +} + +static struct platform_driver mt8195_mt6359_rt1019_rt5682_driver = { + .driver = { + .name = "mt8195_mt6359_rt1019_rt5682", + .pm = &mt8195_pm_ops, + }, + .probe = mt8195_mt6359_rt1019_rt5682_dev_probe, + .remove = mt8195_mt6359_rt1019_rt5682_dev_remove, +}; + +module_platform_driver(mt8195_mt6359_rt1019_rt5682_driver); + +/* Module information */ +MODULE_DESCRIPTION("MT8195-MT6359-RT1019-RT5682 ALSA SoC SOF machine driver"); +MODULE_AUTHOR("Trevor Wu trevor.wu@mediatek.com"); +MODULE_AUTHOR("YC Hung yc.hung@mediatek.com"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("mt8195_mt6359_rt1019_rt5682 soc card");
participants (5)
-
Mark Brown
-
Pierre-Louis Bossart
-
Rob Herring
-
Trevor Wu
-
YC Hung