Unverified Commit 05b754f5 authored by Cheng-Yi Chiang's avatar Cheng-Yi Chiang Committed by Mark Brown
Browse files

ASoC: rockchip_max98090: Optionally support HDMI use case 



Support three different use cases with rockchip_max98090 driver.

The three use cases:
- max98090 only: Current usage, where HDMI link is missing.
- HDMI only: Needed use case for veyron_mickey board.
- max98090 + HDMI: Ideal use case for veyron_jerry, veyron_minnie..etc.

The presence of max98090 is determined by the presence of
rockchip,audio-codec device property.

The presence of HDMI is determined by the presence of
rockchip,hdmi-codec device property.

Create different sound card based on the configuration.
Note that we keep max98090 only usage for backward compatibility.

Signed-off-by: default avatarCheng-Yi Chiang <cychiang@chromium.org>
Link: https://lore.kernel.org/r/20191028071930.145899-4-cychiang@chromium.org


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

sound/soc/rockchip/rockchip_max98090.c

+226 −65
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */



#include <linux/module.h>

#include <linux/of_device.h>

#include <linux/platform_device.h>

#include <linux/slab.h>

#include <linux/gpio.h>
@@ -36,28 +37,73 @@ static struct snd_soc_jack_pin headset_jack_pins[] = { 


};



