Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1dfcab55 authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'asoc-fix-v4.0-rc2' into asoc-linus 

ASoC: Fixes for v4.0

A few driver specific fixes here, none of them earth shattering in
themselves, that have accumliated since the opening of the merge window.

# gpg: Signature made Thu 05 Mar 2015 01:02:37 GMT using RSA key ID 5D5487D0
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg:                 aka "Mark Brown <broonie@debian.org>"
# gpg:                 aka "Mark Brown <broonie@kernel.org>"
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg:                 aka "Mark Brown <broonie@linaro.org>"
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
parents 13a7a6ac 3b8f4a70

sound/soc/atmel/sam9g20_wm8731.c

+31 −37
Original line number Diff line number Diff line
@@ -46,8 +46,6 @@ 
#include <sound/pcm_params.h>

#include <sound/soc.h>



#include <asm/mach-types.h>



#include "../codecs/wm8731.h"

#include "atmel-pcm.h"

#include "atmel_ssc_dai.h"
@@ -171,8 +169,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) 
	int ret;



	if (!np) {

		if (!(machine_is_at91sam9g20ek() ||

			machine_is_at91sam9g20ek_2mmc()))

		return -ENODEV;

	}
@@ -210,7 +206,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) 
	card->dev = &pdev->dev;



	/* Parse device node info */

	if (np) {

	ret = snd_soc_of_parse_card_name(card, "atmel,model");

	if (ret)

		goto err;
@@ -242,7 +237,6 @@ static int at91sam9g20ek_audio_probe(struct platform_device *pdev) 


	of_node_put(codec_np);

	of_node_put(cpu_np);

	}



	ret = snd_soc_register_card(card);

	if (ret) {

sound/soc/cirrus/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ config SND_EP93XX_SOC_AC97 


config SND_EP93XX_SOC_SNAPPERCL15

        tristate "SoC Audio support for Bluewater Systems Snapper CL15 module"

        depends on SND_EP93XX_SOC && MACH_SNAPPER_CL15

        depends on SND_EP93XX_SOC && MACH_SNAPPER_CL15 && I2C

        select SND_EP93XX_SOC_I2S

        select SND_SOC_TLV320AIC23_I2C

        help

sound/soc/codecs/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ config SND_SOC_ALL_CODECS 
	select SND_SOC_MAX98088 if I2C

	select SND_SOC_MAX98090 if I2C

	select SND_SOC_MAX98095 if I2C

	select SND_SOC_MAX98357A

	select SND_SOC_MAX98357A if GPIOLIB

	select SND_SOC_MAX9850 if I2C

	select SND_SOC_MAX9768 if I2C

	select SND_SOC_MAX9877 if I2C

sound/soc/codecs/max98357a.c

+11 −1
Original line number Diff line number Diff line
@@ -12,9 +12,19 @@ 
 * max98357a.c -- MAX98357A ALSA SoC Codec driver

 */



#include <linux/module.h>

#include <linux/device.h>

#include <linux/err.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/kernel.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/of.h>

#include <linux/platform_device.h>

#include <sound/pcm.h>

#include <sound/soc.h>

#include <sound/soc-dai.h>

#include <sound/soc-dapm.h>



#define DRV_NAME "max98357a"

sound/soc/codecs/rt5670.c

+6 −1
Original line number Diff line number Diff line
@@ -225,7 +225,6 @@ static bool rt5670_volatile_register(struct device *dev, unsigned int reg) 
	case RT5670_ADC_EQ_CTRL1:

	case RT5670_EQ_CTRL1:

	case RT5670_ALC_CTRL_1:

	case RT5670_IRQ_CTRL1:

	case RT5670_IRQ_CTRL2:

	case RT5670_INT_IRQ_ST:

	case RT5670_IL_CMD:
@@ -2703,6 +2702,12 @@ static int rt5670_i2c_probe(struct i2c_client *i2c, 


	regmap_write(rt5670->regmap, RT5670_RESET, 0);



	regmap_read(rt5670->regmap, RT5670_VENDOR_ID, &val);

	if (val >= 4)

		regmap_write(rt5670->regmap, RT5670_GPIO_CTRL3, 0x0980);

	else

		regmap_write(rt5670->regmap, RT5670_GPIO_CTRL3, 0x0d00);



	ret = regmap_register_patch(rt5670->regmap, init_list,

				    ARRAY_SIZE(init_list));

	if (ret != 0)