Commit 384ea793 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/wm0010', 'asoc/topic/wm5100',... 

Merge remote-tracking branches 'asoc/topic/wm0010', 'asoc/topic/wm5100', 'asoc/topic/wm5110', 'asoc/topic/wm8004' and 'asoc/topic/wm8731' into asoc-next
parents c009d370 030e6ee2 efc04ca2 dc606e05 c8a6b92b f611cdd8

drivers/mfd/wm5110-tables.c

+15 −1
Original line number Diff line number Diff line
@@ -249,6 +249,16 @@ static const struct reg_sequence wm5110_revd_patch[] = { 
	{ 0x80, 0x0 },

};



/* Add extra headphone write sequence locations */

static const struct reg_default wm5110_reve_patch[] = {

	{ 0x80, 0x3 },

	{ 0x80, 0x3 },

	{ 0x4b, 0x138 },

	{ 0x4c, 0x13d },

	{ 0x80, 0x0 },

	{ 0x80, 0x0 },

};



/* We use a function so we can use ARRAY_SIZE() */

int wm5110_patch(struct arizona *arizona)

{
@@ -266,7 +276,9 @@ int wm5110_patch(struct arizona *arizona) 
					     wm5110_revd_patch,

					     ARRAY_SIZE(wm5110_revd_patch));

	default:

		return 0;

		return regmap_register_patch(arizona->regmap,

					     wm5110_reve_patch,

					     ARRAY_SIZE(wm5110_reve_patch));

	}

}

EXPORT_SYMBOL_GPL(wm5110_patch);
@@ -676,6 +688,7 @@ static const struct reg_default wm5110_reg_default[] = { 
	{ 0x00000032, 0x0100 },    /* R50    - PWM Drive 3 */

	{ 0x00000040, 0x0000 },    /* R64    - Wake control */

	{ 0x00000041, 0x0000 },    /* R65    - Sequence control */

	{ 0x00000042, 0x0000 },    /* R66    - Spare Triggers */

	{ 0x00000061, 0x01FF },    /* R97    - Sample Rate Sequence Select 1 */

	{ 0x00000062, 0x01FF },    /* R98    - Sample Rate Sequence Select 2 */

	{ 0x00000063, 0x01FF },    /* R99    - Sample Rate Sequence Select 3 */
@@ -1716,6 +1729,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg) 
	case ARIZONA_PWM_DRIVE_3:

	case ARIZONA_WAKE_CONTROL:

	case ARIZONA_SEQUENCE_CONTROL:

	case ARIZONA_SPARE_TRIGGERS:

	case ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_1:

	case ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_2:

	case ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_3:

include/linux/mfd/arizona/registers.h

+37 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#define ARIZONA_PWM_DRIVE_3                      0x32

#define ARIZONA_WAKE_CONTROL                     0x40

#define ARIZONA_SEQUENCE_CONTROL                 0x41

#define ARIZONA_SPARE_TRIGGERS                   0x42

#define ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_1    0x61

#define ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_2    0x62

#define ARIZONA_SAMPLE_RATE_SEQUENCE_SELECT_3    0x63
@@ -1430,6 +1431,42 @@ 
#define ARIZONA_WSEQ_ENA_JD2_RISE_SHIFT               0  /* WSEQ_ENA_JD2_RISE */

#define ARIZONA_WSEQ_ENA_JD2_RISE_WIDTH               1  /* WSEQ_ENA_JD2_RISE */



/*

 * R66 (0x42) - Spare Triggers

 */

#define ARIZONA_WS_TRG8                          0x0080  /* WS_TRG8 */

#define ARIZONA_WS_TRG8_MASK                     0x0080  /* WS_TRG8 */

#define ARIZONA_WS_TRG8_SHIFT                         7  /* WS_TRG8 */

#define ARIZONA_WS_TRG8_WIDTH                         1  /* WS_TRG8 */

#define ARIZONA_WS_TRG7                          0x0040  /* WS_TRG7 */

#define ARIZONA_WS_TRG7_MASK                     0x0040  /* WS_TRG7 */

#define ARIZONA_WS_TRG7_SHIFT                         6  /* WS_TRG7 */

#define ARIZONA_WS_TRG7_WIDTH                         1  /* WS_TRG7 */

#define ARIZONA_WS_TRG6                          0x0020  /* WS_TRG6 */

#define ARIZONA_WS_TRG6_MASK                     0x0020  /* WS_TRG6 */