static const struct snd_soc_dapm_widget rk_dapm_widgets[] = {

	SND_SOC_DAPM_HP("Headphone", NULL),

	SND_SOC_DAPM_MIC("Headset Mic", NULL),

	SND_SOC_DAPM_MIC("Int Mic", NULL),

	SND_SOC_DAPM_SPK("Speaker", NULL),

#define RK_MAX98090_WIDGETS \

	SND_SOC_DAPM_HP("Headphone", NULL), \

	SND_SOC_DAPM_MIC("Headset Mic", NULL), \

	SND_SOC_DAPM_MIC("Int Mic", NULL), \

	SND_SOC_DAPM_SPK("Speaker", NULL)



#define RK_HDMI_WIDGETS \

	SND_SOC_DAPM_LINE("HDMI", NULL)



static const struct snd_soc_dapm_widget rk_max98090_dapm_widgets[] = {

	RK_MAX98090_WIDGETS,

};



static const struct snd_soc_dapm_widget rk_hdmi_dapm_widgets[] = {

	RK_HDMI_WIDGETS,

};



static const struct snd_soc_dapm_widget rk_max98090_hdmi_dapm_widgets[] = {

	RK_MAX98090_WIDGETS,

	RK_HDMI_WIDGETS,

};



#define RK_MAX98090_AUDIO_MAP \

	{"IN34", NULL, "Headset Mic"}, \

	{"Headset Mic", NULL, "MICBIAS"}, \

	{"DMICL", NULL, "Int Mic"}, \

	{"Headphone", NULL, "HPL"}, \

	{"Headphone", NULL, "HPR"}, \

	{"Speaker", NULL, "SPKL"}, \

	{"Speaker", NULL, "SPKR"}



#define RK_HDMI_AUDIO_MAP \

	{"HDMI", NULL, "TX"}



static const struct snd_soc_dapm_route rk_max98090_audio_map[] = {

	RK_MAX98090_AUDIO_MAP,

};



static const struct snd_soc_dapm_route rk_audio_map[] = {

	{"IN34", NULL, "Headset Mic"},

	{"Headset Mic", NULL, "MICBIAS"},

	{"DMICL", NULL, "Int Mic"},

	{"Headphone", NULL, "HPL"},

	{"Headphone", NULL, "HPR"},

	{"Speaker", NULL, "SPKL"},

	{"Speaker", NULL, "SPKR"},

static const struct snd_soc_dapm_route rk_hdmi_audio_map[] = {

	RK_HDMI_AUDIO_MAP,

};



static const struct snd_kcontrol_new rk_mc_controls[] = {

	SOC_DAPM_PIN_SWITCH("Headphone"),

	SOC_DAPM_PIN_SWITCH("Headset Mic"),

	SOC_DAPM_PIN_SWITCH("Int Mic"),

	SOC_DAPM_PIN_SWITCH("Speaker"),

static const struct snd_soc_dapm_route rk_max98090_hdmi_audio_map[] = {

	RK_MAX98090_AUDIO_MAP,

	RK_HDMI_AUDIO_MAP,

};



#define RK_MAX98090_CONTROLS \

	SOC_DAPM_PIN_SWITCH("Headphone"), \

	SOC_DAPM_PIN_SWITCH("Headset Mic"), \

	SOC_DAPM_PIN_SWITCH("Int Mic"), \

	SOC_DAPM_PIN_SWITCH("Speaker")



#define RK_HDMI_CONTROLS \

	SOC_DAPM_PIN_SWITCH("HDMI")



static const struct snd_kcontrol_new rk_max98090_controls[] = {

	RK_MAX98090_CONTROLS,

};



static const struct snd_kcontrol_new rk_hdmi_controls[] = {

	RK_HDMI_CONTROLS,

};



static const struct snd_kcontrol_new rk_max98090_hdmi_controls[] = {

	RK_MAX98090_CONTROLS,

	RK_HDMI_CONTROLS,

};



static int rk_jack_event(struct notifier_block *nb, unsigned long event,
@@ -122,15 +168,20 @@ static int rk_aif1_hw_params(struct snd_pcm_substream *substream, 


	ret = snd_soc_dai_set_sysclk(cpu_dai, 0, mclk,

				     SND_SOC_CLOCK_OUT);

	if (ret < 0) {

		dev_err(codec_dai->dev, "Can't set codec clock %d\n", ret);

	if (ret) {

		dev_err(cpu_dai->dev, "Can't set cpu dai clock %d\n", ret);

		return ret;

	}



	ret = snd_soc_dai_set_sysclk(codec_dai, 0, mclk,

				     SND_SOC_CLOCK_IN);

	if (ret < 0) {

		dev_err(codec_dai->dev, "Can't set codec clock %d\n", ret);



	/* HDMI codec dai does not need to set sysclk. */

	if (!strcmp(rtd->dai_link->name, "HDMI"))

		return 0;



	if (ret) {

		dev_err(codec_dai->dev, "Can't set codec dai clock %d\n", ret);

		return ret;

	}
@@ -152,20 +203,67 @@ static const struct snd_soc_ops rk_aif1_ops = { 
	.startup = rk_aif1_startup,

};



SND_SOC_DAILINK_DEFS(hifi,

SND_SOC_DAILINK_DEFS(analog,

		     DAILINK_COMP_ARRAY(COMP_EMPTY()),

		     DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "HiFi")),

		     DAILINK_COMP_ARRAY(COMP_EMPTY()));



static struct snd_soc_dai_link rk_dailink = {

SND_SOC_DAILINK_DEFS(hdmi,

		     DAILINK_COMP_ARRAY(COMP_EMPTY()),

		     DAILINK_COMP_ARRAY(COMP_CODEC(NULL, "i2s-hifi")),

		     DAILINK_COMP_ARRAY(COMP_EMPTY()));



enum {

	DAILINK_MAX98090,

	DAILINK_HDMI,

};



/* max98090 dai_link */

static struct snd_soc_dai_link rk_max98090_dailinks[] = {

	{

		.name = "max98090",

	.stream_name = "Audio",

		.stream_name = "Analog",

		.init = rk_init,

		.ops = &rk_aif1_ops,

		/* set max98090 as slave */

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBS_CFS,

	SND_SOC_DAILINK_REG(hifi),

		SND_SOC_DAILINK_REG(analog),

	},

};



/* HDMI codec dai_link */

static struct snd_soc_dai_link rk_hdmi_dailinks[] = {

	{

		.name = "HDMI",

		.stream_name = "HDMI",

		.ops = &rk_aif1_ops,

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBS_CFS,

		SND_SOC_DAILINK_REG(hdmi),

	}

};



/* max98090 and HDMI codec dai_link */

static struct snd_soc_dai_link rk_max98090_hdmi_dailinks[] = {

	[DAILINK_MAX98090] = {

		.name = "max98090",

		.stream_name = "Analog",

		.init = rk_init,

		.ops = &rk_aif1_ops,

		/* set max98090 as slave */

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBS_CFS,

		SND_SOC_DAILINK_REG(analog),

	},

	[DAILINK_HDMI] = {

		.name = "HDMI",

		.stream_name = "HDMI",

		.ops = &rk_aif1_ops,

		.dai_fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_NB_NF |

			SND_SOC_DAIFMT_CBS_CFS,

		SND_SOC_DAILINK_REG(hdmi),

	}

};



static int rk_98090_headset_init(struct snd_soc_component *component);
@@ -175,19 +273,47 @@ static struct snd_soc_aux_dev rk_98090_headset_dev = { 
	.init = rk_98090_headset_init,

};



static struct snd_soc_card snd_soc_card_rk = {

static struct snd_soc_card rockchip_max98090_card = {

	.name = "ROCKCHIP-I2S",

	.owner = THIS_MODULE,

	.dai_link = &rk_dailink,

	.num_links = 1,

	.dai_link = rk_max98090_dailinks,

	.num_links = ARRAY_SIZE(rk_max98090_dailinks),

	.aux_dev = &rk_98090_headset_dev,

	.num_aux_devs = 1,

	.dapm_widgets = rk_max98090_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(rk_max98090_dapm_widgets),

	.dapm_routes = rk_max98090_audio_map,

	.num_dapm_routes = ARRAY_SIZE(rk_max98090_audio_map),

	.controls = rk_max98090_controls,

	.num_controls = ARRAY_SIZE(rk_max98090_controls),

};



static struct snd_soc_card rockchip_hdmi_card = {

	.name = "ROCKCHIP-HDMI",

	.owner = THIS_MODULE,

	.dai_link = rk_hdmi_dailinks,

	.num_links = ARRAY_SIZE(rk_hdmi_dailinks),

	.dapm_widgets = rk_hdmi_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(rk_hdmi_dapm_widgets),

	.dapm_routes = rk_hdmi_audio_map,

	.num_dapm_routes = ARRAY_SIZE(rk_hdmi_audio_map),

	.controls = rk_hdmi_controls,

	.num_controls = ARRAY_SIZE(rk_hdmi_controls),

};



static struct snd_soc_card rockchip_max98090_hdmi_card = {

	.name = "ROCKCHIP-MAX98090-HDMI",

	.owner = THIS_MODULE,

	.dai_link = rk_max98090_hdmi_dailinks,

	.num_links = ARRAY_SIZE(rk_max98090_hdmi_dailinks),

	.aux_dev = &rk_98090_headset_dev,

	.num_aux_devs = 1,

	.dapm_widgets = rk_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(rk_dapm_widgets),

	.dapm_routes = rk_audio_map,

	.num_dapm_routes = ARRAY_SIZE(rk_audio_map),

	.controls = rk_mc_controls,

	.num_controls = ARRAY_SIZE(rk_mc_controls),

	.dapm_widgets = rk_max98090_hdmi_dapm_widgets,

	.num_dapm_widgets = ARRAY_SIZE(rk_max98090_hdmi_dapm_widgets),

	.dapm_routes = rk_max98090_hdmi_audio_map,

	.num_dapm_routes = ARRAY_SIZE(rk_max98090_hdmi_audio_map),

	.controls = rk_max98090_hdmi_controls,

	.num_controls = ARRAY_SIZE(rk_max98090_hdmi_controls),

};



static int rk_98090_headset_init(struct snd_soc_component *component)
@@ -195,7 +321,7 @@ static int rk_98090_headset_init(struct snd_soc_component *component) 
	int ret;



	/* Enable Headset and 4 Buttons Jack detection */

	ret = snd_soc_card_jack_new(&snd_soc_card_rk, "Headset Jack",

	ret = snd_soc_card_jack_new(component->card, "Headset Jack",

				    SND_JACK_HEADSET |

				    SND_JACK_BTN_0 | SND_JACK_BTN_1 |

				    SND_JACK_BTN_2 | SND_JACK_BTN_3,
@@ -210,41 +336,75 @@ static int rk_98090_headset_init(struct snd_soc_component *component) 
	return ret;

}



static int rk_parse_headset_from_of(struct device *dev, struct device_node *np)

{

	rk_98090_headset_dev.dlc.of_node = of_parse_phandle(

			np, "rockchip,headset-codec", 0);

	if (!rk_98090_headset_dev.dlc.of_node) {

		dev_err(dev,

			"Property 'rockchip,headset-codec' missing/invalid\n");

		return -EINVAL;

	}

	return 0;

}



static int snd_rk_mc_probe(struct platform_device *pdev)

{

	int ret = 0;

	struct snd_soc_card *card = &snd_soc_card_rk;

	struct snd_soc_card *card;

	struct device *dev = &pdev->dev;

	struct device_node *np = pdev->dev.of_node;

	struct device_node *np_cpu;

	struct device_node *np_audio, *np_hdmi;



	/* register the soc card */

	card->dev = &pdev->dev;

	/* Parse DTS for I2S controller. */

	np_cpu = of_parse_phandle(np, "rockchip,i2s-controller", 0);



	rk_dailink.codecs->of_node = of_parse_phandle(np,

			"rockchip,audio-codec", 0);

	if (!rk_dailink.codecs->of_node) {

	if (!np_cpu) {

		dev_err(&pdev->dev,

			"Property 'rockchip,audio-codec' missing or invalid\n");

			"Property 'rockchip,i2s-controller missing or invalid\n");

		return -EINVAL;

	}



	rk_dailink.cpus->of_node = of_parse_phandle(np,

			"rockchip,i2s-controller", 0);

	if (!rk_dailink.cpus->of_node) {

		dev_err(&pdev->dev,

			"Property 'rockchip,i2s-controller' missing or invalid\n");

	/*

	 * Find the card to use based on the presences of audio codec

	 * and hdmi codec in device property. Set their of_node accordingly.

	 */

	np_audio = of_parse_phandle(np, "rockchip,audio-codec", 0);

	np_hdmi = of_parse_phandle(np, "rockchip,hdmi-codec", 0);

	if (np_audio && np_hdmi) {

		card = &rockchip_max98090_hdmi_card;

		card->dai_link[DAILINK_MAX98090].codecs->of_node = np_audio;

		card->dai_link[DAILINK_HDMI].codecs->of_node = np_hdmi;

		card->dai_link[DAILINK_MAX98090].cpus->of_node = np_cpu;

		card->dai_link[DAILINK_MAX98090].platforms->of_node = np_cpu;

		card->dai_link[DAILINK_HDMI].cpus->of_node = np_cpu;

		card->dai_link[DAILINK_HDMI].platforms->of_node = np_cpu;

	} else if (np_audio) {

		card = &rockchip_max98090_card;

		card->dai_link[0].codecs->of_node = np_audio;

		card->dai_link[0].cpus->of_node = np_cpu;

		card->dai_link[0].platforms->of_node = np_cpu;

	} else if (np_hdmi) {

		card = &rockchip_hdmi_card;

		card->dai_link[0].codecs->of_node = np_hdmi;

		card->dai_link[0].cpus->of_node = np_cpu;

		card->dai_link[0].platforms->of_node = np_cpu;

	} else {

		dev_err(dev, "At least one of codecs should be specified\n");

		return -EINVAL;

	}



	rk_dailink.platforms->of_node = rk_dailink.cpus->of_node;

	card->dev = dev;



	rk_98090_headset_dev.dlc.of_node = of_parse_phandle(np,

			"rockchip,headset-codec", 0);

	if (!rk_98090_headset_dev.dlc.of_node) {

		dev_err(&pdev->dev,

			"Property 'rockchip,headset-codec' missing/invalid\n");

		return -EINVAL;

	/* Parse headset detection codec. */

	if (np_audio) {

		ret = rk_parse_headset_from_of(dev, np);

		if (ret)

			return ret;

	}



	/* Parse card name. */

	ret = snd_soc_of_parse_card_name(card, "rockchip,model");

	if (ret) {

		dev_err(&pdev->dev,
@@ -252,6 +412,7 @@ static int snd_rk_mc_probe(struct platform_device *pdev) 
		return ret;

	}



	/* register the soc card */

	ret = devm_snd_soc_register_card(&pdev->dev, card);

	if (ret) {

		dev_err(&pdev->dev,