xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'for-2.6.37' into for-2.6.38

Browse Source
This commit is contained in:
Mark Brown
2010-11-19 11:45:05 +00:00
parent 7b306dae22 2811fe2beb
commit 04af964f9c
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sound/soc/codecs/max98088.c
View File

@@ -28,6 +28,11 @@
#include <sound/max98088.h> #include <sound/max98088.h>
#include "max98088.h" #include "max98088.h"
enum max98088_type {
MAX98088,
MAX98089,
};
struct max98088_cdata { struct max98088_cdata {
unsigned int rate; unsigned int rate;
unsigned int fmt; unsigned int fmt;
@@ -36,6 +41,7 @@ struct max98088_cdata {
struct max98088_priv { struct max98088_priv {
u8 reg_cache[M98088_REG_CNT]; u8 reg_cache[M98088_REG_CNT];
enum max98088_type devtype;
void *control_data; void *control_data;
struct max98088_pdata *pdata; struct max98088_pdata *pdata;
unsigned int sysclk; unsigned int sysclk;
@@ -2042,6 +2048,8 @@ static int max98088_i2c_probe(struct i2c_client *i2c,
if (max98088 == NULL) if (max98088 == NULL)
return -ENOMEM; return -ENOMEM;
max98088->devtype = id->driver_data;
i2c_set_clientdata(i2c, max98088); i2c_set_clientdata(i2c, max98088);
max98088->control_data = i2c; max98088->control_data = i2c;
max98088->pdata = i2c->dev.platform_data; 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[] = { static const struct i2c_device_id max98088_i2c_id[] = {
{ "max98088", 0 }, { "max98088", MAX98088 },
{ "max98089", MAX98089 },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, max98088_i2c_id); MODULE_DEVICE_TABLE(i2c, max98088_i2c_id);

1
sound/soc/codecs/uda134x.c
View File

@@ -597,6 +597,7 @@ static struct snd_soc_codec_driver soc_codec_dev_uda134x = {
.resume = uda134x_soc_resume, .resume = uda134x_soc_resume,
.reg_cache_size = sizeof(uda134x_reg), .reg_cache_size = sizeof(uda134x_reg),
.reg_word_size = sizeof(u8), .reg_word_size = sizeof(u8),
.reg_cache_default = uda134x_reg,
.reg_cache_step = 1, .reg_cache_step = 1,
.read = uda134x_read_reg_cache, .read = uda134x_read_reg_cache,
.write = uda134x_write, .write = uda134x_write,