#define ARIZONA_WS_TRG6_SHIFT                         5  /* WS_TRG6 */

#define ARIZONA_WS_TRG6_WIDTH                         1  /* WS_TRG6 */

#define ARIZONA_WS_TRG5                          0x0010  /* WS_TRG5 */

#define ARIZONA_WS_TRG5_MASK                     0x0010  /* WS_TRG5 */

#define ARIZONA_WS_TRG5_SHIFT                         4  /* WS_TRG5 */

#define ARIZONA_WS_TRG5_WIDTH                         1  /* WS_TRG5 */

#define ARIZONA_WS_TRG4                          0x0008  /* WS_TRG4 */

#define ARIZONA_WS_TRG4_MASK                     0x0008  /* WS_TRG4 */

#define ARIZONA_WS_TRG4_SHIFT                         3  /* WS_TRG4 */

#define ARIZONA_WS_TRG4_WIDTH                         1  /* WS_TRG4 */

#define ARIZONA_WS_TRG3                          0x0004  /* WS_TRG3 */

#define ARIZONA_WS_TRG3_MASK                     0x0004  /* WS_TRG3 */

#define ARIZONA_WS_TRG3_SHIFT                         2  /* WS_TRG3 */

#define ARIZONA_WS_TRG3_WIDTH                         1  /* WS_TRG3 */

#define ARIZONA_WS_TRG2                          0x0002  /* WS_TRG2 */

#define ARIZONA_WS_TRG2_MASK                     0x0002  /* WS_TRG2 */

#define ARIZONA_WS_TRG2_SHIFT                         1  /* WS_TRG2 */

#define ARIZONA_WS_TRG2_WIDTH                         1  /* WS_TRG2 */

#define ARIZONA_WS_TRG1                          0x0001  /* WS_TRG1 */

#define ARIZONA_WS_TRG1_MASK                     0x0001  /* WS_TRG1 */

#define ARIZONA_WS_TRG1_SHIFT                         0  /* WS_TRG1 */

#define ARIZONA_WS_TRG1_WIDTH                         1  /* WS_TRG1 */



/*

 * R97 (0x61) - Sample Rate Sequence Select 1

 */

sound/soc/codecs/wm0010.c

