iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'asoc/topic/wm0010', 'asoc/topic/wm2000', 'asoc/topic/wm5102', 'asoc/topic/wm5110' and 'asoc/topic/wm8350' into asoc-next

Browse Source
This commit is contained in:
Mark Brown 2018-01-18 11:56:31 +00:00
commit c39ea0a441
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 11 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/codecs/wm0010.c
View File

@ -655,11 +655,8 @@ static int wm0010_boot(struct snd_soc_codec *codec)
ret = -ENOMEM; ret = -ENOMEM;
len = pll_rec.length + 8; len = pll_rec.length + 8;
out = kzalloc(len, GFP_KERNEL | GFP_DMA); out = kzalloc(len, GFP_KERNEL | GFP_DMA);
if (!out) { if (!out)
dev_err(codec->dev,
"Failed to allocate RX buffer\n");
goto abort; goto abort;
}
img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA); img_swap = kzalloc(len, GFP_KERNEL | GFP_DMA);
if (!img_swap) if (!img_swap)

6
sound/soc/codecs/wm2000.c
View File

@ -13,7 +13,7 @@
* 'wm2000_anc.bin' by default (overridable via platform data) at * 'wm2000_anc.bin' by default (overridable via platform data) at
* runtime and is expected to be in flat binary format. This is * runtime and is expected to be in flat binary format. This is
* generated by Wolfson configuration tools and includes * generated by Wolfson configuration tools and includes
* system-specific callibration information. If supplied as a * system-specific calibration information. If supplied as a
* sequence of ASCII-encoded hexidecimal bytes this can be converted * sequence of ASCII-encoded hexidecimal bytes this can be converted
* into a flat binary with a command such as this on the command line: * into a flat binary with a command such as this on the command line:
* *
@ -826,8 +826,7 @@ static int wm2000_i2c_probe(struct i2c_client *i2c,
int reg; int reg;
u16 id; u16 id;
wm2000 = devm_kzalloc(&i2c->dev, sizeof(struct wm2000_priv), wm2000 = devm_kzalloc(&i2c->dev, sizeof(*wm2000), GFP_KERNEL);
GFP_KERNEL);
if (!wm2000) if (!wm2000)
return -ENOMEM; return -ENOMEM;
@ -902,7 +901,6 @@ static int wm2000_i2c_probe(struct i2c_client *i2c,
wm2000->anc_download_size, wm2000->anc_download_size,
GFP_KERNEL); GFP_KERNEL);
if (wm2000->anc_download == NULL) { if (wm2000->anc_download == NULL) {
dev_err(&i2c->dev, "Out of memory\n");
ret = -ENOMEM; ret = -ENOMEM;
goto err_supplies; goto err_supplies;
} }

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

@ -1935,8 +1935,11 @@ static int wm5102_codec_probe(struct snd_soc_codec *codec)
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec); struct wm5102_priv *priv = snd_soc_codec_get_drvdata(codec);
struct arizona *arizona = priv->core.arizona;
int ret; int ret;
snd_soc_codec_init_regmap(codec, arizona->regmap);
ret = wm_adsp2_codec_probe(&priv->core.adsp[0], codec); ret = wm_adsp2_codec_probe(&priv->core.adsp[0], codec);
if (ret) if (ret)
return ret; return ret;
@ -1989,17 +1992,9 @@ static unsigned int wm5102_digital_vu[] = {
ARIZONA_DAC_DIGITAL_VOLUME_5R, ARIZONA_DAC_DIGITAL_VOLUME_5R,
}; };
static struct regmap *wm5102_get_regmap(struct device *dev)
{
struct wm5102_priv *priv = dev_get_drvdata(dev);
return priv->core.arizona->regmap;
}
static const struct snd_soc_codec_driver soc_codec_dev_wm5102 = { static const struct snd_soc_codec_driver soc_codec_dev_wm5102 = {
.probe = wm5102_codec_probe, .probe = wm5102_codec_probe,
.remove = wm5102_codec_remove, .remove = wm5102_codec_remove,
.get_regmap = wm5102_get_regmap,
.idle_bias_off = true, .idle_bias_off = true,

12
sound/soc/codecs/wm5110.c
View File

@ -2280,9 +2280,11 @@ static int wm5110_codec_probe(struct snd_soc_codec *codec)
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
struct snd_soc_component *component = snd_soc_dapm_to_component(dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(dapm);
struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec); struct wm5110_priv *priv = snd_soc_codec_get_drvdata(codec);
struct arizona *arizona = priv->core.arizona;
int i, ret; int i, ret;
priv->core.arizona->dapm = dapm; arizona->dapm = dapm;
snd_soc_codec_init_regmap(codec, arizona->regmap);
ret = arizona_init_spk(codec); ret = arizona_init_spk(codec);
if (ret < 0) if (ret < 0)
@ -2344,17 +2346,9 @@ static unsigned int wm5110_digital_vu[] = {
ARIZONA_DAC_DIGITAL_VOLUME_6R, ARIZONA_DAC_DIGITAL_VOLUME_6R,
}; };
static struct regmap *wm5110_get_regmap(struct device *dev)
{
struct wm5110_priv *priv = dev_get_drvdata(dev);
return priv->core.arizona->regmap;
}
static const struct snd_soc_codec_driver soc_codec_dev_wm5110 = { static const struct snd_soc_codec_driver soc_codec_dev_wm5110 = {
.probe = wm5110_codec_probe, .probe = wm5110_codec_probe,
.remove = wm5110_codec_remove, .remove = wm5110_codec_remove,
.get_regmap = wm5110_get_regmap,
.idle_bias_off = true, .idle_bias_off = true,

10
sound/soc/codecs/wm8350.c
View File

@ -1472,6 +1472,8 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec)
GFP_KERNEL); GFP_KERNEL);
if (priv == NULL) if (priv == NULL)
return -ENOMEM; return -ENOMEM;
snd_soc_codec_init_regmap(codec, wm8350->regmap);
snd_soc_codec_set_drvdata(codec, priv); snd_soc_codec_set_drvdata(codec, priv);
priv->wm8350 = wm8350; priv->wm8350 = wm8350;
@ -1580,17 +1582,9 @@ static int wm8350_codec_remove(struct snd_soc_codec *codec)
return 0; return 0;
} }
static struct regmap *wm8350_get_regmap(struct device *dev)
{
struct wm8350 *wm8350 = dev_get_platdata(dev);
return wm8350->regmap;
}
static const struct snd_soc_codec_driver soc_codec_dev_wm8350 = { static const struct snd_soc_codec_driver soc_codec_dev_wm8350 = {
.probe = wm8350_codec_probe, .probe = wm8350_codec_probe,
.remove = wm8350_codec_remove, .remove = wm8350_codec_remove,
.get_regmap = wm8350_get_regmap,
.set_bias_level = wm8350_set_bias_level, .set_bias_level = wm8350_set_bias_level,
.suspend_bias_off = true, .suspend_bias_off = true,