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

Commit 04af964f authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-2.6.37' into for-2.6.38

parents 7b306dae 2811fe2b

sound/soc/codecs/max98088.c

+10 −1
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ 
#include <sound/max98088.h>

#include "max98088.h"



enum max98088_type {

       MAX98088,

       MAX98089,

};



struct max98088_cdata {

       unsigned int rate;

       unsigned int fmt;
@@ -36,6 +41,7 @@ struct max98088_cdata { 


struct max98088_priv {

       u8 reg_cache[M98088_REG_CNT];

       enum max98088_type devtype;

       void *control_data;

       struct max98088_pdata *pdata;

       unsigned int sysclk;
@@ -2042,6 +2048,8 @@ static int max98088_i2c_probe(struct i2c_client *i2c, 
       if (max98088 == NULL)

               return -ENOMEM;



       max98088->devtype = id->driver_data;



       i2c_set_clientdata(i2c, max98088);

       max98088->control_data = i2c;

       max98088->pdata = i2c->dev.platform_data;
@@ -2061,7 +2069,8 @@ static int __devexit max98088_i2c_remove(struct i2c_client *client) 
}



static const struct i2c_device_id max98088_i2c_id[] = {

       { "max98088", 0 },

       { "max98088", MAX98088 },

       { "max98089", MAX98089 },

       { }

};

MODULE_DEVICE_TABLE(i2c, max98088_i2c_id);

sound/soc/codecs/uda134x.c

+1 −0
Original line number Diff line number Diff line
@@ -597,6 +597,7 @@ static struct snd_soc_codec_driver soc_codec_dev_uda134x = { 
	.resume =       uda134x_soc_resume,

	.reg_cache_size = sizeof(uda134x_reg),

	.reg_word_size = sizeof(u8),

	.reg_cache_default = uda134x_reg,

	.reg_cache_step = 1,

	.read = uda134x_read_reg_cache,

	.write = uda134x_write,