+1 −2
Original line number Diff line number Diff line
@@ -953,7 +953,7 @@ static int wm0010_spi_probe(struct spi_device *spi) 
		trigger = IRQF_TRIGGER_FALLING;

	trigger |= IRQF_ONESHOT;



	ret = request_threaded_irq(irq, NULL, wm0010_irq, trigger | IRQF_ONESHOT,

	ret = request_threaded_irq(irq, NULL, wm0010_irq, trigger,

				   "wm0010", wm0010);

	if (ret) {

		dev_err(wm0010->dev, "Failed to request IRQ %d: %d\n",
@@ -1003,7 +1003,6 @@ static int wm0010_spi_remove(struct spi_device *spi) 
static struct spi_driver wm0010_spi_driver = {

	.driver = {

		.name	= "wm0010",

		.bus 	= &spi_bus_type,

		.owner	= THIS_MODULE,

	},

	.probe		= wm0010_spi_probe,

sound/soc/codecs/wm5100.c

+2 −4
Original line number Diff line number Diff line
@@ -2570,13 +2570,11 @@ static int wm5100_i2c_probe(struct i2c_client *i2c, 


		if (irq_flags & (IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING))

			ret = request_threaded_irq(i2c->irq, NULL,

						   wm5100_edge_irq,

						   irq_flags | IRQF_ONESHOT,

						   wm5100_edge_irq, irq_flags,

						   "wm5100", wm5100);

		else

			ret = request_threaded_irq(i2c->irq, NULL, wm5100_irq,

						   irq_flags | IRQF_ONESHOT,

						   "wm5100",

						   irq_flags, "wm5100",

						   wm5100);



		if (ret != 0) {

sound/soc/codecs/wm5110.c

+276 −9
Original line number Diff line number Diff line
@@ -131,6 +131,25 @@ static const struct reg_default wm5110_sysclk_revd_patch[] = { 
	{ 0x33fb, 0xfe00 },

};



static const struct reg_default wm5110_sysclk_reve_patch[] = {

	{ 0x3270, 0xE410 },

	{ 0x3271, 0x3078 },

	{ 0x3272, 0xE410 },

	{ 0x3273, 0x3070 },

	{ 0x3274, 0xE410 },

	{ 0x3275, 0x3066 },

	{ 0x3276, 0xE410 },

	{ 0x3277, 0x3056 },

	{ 0x327A, 0xE414 },

	{ 0x327B, 0x3078 },

	{ 0x327C, 0xE414 },

	{ 0x327D, 0x3070 },

	{ 0x327E, 0xE414 },

	{ 0x327F, 0x3066 },

	{ 0x3280, 0xE414 },

	{ 0x3281, 0x3056 },

};



static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w,

			    struct snd_kcontrol *kcontrol, int event)

{
@@ -146,7 +165,9 @@ static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w, 
		patch_size = ARRAY_SIZE(wm5110_sysclk_revd_patch);

		break;

	default:

		return 0;

		patch = wm5110_sysclk_reve_patch;

		patch_size = ARRAY_SIZE(wm5110_sysclk_reve_patch);

		break;

	}



	switch (event) {
@@ -164,6 +185,249 @@ static int wm5110_sysclk_ev(struct snd_soc_dapm_widget *w, 
	return 0;

}



static const struct reg_sequence wm5110_no_dre_left_enable[] = {

	{ 0x3024, 0xE410 },

	{ 0x3025, 0x0056 },

	{ 0x301B, 0x0224 },

	{ 0x301F, 0x4263 },

	{ 0x3021, 0x5291 },

	{ 0x3030, 0xE410 },

	{ 0x3031, 0x3066 },

	{ 0x3032, 0xE410 },

	{ 0x3033, 0x3070 },

	{ 0x3034, 0xE410 },

	{ 0x3035, 0x3078 },

	{ 0x3036, 0xE410 },

	{ 0x3037, 0x3080 },

	{ 0x3038, 0xE410 },

	{ 0x3039, 0x3080 },

};



static const struct reg_sequence wm5110_dre_left_enable[] = {

	{ 0x3024, 0x0231 },

	{ 0x3025, 0x0B00 },

	{ 0x301B, 0x0227 },

	{ 0x301F, 0x4266 },

	{ 0x3021, 0x5294 },

	{ 0x3030, 0xE231 },

	{ 0x3031, 0x0266 },

	{ 0x3032, 0x8231 },

	{ 0x3033, 0x4B15 },

	{ 0x3034, 0x8231 },

	{ 0x3035, 0x0B15 },

	{ 0x3036, 0xE231 },

	{ 0x3037, 0x5294 },

	{ 0x3038, 0x0231 },

	{ 0x3039, 0x0B00 },

};



static const struct reg_sequence wm5110_no_dre_right_enable[] = {

	{ 0x3074, 0xE414 },

	{ 0x3075, 0x0056 },

	{ 0x306B, 0x0224 },

	{ 0x306F, 0x4263 },

	{ 0x3071, 0x5291 },

	{ 0x3080, 0xE414 },

	{ 0x3081, 0x3066 },

	{ 0x3082, 0xE414 },

	{ 0x3083, 0x3070 },

	{ 0x3084, 0xE414 },

	{ 0x3085, 0x3078 },

	{ 0x3086, 0xE414 },

	{ 0x3087, 0x3080 },

	{ 0x3088, 0xE414 },

	{ 0x3089, 0x3080 },

};



static const struct reg_sequence wm5110_dre_right_enable[] = {

	{ 0x3074, 0x0231 },

	{ 0x3075, 0x0B00 },

	{ 0x306B, 0x0227 },

	{ 0x306F, 0x4266 },

	{ 0x3071, 0x5294 },

	{ 0x3080, 0xE231 },

	{ 0x3081, 0x0266 },

	{ 0x3082, 0x8231 },

	{ 0x3083, 0x4B17 },

	{ 0x3084, 0x8231 },

	{ 0x3085, 0x0B17 },

	{ 0x3086, 0xE231 },

	{ 0x3087, 0x5294 },

	{ 0x3088, 0x0231 },

	{ 0x3089, 0x0B00 },

};



static int wm5110_hp_pre_enable(struct snd_soc_dapm_widget *w)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	struct arizona *arizona = priv->arizona;

	unsigned int val = snd_soc_read(codec, ARIZONA_DRE_ENABLE);

	const struct reg_sequence *wseq;

	int nregs;



	switch (w->shift) {

	case ARIZONA_OUT1L_ENA_SHIFT:

		if (val & ARIZONA_DRE1L_ENA_MASK) {

			wseq = wm5110_dre_left_enable;

			nregs = ARRAY_SIZE(wm5110_dre_left_enable);

		} else {

			wseq = wm5110_no_dre_left_enable;

			nregs = ARRAY_SIZE(wm5110_no_dre_left_enable);

			priv->out_up_delay += 10;

		}

		break;

	case ARIZONA_OUT1R_ENA_SHIFT:

		if (val & ARIZONA_DRE1R_ENA_MASK) {

			wseq = wm5110_dre_right_enable;

			nregs = ARRAY_SIZE(wm5110_dre_right_enable);

		} else {

			wseq = wm5110_no_dre_right_enable;

			nregs = ARRAY_SIZE(wm5110_no_dre_right_enable);

			priv->out_up_delay += 10;

		}

		break;

	default:

		return 0;

	}



	return regmap_multi_reg_write(arizona->regmap, wseq, nregs);

}



static int wm5110_hp_pre_disable(struct snd_soc_dapm_widget *w)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);

	unsigned int val = snd_soc_read(codec, ARIZONA_DRE_ENABLE);



	switch (w->shift) {

	case ARIZONA_OUT1L_ENA_SHIFT:

		if (!(val & ARIZONA_DRE1L_ENA_MASK)) {

			snd_soc_update_bits(codec, ARIZONA_SPARE_TRIGGERS,

					    ARIZONA_WS_TRG1, ARIZONA_WS_TRG1);

			snd_soc_update_bits(codec, ARIZONA_SPARE_TRIGGERS,

					    ARIZONA_WS_TRG1, 0);

			priv->out_down_delay += 27;

		}

		break;

	case ARIZONA_OUT1R_ENA_SHIFT:

		if (!(val & ARIZONA_DRE1R_ENA_MASK)) {

			snd_soc_update_bits(codec, ARIZONA_SPARE_TRIGGERS,

					    ARIZONA_WS_TRG2, ARIZONA_WS_TRG2);

			snd_soc_update_bits(codec, ARIZONA_SPARE_TRIGGERS,

					    ARIZONA_WS_TRG2, 0);

			priv->out_down_delay += 27;

		}

		break;

	default:

		break;

	}



	return 0;

}



static int wm5110_hp_ev(struct snd_soc_dapm_widget *w,

			struct snd_kcontrol *kcontrol, int event)

{

	struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm);

	struct arizona_priv *priv = snd_soc_codec_get_drvdata(codec);



	switch (priv->arizona->rev) {

	case 0 ... 3:

		break;

	default:

		switch (event) {

		case SND_SOC_DAPM_PRE_PMU:

			wm5110_hp_pre_enable(w);

			break;

		case SND_SOC_DAPM_PRE_PMD:

			wm5110_hp_pre_disable(w);

			break;

		default:

			break;

		}

		break;

	}



	return arizona_hp_ev(w, kcontrol, event);

}



static int wm5110_clear_pga_volume(struct arizona *arizona, int output)

{

	struct reg_sequence clear_pga = {

		ARIZONA_OUTPUT_PATH_CONFIG_1L + output * 4, 0x80

	};

	int ret;



	ret = regmap_multi_reg_write_bypassed(arizona->regmap, &clear_pga, 1);

	if (ret)

		dev_err(arizona->dev, "Failed to clear PGA (0x%x): %d\n",

			clear_pga.reg, ret);



	return ret;

}



static int wm5110_put_dre(struct snd_kcontrol *kcontrol,

			  struct snd_ctl_elem_value *ucontrol)

{

	struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol);

	struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);

	struct arizona *arizona = dev_get_drvdata(codec->dev->parent);

	struct soc_mixer_control *mc =

		(struct soc_mixer_control *)kcontrol->private_value;

	unsigned int ena, dre;

	unsigned int mask = (0x1 << mc->shift) | (0x1 << mc->rshift);

	unsigned int lnew = (!!ucontrol->value.integer.value[0]) << mc->shift;

	unsigned int rnew = (!!ucontrol->value.integer.value[1]) << mc->rshift;

	unsigned int lold, rold;

	unsigned int lena, rena;

	int ret;



	snd_soc_dapm_mutex_lock(dapm);



	ret = regmap_read(arizona->regmap, ARIZONA_OUTPUT_ENABLES_1, &ena);

	if (ret) {

		dev_err(arizona->dev, "Failed to read output state: %d\n", ret);

		goto err;

	}

	ret = regmap_read(arizona->regmap, ARIZONA_DRE_ENABLE, &dre);

	if (ret) {

		dev_err(arizona->dev, "Failed to read DRE state: %d\n", ret);

		goto err;

	}



	lold = dre & (1 << mc->shift);

	rold = dre & (1 << mc->rshift);

	/* Enables are channel wise swapped from the DRE enables */

	lena = ena & (1 << mc->rshift);

	rena = ena & (1 << mc->shift);



	if ((lena && lnew != lold) || (rena && rnew != rold)) {

		dev_err(arizona->dev, "Can't change DRE on active outputs\n");

		ret = -EBUSY;

		goto err;

	}



	ret = regmap_update_bits(arizona->regmap, ARIZONA_DRE_ENABLE,

				 mask, lnew | rnew);

	if (ret) {

		dev_err(arizona->dev, "Failed to set DRE: %d\n", ret);

		goto err;

	}



	/* Force reset of PGA volumes, if turning DRE off */

	if (!lnew && lold)

		wm5110_clear_pga_volume(arizona, mc->shift);



	if (!rnew && rold)

		wm5110_clear_pga_volume(arizona, mc->rshift);



err:

	snd_soc_dapm_mutex_unlock(dapm);



	return ret;

}



