[PATCH 0/2] Add new AMP MAX98360A for RT5682S
Add MAX98360A for RT5682S, MAX98360A works same as rt1019. So, it can be supported.
tongjian (2): ASoC: mediatek: mt8186: support rt5682s_max98360 ASoC: dt-bindings: mt8186-mt6366: add new compatible for max98360a
.../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 1 + .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 22 ++++++++++++++++++- 2 files changed, 22 insertions(+), 1 deletion(-)
Add support for using the rt5682s codec together with max98360a on MT8186-MT6366-RT1019-RT5682S machines.
Signed-off-by: tongjian tongjian@huaqin.corp-partner.google.com --- .../mt8186/mt8186-mt6366-rt1019-rt5682s.c | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
diff --git a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c index 8f77a0bc1dc8..af44e331dae8 100644 --- a/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c +++ b/sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c @@ -1083,6 +1083,21 @@ static struct snd_soc_card mt8186_mt6366_rt1019_rt5682s_soc_card = { .num_configs = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_codec_conf), };
+static struct snd_soc_card mt8186_mt6366_rt5682s_max98360_soc_card = { + .name = "mt8186_rt5682s_max98360", + .owner = THIS_MODULE, + .dai_link = mt8186_mt6366_rt1019_rt5682s_dai_links, + .num_links = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_dai_links), + .controls = mt8186_mt6366_rt1019_rt5682s_controls, + .num_controls = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_controls), + .dapm_widgets = mt8186_mt6366_rt1019_rt5682s_widgets, + .num_dapm_widgets = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_widgets), + .dapm_routes = mt8186_mt6366_rt1019_rt5682s_routes, + .num_dapm_routes = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_routes), + .codec_conf = mt8186_mt6366_rt1019_rt5682s_codec_conf, + .num_configs = ARRAY_SIZE(mt8186_mt6366_rt1019_rt5682s_codec_conf), +}; + static int mt8186_mt6366_rt1019_rt5682s_dev_probe(struct platform_device *pdev) { struct snd_soc_card *card; @@ -1232,9 +1247,14 @@ static int mt8186_mt6366_rt1019_rt5682s_dev_probe(struct platform_device *pdev)
#if IS_ENABLED(CONFIG_OF) static const struct of_device_id mt8186_mt6366_rt1019_rt5682s_dt_match[] = { - { .compatible = "mediatek,mt8186-mt6366-rt1019-rt5682s-sound", + { + .compatible = "mediatek,mt8186-mt6366-rt1019-rt5682s-sound", .data = &mt8186_mt6366_rt1019_rt5682s_soc_card, }, + { + .compatible = "mediatek,mt8186-mt6366-rt5682s-max98360-sound", + .data = &mt8186_mt6366_rt5682s_max98360_soc_card, + }, {} }; MODULE_DEVICE_TABLE(of, mt8186_mt6366_rt1019_rt5682s_dt_match);
On 28/12/2022 13:22, tongjian wrote:
Add support for using the rt5682s codec together with max98360a on MT8186-MT6366-RT1019-RT5682S machines.
Signed-off-by: tongjian tongjian@huaqin.corp-partner.google.com
The author and SoB should be full name. Is this correct (full) transliteration of your name?
Best regards, Krzysztof
Hi, Yes, this is my full name.
Best regards, tongjian
On Wed, Dec 28, 2022 at 8:37 PM Krzysztof Kozlowski < krzysztof.kozlowski@linaro.org> wrote:
On 28/12/2022 13:22, tongjian wrote:
Add support for using the rt5682s codec together with max98360a on MT8186-MT6366-RT1019-RT5682S machines.
Signed-off-by: tongjian tongjian@huaqin.corp-partner.google.com
The author and SoB should be full name. Is this correct (full) transliteration of your name?
Best regards, Krzysztof
On 29/12/2022 02:57, Jian Tong wrote:
Hi, Yes, this is my full name.
Here you use different, so that's confusing...
Best regards, tongjian
On Wed, Dec 28, 2022 at 8:37 PM Krzysztof Kozlowski < krzysztof.kozlowski@linaro.org> wrote:
On 28/12/2022 13:22, tongjian wrote:
Add support for using the rt5682s codec together with max98360a on MT8186-MT6366-RT1019-RT5682S machines.
Signed-off-by: tongjian tongjian@huaqin.corp-partner.google.com
The author and SoB should be full name. Is this correct (full) transliteration of your name?
Best regards, Krzysztof
Best regards, Krzysztof
Adds new compatible string "mt8186-mt6366-rt5682s-max98360-sound" for machines with max98360a and rt5682s.
Signed-off-by: tongjian tongjian@huaqin.corp-partner.google.com --- .../devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml | 1 + 1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml b/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml index 9d3139990237..aa23b0024c46 100644 --- a/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml +++ b/Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml @@ -16,6 +16,7 @@ properties: compatible: enum: - mediatek,mt8186-mt6366-rt1019-rt5682s-sound + - mediatek,mt8186-mt6366-rt5682s-max98360-sound
mediatek,platform: $ref: "/schemas/types.yaml#/definitions/phandle"
On 28/12/2022 13:22, tongjian wrote:
Adds new compatible string "mt8186-mt6366-rt5682s-max98360-sound" for machines with max98360a and rt5682s.
Signed-off-by: tongjian tongjian@huaqin.corp-partner.google.com
Acked-by: Krzysztof Kozlowski krzysztof.kozlowski@linaro.org
Best regards, Krzysztof
On Wed, 28 Dec 2022 20:22:28 +0800, tongjian wrote:
Add MAX98360A for RT5682S, MAX98360A works same as rt1019. So, it can be supported.
tongjian (2): ASoC: mediatek: mt8186: support rt5682s_max98360 ASoC: dt-bindings: mt8186-mt6366: add new compatible for max98360a
[...]
Applied to
broonie/sound.git for-next
Thanks!
[1/2] ASoC: mediatek: mt8186: support rt5682s_max98360 commit: 6e1dbf694d7cd1737ee14866e9e05016ccc9ac40 [2/2] ASoC: dt-bindings: mt8186-mt6366: add new compatible for max98360a commit: 2d3dd559751ce19ba84f9690c6c7c5a4b39129df
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks, Mark
participants (4)
-
Jian Tong -
Krzysztof Kozlowski -
Mark Brown -
tongjian