@@ -267,6 +267,7 @@ config SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH
select SND_SOC_INTEL_SST
depends on SND_SOC_INTEL_SKYLAKE
select SND_SOC_HDAC_HDMI
+ select SND_SOC_HDAC_HDA
help
This adds support for ASoC Onboard Codec HDA machine driver. This will
create an alsa sound card for HDA Codecs.
@@ -62,6 +62,24 @@ int skl_hda_hdmi_add_pcm(struct snd_soc_card *card, int device)
return 0;
}
+static int skl_hda_link_fixup(struct snd_soc_pcm_runtime *rtd,
+ struct snd_pcm_hw_params *params)
+{
+ struct snd_interval *rate = hw_param_interval(params,
+ SNDRV_PCM_HW_PARAM_RATE);
+ struct snd_interval *channels = hw_param_interval(params,
+ SNDRV_PCM_HW_PARAM_CHANNELS);
+ struct snd_mask *fmt = hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
+
+ /* The output is 48KHz, stereo, 16bits */
+ rate->min = rate->max = 48000;
+ channels->min = channels->max = 2;
+
+ snd_mask_none(fmt);
+ snd_mask_set(fmt, SNDRV_PCM_FORMAT_S24_LE);
+ return 0;
+}
+
/* skl_hda_digital audio interface glue - connects codec <--> CPU */
struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = {
@@ -96,6 +114,31 @@ struct snd_soc_dai_link skl_hda_be_dai_links[HDA_DSP_MAX_BE_DAI_LINKS] = {
.dpcm_playback = 1,
.no_pcm = 1,
},
+ {
+ .name = "Analog Playback and Capture",
+ .id = 4,
+ .cpu_dai_name = "Analog CPU DAI",
+ .codec_name = "ehdaudio0D0",
+ .codec_dai_name = "Analog Codec DAI",
+ .platform_name = "0000:00:1f.3",
+ .dpcm_playback = 1,
+ .dpcm_capture = 1,
+ .init = NULL,
+ .no_pcm = 1,
+ .be_hw_params_fixup = skl_hda_link_fixup,
+ },
+ {
+ .name = "Digital Playback and Capture",
+ .id = 5,
+ .cpu_dai_name = "Digital CPU DAI",
+ .codec_name = "ehdaudio0D0",
+ .codec_dai_name = "Digital Codec DAI",
+ .platform_name = "0000:00:1f.3",
+ .dpcm_playback = 1,
+ .dpcm_capture = 1,
+ .init = NULL,
+ .no_pcm = 1,
+ },
};
int skl_hda_hdmi_jack_init(struct snd_soc_card *card)
@@ -21,7 +21,7 @@
#include <sound/jack.h>
#define __SOUND_SOC_HDA_DSP_COMMON_H
-#define HDA_DSP_MAX_BE_DAI_LINKS 3
+#define HDA_DSP_MAX_BE_DAI_LINKS 5
struct skl_hda_hdmi_pcm {
struct list_head head;
@@ -25,8 +25,33 @@
#include "../skylake/skl.h"
#include "skl_hda_dsp_common.h"
+static const struct snd_kcontrol_new skl_hda_controls[] = {
+ SOC_DAPM_PIN_SWITCH("Headphone"),
+ SOC_DAPM_PIN_SWITCH("Headset Mic"),
+};
+
+static const struct snd_soc_dapm_widget skl_hda_widgets[] = {
+ SND_SOC_DAPM_HP("Headphone", NULL),
+ SND_SOC_DAPM_MIC("Headset Mic", NULL),
+ SND_SOC_DAPM_SPK("Codec Speaker", NULL),
+ SND_SOC_DAPM_MIC("Codec Mic", NULL),
+};
+
static const struct snd_soc_dapm_route skl_hda_map[] = {
+ /* HP jack connectors - unknown if we have jack detection */
+ { "Headphone", NULL, "Codec Output Pin1" },
+ { "Codec Speaker", NULL, "Codec Output Pin2" },
+ { "Codec Input Pin2", NULL, "Codec Mic" },
+ { "Codec Input Pin1", NULL, "Headset Mic" },
+
+ /* CODEC BE connections */
+ { "Analog Codec Playback", NULL, "Analog CPU Playback" },
+ { "Analog CPU Playback", NULL, "codec0_out" },
+
+ { "codec0_in", NULL, "Analog CPU Capture" },
+ { "Analog CPU Capture", NULL, "Analog Codec Capture" },
+
{ "hifi3", NULL, "iDisp3 Tx"},
{ "iDisp3 Tx", NULL, "iDisp3_out"},
{ "hifi2", NULL, "iDisp2 Tx"},
@@ -63,6 +88,10 @@ static struct snd_soc_card hda_soc_card = {
.owner = THIS_MODULE,
.dai_link = skl_hda_be_dai_links,
.num_links = ARRAY_SIZE(skl_hda_be_dai_links),
+ .controls = skl_hda_controls,
+ .num_controls = ARRAY_SIZE(skl_hda_controls),
+ .dapm_widgets = skl_hda_widgets,
+ .num_dapm_widgets = ARRAY_SIZE(skl_hda_widgets),
.dapm_routes = skl_hda_map,
.num_dapm_routes = ARRAY_SIZE(skl_hda_map),
.add_dai_link = skl_hda_add_dai_link,
Add support for HDA codecs. add required widgets, controls, routes and dai links for the same. Signed-off-by: Rakesh Ughreja <rakesh.a.ughreja@intel.com> --- sound/soc/intel/boards/Kconfig | 1 + sound/soc/intel/boards/skl_hda_dsp_common.c | 43 ++++++++++++++++++++++++++++ sound/soc/intel/boards/skl_hda_dsp_common.h | 2 +- sound/soc/intel/boards/skl_hda_dsp_generic.c | 29 +++++++++++++++++++ 4 files changed, 74 insertions(+), 1 deletion(-)