ASoC: msm8916-wcd-analog: Add earpiece (7d2f70f2) · Commits · 戴 / test

sound/soc/codecs/msm8916-wcd-analog.c

+52 −2

Original line number	Diff line number	Diff line
		@@ -228,6 +228,10 @@
		#define CDC_A_RX_EAR_CTL (0xf19E)
		#define RX_EAR_CTL_SPK_VBAT_LDO_EN_MASK BIT(0)
		#define RX_EAR_CTL_SPK_VBAT_LDO_EN_ENABLE BIT(0)
		#define RX_EAR_CTL_PA_EAR_PA_EN_MASK BIT(6)
		#define RX_EAR_CTL_PA_EAR_PA_EN_ENABLE BIT(6)
		#define RX_EAR_CTL_PA_SEL_MASK BIT(7)
		#define RX_EAR_CTL_PA_SEL BIT(7)

		#define CDC_A_SPKR_DAC_CTL (0xf1B0)
		#define SPKR_DAC_CTL_DAC_RESET_MASK BIT(4)
		@@ -312,6 +316,7 @@ static const char *const hph_text[] = { "ZERO", "Switch", };
		static const struct soc_enum hph_enum = SOC_ENUM_SINGLE_VIRT(
		ARRAY_SIZE(hph_text), hph_text);

		static const struct snd_kcontrol_new ear_mux = SOC_DAPM_ENUM("EAR_S", hph_enum);
		static const struct snd_kcontrol_new hphl_mux = SOC_DAPM_ENUM("HPHL", hph_enum);
		static const struct snd_kcontrol_new hphr_mux = SOC_DAPM_ENUM("HPHR", hph_enum);

		@@ -685,6 +690,34 @@ static int pm8916_wcd_analog_enable_spk_pa(struct snd_soc_dapm_widget *w,
		return 0;
		}

		static int pm8916_wcd_analog_enable_ear_pa(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol,
		int event)
		{
		struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);

		switch (event) {
		case SND_SOC_DAPM_PRE_PMU:
		snd_soc_component_update_bits(component, CDC_A_RX_EAR_CTL,
		RX_EAR_CTL_PA_SEL_MASK, RX_EAR_CTL_PA_SEL);
		break;
		case SND_SOC_DAPM_POST_PMU:
		snd_soc_component_update_bits(component, CDC_A_RX_EAR_CTL,
		RX_EAR_CTL_PA_EAR_PA_EN_MASK,
		RX_EAR_CTL_PA_EAR_PA_EN_ENABLE);
		break;
		case SND_SOC_DAPM_POST_PMD:
		snd_soc_component_update_bits(component, CDC_A_RX_EAR_CTL,
		RX_EAR_CTL_PA_EAR_PA_EN_MASK, 0);
		/* Delay to reduce ear turn off pop */
		usleep_range(7000, 7100);
		snd_soc_component_update_bits(component, CDC_A_RX_EAR_CTL,
		RX_EAR_CTL_PA_SEL_MASK, 0);
		break;
		}
		return 0;
		}

		static const struct reg_default wcd_reg_defaults_2_0[] = {
		{CDC_A_RX_COM_OCP_CTL, 0xD1},
		{CDC_A_RX_COM_OCP_COUNT, 0xFF},
		@@ -801,12 +834,20 @@ static const struct snd_soc_dapm_route pm8916_wcd_analog_audio_map[] = {
		{"PDM_TX", NULL, "A_MCLK2"},
		{"A_MCLK2", NULL, "A_MCLK"},

		/* Earpiece (RX MIX1) */
		{"EAR", NULL, "EAR_S"},
		{"EAR_S", "Switch", "EAR PA"},
		{"EAR PA", NULL, "RX_BIAS"},
		{"EAR PA", NULL, "HPHL DAC"},
		{"EAR PA", NULL, "HPHR DAC"},
		{"EAR PA", NULL, "EAR CP"},

		/* Headset (RX MIX1 and RX MIX2) */
		{"HEADPHONE", NULL, "HPHL PA"},
		{"HEADPHONE", NULL, "HPHR PA"},

		{"HPHL PA", NULL, "EAR_HPHL_CLK"},
		{"HPHR PA", NULL, "EAR_HPHR_CLK"},
		{"HPHL DAC", NULL, "EAR_HPHL_CLK"},
		{"HPHR DAC", NULL, "EAR_HPHR_CLK"},

		{"CP", NULL, "NCP_CLK"},

		@@ -847,11 +888,20 @@ static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {
		SND_SOC_DAPM_INPUT("AMIC1"),
		SND_SOC_DAPM_INPUT("AMIC3"),
		SND_SOC_DAPM_INPUT("AMIC2"),
		SND_SOC_DAPM_OUTPUT("EAR"),
		SND_SOC_DAPM_OUTPUT("HEADPHONE"),

		/* RX stuff */
		SND_SOC_DAPM_SUPPLY("INT_LDO_H", SND_SOC_NOPM, 1, 0, NULL, 0),

		SND_SOC_DAPM_PGA_E("EAR PA", SND_SOC_NOPM,
		0, 0, NULL, 0,
		pm8916_wcd_analog_enable_ear_pa,
		SND_SOC_DAPM_PRE_PMU \| SND_SOC_DAPM_POST_PMU \|
		SND_SOC_DAPM_PRE_PMD \| SND_SOC_DAPM_POST_PMD),
		SND_SOC_DAPM_MUX("EAR_S", SND_SOC_NOPM, 0, 0, &ear_mux),
		SND_SOC_DAPM_SUPPLY("EAR CP", CDC_A_NCP_EN, 4, 0, NULL, 0),

		SND_SOC_DAPM_PGA("HPHL PA", CDC_A_RX_HPH_CNP_EN, 5, 0, NULL, 0),
		SND_SOC_DAPM_MUX("HPHL", SND_SOC_NOPM, 0, 0, &hphl_mux),
		SND_SOC_DAPM_MIXER("HPHL DAC", CDC_A_RX_HPH_L_PA_DAC_CTL, 3, 0, NULL,

Admin message