static DECLARE_TLV_DB_SCALE(ana_tlv, 0, 100, 0);

static DECLARE_TLV_DB_SCALE(eq_tlv, -1200, 100, 0);

static DECLARE_TLV_DB_SCALE(digital_tlv, -6400, 50, 0);
@@ -405,12 +669,15 @@ SOC_DOUBLE("SPKDAT1 Switch", ARIZONA_PDM_SPK1_CTRL_1, ARIZONA_SPK1L_MUTE_SHIFT, 
SOC_DOUBLE("SPKDAT2 Switch", ARIZONA_PDM_SPK2_CTRL_1, ARIZONA_SPK2L_MUTE_SHIFT,

	   ARIZONA_SPK2R_MUTE_SHIFT, 1, 1),



SOC_DOUBLE("HPOUT1 DRE Switch", ARIZONA_DRE_ENABLE,

	   ARIZONA_DRE1L_ENA_SHIFT, ARIZONA_DRE1R_ENA_SHIFT, 1, 0),

SOC_DOUBLE("HPOUT2 DRE Switch", ARIZONA_DRE_ENABLE,

	   ARIZONA_DRE2L_ENA_SHIFT, ARIZONA_DRE2R_ENA_SHIFT, 1, 0),

SOC_DOUBLE("HPOUT3 DRE Switch", ARIZONA_DRE_ENABLE,

	   ARIZONA_DRE3L_ENA_SHIFT, ARIZONA_DRE3R_ENA_SHIFT, 1, 0),

SOC_DOUBLE_EXT("HPOUT1 DRE Switch", ARIZONA_DRE_ENABLE,

	   ARIZONA_DRE1L_ENA_SHIFT, ARIZONA_DRE1R_ENA_SHIFT, 1, 0,

	   snd_soc_get_volsw, wm5110_put_dre),

SOC_DOUBLE_EXT("HPOUT2 DRE Switch", ARIZONA_DRE_ENABLE,

	   ARIZONA_DRE2L_ENA_SHIFT, ARIZONA_DRE2R_ENA_SHIFT, 1, 0,

	   snd_soc_get_volsw, wm5110_put_dre),

SOC_DOUBLE_EXT("HPOUT3 DRE Switch", ARIZONA_DRE_ENABLE,

	   ARIZONA_DRE3L_ENA_SHIFT, ARIZONA_DRE3R_ENA_SHIFT, 1, 0,

	   snd_soc_get_volsw, wm5110_put_dre),



SOC_ENUM("Output Ramp Up", arizona_out_vi_ramp),

SOC_ENUM("Output Ramp Down", arizona_out_vd_ramp),
@@ -900,11 +1167,11 @@ SND_SOC_DAPM_AIF_IN("AIF3RX2", NULL, 0, 
		    ARIZONA_AIF3_RX_ENABLES, ARIZONA_AIF3RX2_ENA_SHIFT, 0),



SND_SOC_DAPM_PGA_E("OUT1L", SND_SOC_NOPM,

		   ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   ARIZONA_OUT1L_ENA_SHIFT, 0, NULL, 0, wm5110_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT1R", SND_SOC_NOPM,

		   ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, arizona_hp_ev,

		   ARIZONA_OUT1R_ENA_SHIFT, 0, NULL, 0, wm5110_hp_ev,

		   SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD |

		   SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU),

SND_SOC_DAPM_PGA_E("OUT2L", ARIZONA_OUTPUT_ENABLES_1,