Diff
Modified: trunk/sound/soc/blackfin/bf5xx-adau1361.c (8466 => 8467)
--- trunk/sound/soc/blackfin/bf5xx-adau1361.c 2010-03-16 07:39:17 UTC (rev 8466)
+++ trunk/sound/soc/blackfin/bf5xx-adau1361.c 2010-03-16 08:52:28 UTC (rev 8467)
@@ -77,7 +77,7 @@
return ret;
/* codec PLL input is PCLK/4 */
- ret = codec_dai->ops->set_pll(codec_dai, 0, pll_in, pll_out);
+ ret = codec_dai->ops->set_pll(codec_dai, 0, 0, pll_in, pll_out);
if (ret < 0)
return ret;
Modified: trunk/sound/soc/blackfin/bf5xx-adau1381.c (8466 => 8467)
--- trunk/sound/soc/blackfin/bf5xx-adau1381.c 2010-03-16 07:39:17 UTC (rev 8466)
+++ trunk/sound/soc/blackfin/bf5xx-adau1381.c 2010-03-16 08:52:28 UTC (rev 8467)
@@ -77,7 +77,7 @@
return ret;
/* codec PLL input is PCLK/4 */
- ret = codec_dai->ops->set_pll(codec_dai, 0, pll_in, pll_out);
+ ret = codec_dai->ops->set_pll(codec_dai, 0, 0, pll_in, pll_out);
if (ret < 0)
return ret;
Modified: trunk/sound/soc/blackfin/bf5xx-adau1761.c (8466 => 8467)
--- trunk/sound/soc/blackfin/bf5xx-adau1761.c 2010-03-16 07:39:17 UTC (rev 8466)
+++ trunk/sound/soc/blackfin/bf5xx-adau1761.c 2010-03-16 08:52:28 UTC (rev 8467)
@@ -77,7 +77,7 @@
return ret;
/* codec PLL input is PCLK/4 */
- ret = codec_dai->ops->set_pll(codec_dai, 0, pll_in, pll_out);
+ ret = codec_dai->ops->set_pll(codec_dai, 0, 0, pll_in, pll_out);
if (ret < 0)
return ret;
Modified: trunk/sound/soc/codecs/adau1361.c (8466 => 8467)
--- trunk/sound/soc/codecs/adau1361.c 2010-03-16 07:39:17 UTC (rev 8466)
+++ trunk/sound/soc/codecs/adau1361.c 2010-03-16 08:52:28 UTC (rev 8467)
@@ -393,7 +393,6 @@
snd_soc_dapm_add_routes(codec, audio_conns, ARRAY_SIZE(audio_conns));
- snd_soc_dapm_new_widgets(codec);
return 0;
}
@@ -657,7 +656,7 @@
}
static int adau1361_set_dai_pll(struct snd_soc_dai *codec_dai,
- int pll_id, unsigned int freq_in, unsigned int freq_out)
+ int pll_id, int source, unsigned int freq_in, unsigned int freq_out)
{
struct snd_soc_codec *codec = codec_dai->codec;
struct adau1361_priv *adau1361 = codec->private_data;
@@ -890,17 +889,6 @@
snd_soc_add_controls(codec, adau1361_snd_controls,
ARRAY_SIZE(adau1361_snd_controls));
adau1361_add_widgets(codec);
- ret = snd_soc_init_card(socdev);
- if (ret < 0) {
- dev_err(codec->dev, "failed to register card: %d\n", ret);
- goto card_err;
- }
-
- return ret;
-
-card_err:
- snd_soc_free_pcms(socdev);
- snd_soc_dapm_free(socdev);
pcm_err:
return ret;
}
Modified: trunk/sound/soc/codecs/adau1371.c (8466 => 8467)
--- trunk/sound/soc/codecs/adau1371.c 2010-03-16 07:39:17 UTC (rev 8466)
+++ trunk/sound/soc/codecs/adau1371.c 2010-03-16 08:52:28 UTC (rev 8467)
@@ -501,7 +501,6 @@
snd_soc_dapm_add_routes(codec, audio_conn, ARRAY_SIZE(audio_conn));
- snd_soc_dapm_new_widgets(codec);
return 0;
}
@@ -974,17 +973,6 @@
snd_soc_add_controls(codec, adau1371_snd_controls,
ARRAY_SIZE(adau1371_snd_controls));
adau1371_add_widgets(codec);
- ret = snd_soc_init_card(socdev);
- if (ret < 0) {
- dev_err(codec->dev, "failed to register card: %d\n", ret);
- goto card_err;
- }
-
- return ret;
-
-card_err:
- snd_soc_free_pcms(socdev);
- snd_soc_dapm_free(socdev);
pcm_err:
return ret;
Modified: trunk/sound/soc/codecs/adau1381.c (8466 => 8467)
--- trunk/sound/soc/codecs/adau1381.c 2010-03-16 07:39:17 UTC (rev 8466)
+++ trunk/sound/soc/codecs/adau1381.c 2010-03-16 08:52:28 UTC (rev 8467)
@@ -225,8 +225,6 @@
ARRAY_SIZE(adau1381_dapm_widgets));
snd_soc_dapm_add_routes(codec, audio_conns, ARRAY_SIZE(audio_conns));
-
- snd_soc_dapm_new_widgets(codec);
return 0;
}
@@ -497,7 +495,7 @@
* Clock after PLL and dividers
*/
static int adau1381_set_dai_sysclk(struct snd_soc_dai *codec_dai,
- int clk_id, unsigned int freq, int dir)
+ int clk_id, int source, unsigned int freq, int dir)
{
struct snd_soc_codec *codec = codec_dai->codec;
struct adau1381_priv *adau1381 = codec->private_data;
@@ -742,17 +740,6 @@
snd_soc_add_controls(codec, adau1381_snd_controls,
ARRAY_SIZE(adau1381_snd_controls));
adau1381_add_widgets(codec);
- ret = snd_soc_init_card(socdev);
- if (ret < 0) {
- dev_err(codec->dev, "failed to register card: %d\n", ret);
- goto card_err;
- }
-
- return ret;
-
-card_err:
- snd_soc_free_pcms(socdev);
- snd_soc_dapm_free(socdev);
pcm_err:
return ret;
}
Modified: trunk/sound/soc/codecs/adau1761.c (8466 => 8467)
--- trunk/sound/soc/codecs/adau1761.c 2010-03-16 07:39:17 UTC (rev 8466)
+++ trunk/sound/soc/codecs/adau1761.c 2010-03-16 08:52:28 UTC (rev 8467)
@@ -397,8 +397,6 @@
ARRAY_SIZE(adau1761_dapm_widgets));
snd_soc_dapm_add_routes(codec, audio_conns, ARRAY_SIZE(audio_conns));
-
- snd_soc_dapm_new_widgets(codec);
return 0;
}
@@ -690,7 +688,7 @@
}
static int adau1761_set_dai_pll(struct snd_soc_dai *codec_dai,
- int pll_id, unsigned int freq_in, unsigned int freq_out)
+ int pll_id, int source, unsigned int freq_in, unsigned int freq_out)
{
struct snd_soc_codec *codec = codec_dai->codec;
struct adau1761_priv *adau1761 = codec->private_data;
@@ -947,17 +945,6 @@
snd_soc_add_controls(codec, adau1761_snd_controls,
ARRAY_SIZE(adau1761_snd_controls));
adau1761_add_widgets(codec);
- ret = snd_soc_init_card(socdev);
- if (ret < 0) {
- dev_err(codec->dev, "failed to register card: %d\n", ret);
- goto card_err;
- }
-
- return ret;
-
-card_err:
- snd_soc_free_pcms(socdev);
- snd_soc_dapm_free(socdev);
pcm_err:
device_remove_file(codec->dev, &dev_attr_dsp);
return ret;
