mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-16 01:04:08 +08:00
Merge remote-tracking branches 'asoc/topic/wm8400', 'asoc/topic/wm8903', 'asoc/topic/wm8994', 'asoc/topic/wm8997' and 'asoc/topic/wm8998' into asoc-next
This commit is contained in:
commit
8f05b9c65d
@ -1285,6 +1285,7 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec)
|
||||
if (priv == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
snd_soc_codec_init_regmap(codec, wm8400->regmap);
|
||||
snd_soc_codec_set_drvdata(codec, priv);
|
||||
priv->wm8400 = wm8400;
|
||||
|
||||
@ -1325,17 +1326,9 @@ static int wm8400_codec_remove(struct snd_soc_codec *codec)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct regmap *wm8400_get_regmap(struct device *dev)
|
||||
{
|
||||
struct wm8400 *wm8400 = dev_get_platdata(dev);
|
||||
|
||||
return wm8400->regmap;
|
||||
}
|
||||
|
||||
static const struct snd_soc_codec_driver soc_codec_dev_wm8400 = {
|
||||
.probe = wm8400_codec_probe,
|
||||
.remove = wm8400_codec_remove,
|
||||
.get_regmap = wm8400_get_regmap,
|
||||
.set_bias_level = wm8400_set_bias_level,
|
||||
.suspend_bias_off = true,
|
||||
|
||||
|
@ -1995,8 +1995,7 @@ static int wm8903_i2c_probe(struct i2c_client *i2c,
|
||||
unsigned int val, irq_pol;
|
||||
int ret, i;
|
||||
|
||||
wm8903 = devm_kzalloc(&i2c->dev, sizeof(struct wm8903_priv),
|
||||
GFP_KERNEL);
|
||||
wm8903 = devm_kzalloc(&i2c->dev, sizeof(*wm8903), GFP_KERNEL);
|
||||
if (wm8903 == NULL)
|
||||
return -ENOMEM;
|
||||
|
||||
@ -2017,13 +2016,10 @@ static int wm8903_i2c_probe(struct i2c_client *i2c,
|
||||
if (pdata) {
|
||||
wm8903->pdata = pdata;
|
||||
} else {
|
||||
wm8903->pdata = devm_kzalloc(&i2c->dev,
|
||||
sizeof(struct wm8903_platform_data),
|
||||
GFP_KERNEL);
|
||||
if (wm8903->pdata == NULL) {
|
||||
dev_err(&i2c->dev, "Failed to allocate pdata\n");
|
||||
wm8903->pdata = devm_kzalloc(&i2c->dev, sizeof(*wm8903->pdata),
|
||||
GFP_KERNEL);
|
||||
if (!wm8903->pdata)
|
||||
return -ENOMEM;
|
||||
}
|
||||
|
||||
if (i2c->irq) {
|
||||
ret = wm8903_set_pdata_irq_trigger(i2c, wm8903->pdata);
|
||||
|
@ -3993,6 +3993,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
|
||||
unsigned int reg;
|
||||
int ret, i;
|
||||
|
||||
snd_soc_codec_init_regmap(codec, control->regmap);
|
||||
|
||||
wm8994->hubs.codec = codec;
|
||||
|
||||
mutex_init(&wm8994->accdet_lock);
|
||||
@ -4434,19 +4436,11 @@ static int wm8994_codec_remove(struct snd_soc_codec *codec)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct regmap *wm8994_get_regmap(struct device *dev)
|
||||
{
|
||||
struct wm8994 *control = dev_get_drvdata(dev->parent);
|
||||
|
||||
return control->regmap;
|
||||
}
|
||||
|
||||
static const struct snd_soc_codec_driver soc_codec_dev_wm8994 = {
|
||||
.probe = wm8994_codec_probe,
|
||||
.remove = wm8994_codec_remove,
|
||||
.suspend = wm8994_codec_suspend,
|
||||
.resume = wm8994_codec_resume,
|
||||
.get_regmap = wm8994_get_regmap,
|
||||
.set_bias_level = wm8994_set_bias_level,
|
||||
};
|
||||
|
||||
|
@ -1062,8 +1062,11 @@ static int wm8997_codec_probe(struct snd_soc_codec *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 wm8997_priv *priv = snd_soc_codec_get_drvdata(codec);
|
||||
struct arizona *arizona = priv->core.arizona;
|
||||
int ret;
|
||||
|
||||
snd_soc_codec_init_regmap(codec, arizona->regmap);
|
||||
|
||||
ret = arizona_init_spk(codec);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
@ -1095,17 +1098,9 @@ static unsigned int wm8997_digital_vu[] = {
|
||||
ARIZONA_DAC_DIGITAL_VOLUME_5R,
|
||||
};
|
||||
|
||||
static struct regmap *wm8997_get_regmap(struct device *dev)
|
||||
{
|
||||
struct wm8997_priv *priv = dev_get_drvdata(dev);
|
||||
|
||||
return priv->core.arizona->regmap;
|
||||
}
|
||||
|
||||
static const struct snd_soc_codec_driver soc_codec_dev_wm8997 = {
|
||||
.probe = wm8997_codec_probe,
|
||||
.remove = wm8997_codec_remove,
|
||||
.get_regmap = wm8997_get_regmap,
|
||||
|
||||
.idle_bias_off = true,
|
||||
|
||||
|
@ -1275,9 +1275,11 @@ static int wm8998_codec_probe(struct snd_soc_codec *codec)
|
||||
struct wm8998_priv *priv = snd_soc_codec_get_drvdata(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 arizona *arizona = priv->core.arizona;
|
||||
int ret;
|
||||
|
||||
priv->core.arizona->dapm = dapm;
|
||||
arizona->dapm = dapm;
|
||||
snd_soc_codec_init_regmap(codec, arizona->regmap);
|
||||
|
||||
ret = arizona_init_spk(codec);
|
||||
if (ret < 0)
|
||||
@ -1313,17 +1315,9 @@ static unsigned int wm8998_digital_vu[] = {
|
||||
ARIZONA_DAC_DIGITAL_VOLUME_5R,
|
||||
};
|
||||
|
||||
static struct regmap *wm8998_get_regmap(struct device *dev)
|
||||
{
|
||||
struct wm8998_priv *priv = dev_get_drvdata(dev);
|
||||
|
||||
return priv->core.arizona->regmap;
|
||||
}
|
||||
|
||||
static const struct snd_soc_codec_driver soc_codec_dev_wm8998 = {
|
||||
.probe = wm8998_codec_probe,
|
||||
.remove = wm8998_codec_remove,
|
||||
.get_regmap = wm8998_get_regmap,
|
||||
|
||||
.idle_bias_off = true,
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user