Merge branch 'fix/asoc' into for-linus (2133991d) · Commits · e / devices / android_kernel_fairphone_FP5

sound/soc/codecs/wm8994.c

+42 −9

Original line number	Diff line number	Diff line
		@@ -110,6 +110,9 @@ struct wm8994_priv {

		unsigned int aif1clk_enable:1;
		unsigned int aif2clk_enable:1;

		unsigned int aif1clk_disable:1;
		unsigned int aif2clk_disable:1;
		};

		static int wm8994_readable(unsigned int reg)
		@@ -1015,14 +1018,18 @@ static int late_enable_ev(struct snd_soc_dapm_widget *w,

		switch (event) {
		case SND_SOC_DAPM_PRE_PMU:
		if (wm8994->aif1clk_enable)
		if (wm8994->aif1clk_enable) {
		snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1,
		WM8994_AIF1CLK_ENA_MASK,
		WM8994_AIF1CLK_ENA);
		if (wm8994->aif2clk_enable)
		wm8994->aif1clk_enable = 0;
		}
		if (wm8994->aif2clk_enable) {
		snd_soc_update_bits(codec, WM8994_AIF2_CLOCKING_1,
		WM8994_AIF2CLK_ENA_MASK,
		WM8994_AIF2CLK_ENA);
		wm8994->aif2clk_enable = 0;
		}
		break;
		}

		@@ -1037,15 +1044,15 @@ static int late_disable_ev(struct snd_soc_dapm_widget *w,

		switch (event) {
		case SND_SOC_DAPM_POST_PMD:
		if (wm8994->aif1clk_enable) {
		if (wm8994->aif1clk_disable) {
		snd_soc_update_bits(codec, WM8994_AIF1_CLOCKING_1,
		WM8994_AIF1CLK_ENA_MASK, 0);
		wm8994->aif1clk_enable = 0;
		wm8994->aif1clk_disable = 0;
		}
		if (wm8994->aif2clk_enable) {
		if (wm8994->aif2clk_disable) {
		snd_soc_update_bits(codec, WM8994_AIF2_CLOCKING_1,
		WM8994_AIF2CLK_ENA_MASK, 0);
		wm8994->aif2clk_enable = 0;
		wm8994->aif2clk_disable = 0;
		}
		break;
		}
		@@ -1063,6 +1070,9 @@ static int aif1clk_ev(struct snd_soc_dapm_widget *w,
		case SND_SOC_DAPM_PRE_PMU:
		wm8994->aif1clk_enable = 1;
		break;
		case SND_SOC_DAPM_POST_PMD:
		wm8994->aif1clk_disable = 1;
		break;
		}

		return 0;
		@@ -1078,11 +1088,21 @@ static int aif2clk_ev(struct snd_soc_dapm_widget *w,
		case SND_SOC_DAPM_PRE_PMU:
		wm8994->aif2clk_enable = 1;
		break;
		case SND_SOC_DAPM_POST_PMD:
		wm8994->aif2clk_disable = 1;
		break;
		}

		return 0;
		}

		static int adc_mux_ev(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol, int event)
		{
		late_enable_ev(w, kcontrol, event);
		return 0;
		}

		static int dac_ev(struct snd_soc_dapm_widget *w,
		struct snd_kcontrol *kcontrol, int event)
		{
		@@ -1403,6 +1423,18 @@ SND_SOC_DAPM_DAC("DAC1L", NULL, WM8994_POWER_MANAGEMENT_5, 1, 0),
		SND_SOC_DAPM_DAC("DAC1R", NULL, WM8994_POWER_MANAGEMENT_5, 0, 0),
		};

		static const struct snd_soc_dapm_widget wm8994_adc_revd_widgets[] = {
		SND_SOC_DAPM_MUX_E("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux,
		adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
		SND_SOC_DAPM_MUX_E("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux,
		adc_mux_ev, SND_SOC_DAPM_PRE_PMU),
		};

		static const struct snd_soc_dapm_widget wm8994_adc_widgets[] = {
		SND_SOC_DAPM_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),
		SND_SOC_DAPM_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),
		};

		static const struct snd_soc_dapm_widget wm8994_dapm_widgets[] = {
		SND_SOC_DAPM_INPUT("DMIC1DAT"),
		SND_SOC_DAPM_INPUT("DMIC2DAT"),
		@@ -1497,9 +1529,6 @@ SND_SOC_DAPM_ADC("DMIC1R", NULL, WM8994_POWER_MANAGEMENT_4, 2, 0),
		SND_SOC_DAPM_ADC("ADCL", NULL, SND_SOC_NOPM, 1, 0),
		SND_SOC_DAPM_ADC("ADCR", NULL, SND_SOC_NOPM, 0, 0),

		SND_SOC_DAPM_MUX("ADCL Mux", WM8994_POWER_MANAGEMENT_4, 1, 0, &adcl_mux),
		SND_SOC_DAPM_MUX("ADCR Mux", WM8994_POWER_MANAGEMENT_4, 0, 0, &adcr_mux),

		SND_SOC_DAPM_MUX("Left Headphone Mux", SND_SOC_NOPM, 0, 0, &hpl_mux),
		SND_SOC_DAPM_MUX("Right Headphone Mux", SND_SOC_NOPM, 0, 0, &hpr_mux),

		@@ -3280,11 +3309,15 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
		if (wm8994->revision < 4) {
		snd_soc_dapm_new_controls(dapm, wm8994_lateclk_revd_widgets,
		ARRAY_SIZE(wm8994_lateclk_revd_widgets));
		snd_soc_dapm_new_controls(dapm, wm8994_adc_revd_widgets,
		ARRAY_SIZE(wm8994_adc_revd_widgets));
		snd_soc_dapm_new_controls(dapm, wm8994_dac_revd_widgets,
		ARRAY_SIZE(wm8994_dac_revd_widgets));
		} else {
		snd_soc_dapm_new_controls(dapm, wm8994_lateclk_widgets,
		ARRAY_SIZE(wm8994_lateclk_widgets));
		snd_soc_dapm_new_controls(dapm, wm8994_adc_widgets,
		ARRAY_SIZE(wm8994_adc_widgets));
		snd_soc_dapm_new_controls(dapm, wm8994_dac_widgets,
		ARRAY_SIZE(wm8994_dac_widgets));
		}

sound/soc/codecs/wm9081.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,7 @@
		#include <linux/moduleparam.h>
		#include <linux/init.h>
		#include <linux/delay.h>
		#include <linux/device.h>
		#include <linux/pm.h>
		#include <linux/i2c.h>
		#include <linux/platform_device.h>
		@@ -1341,6 +1342,10 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,
		wm9081->control_type = SND_SOC_I2C;
		wm9081->control_data = i2c;

		if (dev_get_platdata(&i2c->dev))
		memcpy(&wm9081->retune, dev_get_platdata(&i2c->dev),
		sizeof(wm9081->retune));

		ret = snd_soc_register_codec(&i2c->dev,
		&soc_codec_dev_wm9081, &wm9081_dai, 1);
		if (ret < 0)