Commit f9a40596 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/fix/audmux', 'asoc/fix/cs42l52',... 

Merge remote-tracking branches 'asoc/fix/audmux', 'asoc/fix/cs42l52', 'asoc/fix/fsl-esai', 'asoc/fix/fsl-spdif', 'asoc/fix/rcar', 'asoc/fix/tlv320aic31xx' and 'asoc/fix/wm8962' into asoc-linus
parents b8909783 4e17d2d3 4f8210f6 6ae66982 836b31fe 2a1c23e3 44330ab5

Documentation/devicetree/bindings/sound/tlv320aic31xx.txt

+3 −3
Original line number Diff line number Diff line
@@ -13,6 +13,9 @@ Required properties: 
    "ti,tlv320aic3111" - TLV320AIC3111 (stereo speaker amp, MiniDSP)



- reg - <int> -  I2C slave address

- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,

  DVDD-supply : power supplies for the device as covered in

  Documentation/devicetree/bindings/regulator/regulator.txt





Optional properties:
@@ -24,9 +27,6 @@ Optional properties: 
        3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD

	If this node is not mentioned or if the value is unknown, then

	micbias	is set to 2.0V.

- HPVDD-supply, SPRVDD-supply, SPLVDD-supply, AVDD-supply, IOVDD-supply,

  DVDD-supply : power supplies for the device as covered in

  Documentation/devicetree/bindings/regulator/regulator.txt



CODEC output pins:

  * HPL

sound/soc/codecs/cs42l52.c

+4 −2
Original line number Diff line number Diff line
@@ -1229,8 +1229,10 @@ static int cs42l52_i2c_probe(struct i2c_client *i2c_client, 
	}



	if (cs42l52->pdata.reset_gpio) {

		ret = gpio_request_one(cs42l52->pdata.reset_gpio,

				       GPIOF_OUT_INIT_HIGH, "CS42L52 /RST");

		ret = devm_gpio_request_one(&i2c_client->dev,

					    cs42l52->pdata.reset_gpio,

					    GPIOF_OUT_INIT_HIGH,

					    "CS42L52 /RST");

		if (ret < 0) {

			dev_err(&i2c_client->dev, "Failed to request /RST %d: %d\n",

				cs42l52->pdata.reset_gpio, ret);

sound/soc/codecs/tlv320aic31xx.c

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ static int aic31xx_dapm_power_event(struct snd_soc_dapm_widget *w, 
		reg = AIC31XX_ADCFLAG;

		break;

	default:

		dev_err(w->codec->dev, "Unknown widget '%s' calling %s/n",

		dev_err(w->codec->dev, "Unknown widget '%s' calling %s\n",

			w->name, __func__);

		return -EINVAL;

	}

sound/soc/codecs/wm8962.c

+12 −3
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ static struct reg_default wm8962_reg[] = { 
	{ 40, 0x0000 },   /* R40    - SPKOUTL volume */

	{ 41, 0x0000 },   /* R41    - SPKOUTR volume */



	{ 49, 0x0010 },   /* R49    - Class D Control 1 */

	{ 51, 0x0003 },   /* R51    - Class D Control 2 */



	{ 56, 0x0506 },   /* R56    - Clocking 4 */
@@ -795,7 +796,6 @@ static bool wm8962_volatile_register(struct device *dev, unsigned int reg) 
	case WM8962_ALC2:

	case WM8962_THERMAL_SHUTDOWN_STATUS:

	case WM8962_ADDITIONAL_CONTROL_4:

	case WM8962_CLASS_D_CONTROL_1:

	case WM8962_DC_SERVO_6:

	case WM8962_INTERRUPT_STATUS_1:

	case WM8962_INTERRUPT_STATUS_2:
@@ -2929,13 +2929,22 @@ static int wm8962_set_fll(struct snd_soc_codec *codec, int fll_id, int source, 
static int wm8962_mute(struct snd_soc_dai *dai, int mute)

{

	struct snd_soc_codec *codec = dai->codec;

	int val;

	int val, ret;



	if (mute)

		val = WM8962_DAC_MUTE;

		val = WM8962_DAC_MUTE | WM8962_DAC_MUTE_ALT;

	else

		val = 0;



	/**

	 * The DAC mute bit is mirrored in two registers, update both to keep

	 * the register cache consistent.

	 */

	ret = snd_soc_update_bits(codec, WM8962_CLASS_D_CONTROL_1,

				  WM8962_DAC_MUTE_ALT, val);

	if (ret < 0)

		return ret;



	return snd_soc_update_bits(codec, WM8962_ADC_DAC_CONTROL_1,

				   WM8962_DAC_MUTE, val);

}

sound/soc/codecs/wm8962.h

+4 −0
Original line number Diff line number Diff line
@@ -1954,6 +1954,10 @@ 
#define WM8962_SPKOUTL_ENA_MASK                 0x0040  /* SPKOUTL_ENA */

#define WM8962_SPKOUTL_ENA_SHIFT                     6  /* SPKOUTL_ENA */

#define WM8962_SPKOUTL_ENA_WIDTH                     1  /* SPKOUTL_ENA */

#define WM8962_DAC_MUTE_ALT                     0x0010  /* DAC_MUTE */

#define WM8962_DAC_MUTE_ALT_MASK                0x0010  /* DAC_MUTE */

#define WM8962_DAC_MUTE_ALT_SHIFT                    4  /* DAC_MUTE */

#define WM8962_DAC_MUTE_ALT_WIDTH                    1  /* DAC_MUTE */

#define WM8962_SPKOUTL_PGA_MUTE                 0x0002  /* SPKOUTL_PGA_MUTE */

#define WM8962_SPKOUTL_PGA_MUTE_MASK            0x0002  /* SPKOUTL_PGA_MUTE */

#define WM8962_SPKOUTL_PGA_MUTE_SHIFT                1  /* SPKOUTL_PGA_MUTE */