Unverified Commit cfd8bb25 authored by Tzung-Bi Shih's avatar Tzung-Bi Shih Committed by Mark Brown
Browse files

ASoC: mediatek: mt8192: support rt1015p_rt5682 



Supports machines with rt1015p and rt5682.  Uses new proposed compatible
string "mt8192_mt6359_rt1015p_rt5682".

Signed-off-by: default avatarTzung-Bi Shih <tzungbi@google.com>
Link: https://lore.kernel.org/r/20201201132614.1691352-7-tzungbi@google.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6986256f

sound/soc/mediatek/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -175,6 +175,7 @@ config SND_SOC_MT8192_MT6359_RT1015_RT5682 
	depends on SND_SOC_MT8192

	select SND_SOC_MT6359

	select SND_SOC_RT1015

	select SND_SOC_RT1015P

	select SND_SOC_RT5682_I2C

	select SND_SOC_DMIC

	help

sound/soc/mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c

+54 −0
Original line number Diff line number Diff line
@@ -560,6 +560,11 @@ SND_SOC_DAILINK_DEFS(i2s3_rt1015, 
						   RT1015_CODEC_DAI)),

		     DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(i2s3_rt1015p,

		     DAILINK_COMP_ARRAY(COMP_CPU("I2S3")),

		     DAILINK_COMP_ARRAY(COMP_CODEC("rt1015p", "HiFi")),

		     DAILINK_COMP_ARRAY(COMP_EMPTY()));



SND_SOC_DAILINK_DEFS(i2s5,

		     DAILINK_COMP_ARRAY(COMP_CPU("I2S5")),

		     DAILINK_COMP_ARRAY(COMP_DUMMY()),
@@ -997,6 +1002,41 @@ static struct snd_soc_card mt8192_mt6359_rt1015_rt5682_card = { 
	.num_configs = ARRAY_SIZE(rt1015_amp_conf),

};



static const struct snd_soc_dapm_widget

mt8192_mt6359_rt1015p_rt5682_widgets[] = {

	SND_SOC_DAPM_SPK("Speakers", NULL),

	SND_SOC_DAPM_HP("Headphone Jack", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

};



static const struct snd_soc_dapm_route mt8192_mt6359_rt1015p_rt5682_routes[] = {

	/* speaker */

	{ "Speakers", NULL, "Speaker" },

	/* headset */

	{ "Headphone Jack", NULL, "HPOL" },

	{ "Headphone Jack", NULL, "HPOR" },

	{ "IN1P", NULL, "Headset Mic" },

};



static const struct snd_kcontrol_new mt8192_mt6359_rt1015p_rt5682_controls[] = {

	SOC_DAPM_PIN_SWITCH("Speakers"),

	SOC_DAPM_PIN_SWITCH("Headphone Jack"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),

};



static struct snd_soc_card mt8192_mt6359_rt1015p_rt5682_card = {

	.name = "mt8192_mt6359_rt1015p_rt5682",

	.owner = THIS_MODULE,

	.dai_link = mt8192_mt6359_dai_links,

	.num_links = ARRAY_SIZE(mt8192_mt6359_dai_links),

	.controls = mt8192_mt6359_rt1015p_rt5682_controls,

	.num_controls = ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682_controls),

	.dapm_widgets = mt8192_mt6359_rt1015p_rt5682_widgets,

	.num_dapm_widgets = ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682_widgets),

	.dapm_routes = mt8192_mt6359_rt1015p_rt5682_routes,

	.num_dapm_routes = ARRAY_SIZE(mt8192_mt6359_rt1015p_rt5682_routes),

};



static int mt8192_mt6359_dev_probe(struct platform_device *pdev)

{

	struct snd_soc_card *card;
@@ -1032,6 +1072,16 @@ static int mt8192_mt6359_dev_probe(struct platform_device *pdev) 
				dai_link->platforms = i2s3_rt1015_platforms;

				dai_link->num_platforms =

					ARRAY_SIZE(i2s3_rt1015_platforms);

			} else if (card == &mt8192_mt6359_rt1015p_rt5682_card) {

				dai_link->cpus = i2s3_rt1015p_cpus;

				dai_link->num_cpus =

					ARRAY_SIZE(i2s3_rt1015p_cpus);

				dai_link->codecs = i2s3_rt1015p_codecs;

				dai_link->num_codecs =

					ARRAY_SIZE(i2s3_rt1015p_codecs);

				dai_link->platforms = i2s3_rt1015p_platforms;

				dai_link->num_platforms =

					ARRAY_SIZE(i2s3_rt1015p_platforms);

			}

		}
@@ -1054,6 +1104,10 @@ static const struct of_device_id mt8192_mt6359_dt_match[] = { 
		.compatible = "mediatek,mt8192_mt6359_rt1015_rt5682",

		.data = &mt8192_mt6359_rt1015_rt5682_card,

	},

	{

		.compatible = "mediatek,mt8192_mt6359_rt1015p_rt5682",

		.data = &mt8192_mt6359_rt1015p_rt5682_card,

	},

	{}

};

#endif