Merge branch 'for-3.2' into for-3.3
This commit is contained in:
commit
34c3a64a45
2 changed files with 17 additions and 17 deletions
|
@ -601,7 +601,6 @@ static int cs4270_soc_suspend(struct snd_soc_codec *codec, pm_message_t mesg)
|
|||
static int cs4270_soc_resume(struct snd_soc_codec *codec)
|
||||
{
|
||||
struct cs4270_private *cs4270 = snd_soc_codec_get_drvdata(codec);
|
||||
struct i2c_client *i2c_client = to_i2c_client(codec->dev);
|
||||
int reg;
|
||||
|
||||
regulator_bulk_enable(ARRAY_SIZE(cs4270->supplies),
|
||||
|
@ -612,14 +611,7 @@ static int cs4270_soc_resume(struct snd_soc_codec *codec)
|
|||
ndelay(500);
|
||||
|
||||
/* first restore the entire register cache ... */
|
||||
for (reg = CS4270_FIRSTREG; reg <= CS4270_LASTREG; reg++) {
|
||||
u8 val = snd_soc_read(codec, reg);
|
||||
|
||||
if (i2c_smbus_write_byte_data(i2c_client, reg, val)) {
|
||||
dev_err(codec->dev, "i2c write failed\n");
|
||||
return -EIO;
|
||||
}
|
||||
}
|
||||
snd_soc_cache_sync(codec);
|
||||
|
||||
/* ... then disable the power-down bits */
|
||||
reg = snd_soc_read(codec, CS4270_PWRCTL);
|
||||
|
|
|
@ -392,7 +392,8 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
|
|||
}
|
||||
|
||||
if (strcasecmp(sprop, "i2s-slave") == 0) {
|
||||
machine_data->dai_format = SND_SOC_DAIFMT_I2S;
|
||||
machine_data->dai_format =
|
||||
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBM_CFM;
|
||||
machine_data->codec_clk_direction = SND_SOC_CLOCK_OUT;
|
||||
machine_data->cpu_clk_direction = SND_SOC_CLOCK_IN;
|
||||
|
||||
|
@ -409,31 +410,38 @@ static int mpc8610_hpcd_probe(struct platform_device *pdev)
|
|||
}
|
||||
machine_data->clk_frequency = be32_to_cpup(iprop);
|
||||
} else if (strcasecmp(sprop, "i2s-master") == 0) {
|
||||
machine_data->dai_format = SND_SOC_DAIFMT_I2S;
|
||||
machine_data->dai_format =
|
||||
SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS;
|
||||
machine_data->codec_clk_direction = SND_SOC_CLOCK_IN;
|
||||
machine_data->cpu_clk_direction = SND_SOC_CLOCK_OUT;
|
||||
} else if (strcasecmp(sprop, "lj-slave") == 0) {
|
||||
machine_data->dai_format = SND_SOC_DAIFMT_LEFT_J;
|
||||
machine_data->dai_format =
|
||||
SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBM_CFM;
|
||||
machine_data->codec_clk_direction = SND_SOC_CLOCK_OUT;
|
||||
machine_data->cpu_clk_direction = SND_SOC_CLOCK_IN;
|
||||
} else if (strcasecmp(sprop, "lj-master") == 0) {
|
||||
machine_data->dai_format = SND_SOC_DAIFMT_LEFT_J;
|
||||
machine_data->dai_format =
|
||||
SND_SOC_DAIFMT_LEFT_J | SND_SOC_DAIFMT_CBS_CFS;
|
||||
machine_data->codec_clk_direction = SND_SOC_CLOCK_IN;
|
||||
machine_data->cpu_clk_direction = SND_SOC_CLOCK_OUT;
|
||||
} else if (strcasecmp(sprop, "rj-slave") == 0) {
|
||||
machine_data->dai_format = SND_SOC_DAIFMT_RIGHT_J;
|
||||
machine_data->dai_format =
|
||||
SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_CBM_CFM;
|
||||
machine_data->codec_clk_direction = SND_SOC_CLOCK_OUT;
|
||||
machine_data->cpu_clk_direction = SND_SOC_CLOCK_IN;
|
||||
} else if (strcasecmp(sprop, "rj-master") == 0) {
|
||||
machine_data->dai_format = SND_SOC_DAIFMT_RIGHT_J;
|
||||
machine_data->dai_format =
|
||||
SND_SOC_DAIFMT_RIGHT_J | SND_SOC_DAIFMT_CBS_CFS;
|
||||
machine_data->codec_clk_direction = SND_SOC_CLOCK_IN;
|
||||
machine_data->cpu_clk_direction = SND_SOC_CLOCK_OUT;
|
||||
} else if (strcasecmp(sprop, "ac97-slave") == 0) {
|
||||
machine_data->dai_format = SND_SOC_DAIFMT_AC97;
|
||||
machine_data->dai_format =
|
||||
SND_SOC_DAIFMT_AC97 | SND_SOC_DAIFMT_CBM_CFM;
|
||||
machine_data->codec_clk_direction = SND_SOC_CLOCK_OUT;
|
||||
machine_data->cpu_clk_direction = SND_SOC_CLOCK_IN;
|
||||
} else if (strcasecmp(sprop, "ac97-master") == 0) {
|
||||
machine_data->dai_format = SND_SOC_DAIFMT_AC97;
|
||||
machine_data->dai_format =
|
||||
SND_SOC_DAIFMT_AC97 | SND_SOC_DAIFMT_CBS_CFS;
|
||||
machine_data->codec_clk_direction = SND_SOC_CLOCK_IN;
|
||||
machine_data->cpu_clk_direction = SND_SOC_CLOCK_OUT;
|
||||
} else {
|
||||
|
|
Reference in a new issue