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

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

Merge remote-tracking branches 'asoc/fix/rt5640', 'asoc/fix/samsung',... 

Merge remote-tracking branches 'asoc/fix/rt5640', 'asoc/fix/samsung', 'asoc/fix/tlv320aic23' and 'asoc/fix/warn' into asoc-linus
parents bfef92bb 03a620d8 71e5222c 3534b842 f78b1e0a

sound/soc/codecs/alc5623.c

+1 −2
Original line number Diff line number Diff line
@@ -902,7 +902,6 @@ static int alc5623_probe(struct snd_soc_codec *codec) 
{

	struct alc5623_priv *alc5623 = snd_soc_codec_get_drvdata(codec);

	struct snd_soc_dapm_context *dapm = &codec->dapm;

	int ret;



	alc5623_reset(codec);
@@ -961,7 +960,7 @@ static int alc5623_probe(struct snd_soc_codec *codec) 
		return -EINVAL;

	}



	return ret;

	return 0;

}



/* power down chip */

sound/soc/codecs/rt5640.c

+9 −0
Original line number Diff line number Diff line
@@ -2074,6 +2074,14 @@ static const struct i2c_device_id rt5640_i2c_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, rt5640_i2c_id);



#if defined(CONFIG_OF)

static const struct of_device_id rt5640_of_match[] = {

	{ .compatible = "realtek,rt5640", },

	{},

};

MODULE_DEVICE_TABLE(of, rt5640_of_match);

#endif



#ifdef CONFIG_ACPI

static struct acpi_device_id rt5640_acpi_match[] = {

	{ "INT33CA", 0 },
@@ -2203,6 +2211,7 @@ static struct i2c_driver rt5640_i2c_driver = { 
		.name = "rt5640",

		.owner = THIS_MODULE,

		.acpi_match_table = ACPI_PTR(rt5640_acpi_match),

		.of_match_table = of_match_ptr(rt5640_of_match),

	},

	.probe = rt5640_i2c_probe,

	.remove   = rt5640_i2c_remove,

sound/soc/codecs/tlv320aic23-i2c.c

+7 −0
Original line number Diff line number Diff line
@@ -43,9 +43,16 @@ static const struct i2c_device_id tlv320aic23_id[] = { 


MODULE_DEVICE_TABLE(i2c, tlv320aic23_id);



static const struct of_device_id tlv320aic23_of_match[] = {

	{ .compatible = "ti,tlv320aic23", },

	{ }

};

MODULE_DEVICE_TABLE(of, tlv320aic23_of_match);



static struct i2c_driver tlv320aic23_i2c_driver = {

	.driver = {

		   .name = "tlv320aic23-codec",

		   .of_match_table = of_match_ptr(tlv320aic23_of_match),

		   },

	.probe = tlv320aic23_i2c_probe,

	.remove = __exit_p(tlv320aic23_i2c_remove),

sound/soc/samsung/ac97.c

+3 −3
Original line number Diff line number Diff line
@@ -39,15 +39,15 @@ struct s3c_ac97_info { 
};

static struct s3c_ac97_info s3c_ac97;



static struct s3c2410_dma_client s3c_dma_client_out = {

static struct s3c_dma_client s3c_dma_client_out = {

	.name = "AC97 PCMOut"

};



static struct s3c2410_dma_client s3c_dma_client_in = {

static struct s3c_dma_client s3c_dma_client_in = {

	.name = "AC97 PCMIn"

};



static struct s3c2410_dma_client s3c_dma_client_micin = {

static struct s3c_dma_client s3c_dma_client_micin = {

	.name = "AC97 MicIn"

};

sound/soc/samsung/dma.h

+5 −1
Original line number Diff line number Diff line
@@ -14,8 +14,12 @@ 


#include <sound/dmaengine_pcm.h>



struct s3c_dma_client {

	char *name;

};



struct s3c_dma_params {

	struct s3c2410_dma_client *client;	/* stream identifier */

	struct s3c_dma_client *client;	/* stream identifier */

	int channel;				/* Channel ID */

	dma_addr_t dma_addr;

	int dma_size;			/* Size of the DMA transfer */