Unverified Commit efd58edd authored by Mark Brown's avatar Mark Brown
Browse files

Add new AMP MAX98360A for RT5682S 

Merge series from tongjian <tongjian@huaqin.corp-partner.google.com>:

Add MAX98360A for RT5682S, MAX98360A works same as rt1019. So, it can
be supported.
parents 472a6309 2d3dd559

Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml

+1 −0
Original line number Diff line number Diff line
@@ -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"

sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c

+21 −1
Original line number Diff line number Diff line
@@ -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);