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

ASoC: mediatek: mt8183: support machine driver with rt1015p 



Supports machine driver with rt1015p ("mt8183_mt6358_ts3a227_rt1015p").
Embeds in the existing mt8183-mt6358-ts3a227-max98357.c because they
share most of the code.

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


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

sound/soc/mediatek/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ config SND_SOC_MT8183_MT6358_TS3A227E_MAX98357A 
	select SND_SOC_MT6358

	select SND_SOC_MAX98357A

	select SND_SOC_RT1015

	select SND_SOC_RT1015P

	select SND_SOC_BT_SCO

	select SND_SOC_TS3A227E

	select SND_SOC_CROS_EC_CODEC if CROS_EC

sound/soc/mediatek/mt8183/mt8183-mt6358-ts3a227-max98357.c

+29 −0
Original line number Diff line number Diff line
@@ -284,6 +284,11 @@ SND_SOC_DAILINK_DEFS(i2s3_rt1015, 
			   COMP_CODEC(RT1015_DEV1_NAME, 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_CODEC("bt-sco", "bt-sco-pcm")),
@@ -590,6 +595,13 @@ static struct snd_soc_card mt8183_mt6358_ts3a227_rt1015_card = { 
	.num_configs = ARRAY_SIZE(mt8183_mt6358_ts3a227_rt1015_amp_conf),

};



static struct snd_soc_card mt8183_mt6358_ts3a227_rt1015p_card = {

	.name = "mt8183_mt6358_ts3a227_rt1015p",

	.owner = THIS_MODULE,

	.dai_link = mt8183_mt6358_ts3a227_dai_links,

	.num_links = ARRAY_SIZE(mt8183_mt6358_ts3a227_dai_links),

};



static int

mt8183_mt6358_ts3a227_max98357_headset_init(struct snd_soc_component *component)

{
@@ -686,6 +698,19 @@ mt8183_mt6358_ts3a227_max98357_dev_probe(struct platform_device *pdev) 
				dai_link->platforms = i2s3_rt1015_platforms;

				dai_link->num_platforms =

					ARRAY_SIZE(i2s3_rt1015_platforms);

			} else if (card == &mt8183_mt6358_ts3a227_rt1015p_card) {

				dai_link->be_hw_params_fixup =

					mt8183_rt1015_i2s_hw_params_fixup;

				dai_link->ops = &mt8183_mt6358_i2s_ops;

				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);

			}

		}
@@ -772,6 +797,10 @@ static const struct of_device_id mt8183_mt6358_ts3a227_max98357_dt_match[] = { 
		.compatible = "mediatek,mt8183_mt6358_ts3a227_rt1015",

		.data = &mt8183_mt6358_ts3a227_rt1015_card,

	},

	{

		.compatible = "mediatek,mt8183_mt6358_ts3a227_rt1015p",

		.data = &mt8183_mt6358_ts3a227_rt1015p_card,

	},

	{}

};

#endif