Skip to content

L
linux
Commit fb4587da authored by Mark Brown's avatar Mark Brown
Browse files
Options

Merge remote-tracking branches 'asoc/topic/wm8580', 'asoc/topic/wm8753',... 

Merge remote-tracking branches 'asoc/topic/wm8580', 'asoc/topic/wm8753', 'asoc/topic/wm8978', 'asoc/topic/wm9081' and 'asoc/topic/wm9705' into asoc-next
parents dc42c6cb 60bc6173 68b24a20 fbd972d7 e2d57591 d41a5b4a
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 130 deletions
Documentation/devicetree/bindings/sound/wm8580.txt
View file @ fb4587da
WM8580 audio CODEC WM8580 and WM8581 audio CODEC
This device supports I2C only. This device supports I2C only.
Required properties: Required properties:
- compatible : "wlf,wm8580" - compatible : "wlf,wm8580", "wlf,wm8581"
- reg : the I2C address of the device. - reg : the I2C address of the device.
......
sound/soc/codecs/Kconfig
View file @ fb4587da
...@@ -938,7 +938,7 @@ config SND_SOC_WM8523 ...@@ -938,7 +938,7 @@ config SND_SOC_WM8523
depends on I2C depends on I2C
config SND_SOC_WM8580 config SND_SOC_WM8580
tristate "Wolfson Microelectronics WM8523 CODEC" tristate "Wolfson Microelectronics WM8580 and WM8581 CODECs"
depends on I2C depends on I2C
config SND_SOC_WM8711 config SND_SOC_WM8711
...@@ -1072,12 +1072,14 @@ config SND_SOC_WM8998 ...@@ -1072,12 +1072,14 @@ config SND_SOC_WM8998
config SND_SOC_WM9081 config SND_SOC_WM9081
tristate tristate
depends on I2C
config SND_SOC_WM9090 config SND_SOC_WM9090
tristate tristate
config SND_SOC_WM9705 config SND_SOC_WM9705
tristate tristate
select REGMAP_AC97
config SND_SOC_WM9712 config SND_SOC_WM9712
tristate tristate
......
sound/soc/codecs/wm8580.c
View file @ fb4587da
/* /*
* wm8580.c -- WM8580 ALSA Soc Audio driver * wm8580.c -- WM8580 and WM8581 ALSA Soc Audio driver
* *
* Copyright 2008-12 Wolfson Microelectronics PLC. * Copyright 2008-12 Wolfson Microelectronics PLC.
* *
...@@ -12,6 +12,9 @@ ...@@ -12,6 +12,9 @@
* The WM8580 is a multichannel codec with S/PDIF support, featuring six * The WM8580 is a multichannel codec with S/PDIF support, featuring six
* DAC channels and two ADC channels. * DAC channels and two ADC channels.
* *
* The WM8581 is a multichannel codec with S/PDIF support, featuring eight
* DAC channels and two ADC channels.
*
* Currently only the primary audio interface is supported - S/PDIF and * Currently only the primary audio interface is supported - S/PDIF and
* the secondary audio interfaces are not. * the secondary audio interfaces are not.
*/ */
...@@ -65,6 +68,8 @@ ...@@ -65,6 +68,8 @@
#define WM8580_DIGITAL_ATTENUATION_DACR2 0x17 #define WM8580_DIGITAL_ATTENUATION_DACR2 0x17
#define WM8580_DIGITAL_ATTENUATION_DACL3 0x18 #define WM8580_DIGITAL_ATTENUATION_DACL3 0x18
#define WM8580_DIGITAL_ATTENUATION_DACR3 0x19 #define WM8580_DIGITAL_ATTENUATION_DACR3 0x19
#define WM8581_DIGITAL_ATTENUATION_DACL4 0x1A
#define WM8581_DIGITAL_ATTENUATION_DACR4 0x1B
#define WM8580_MASTER_DIGITAL_ATTENUATION 0x1C #define WM8580_MASTER_DIGITAL_ATTENUATION 0x1C
#define WM8580_ADC_CONTROL1 0x1D #define WM8580_ADC_CONTROL1 0x1D
#define WM8580_SPDTXCHAN0 0x1E #define WM8580_SPDTXCHAN0 0x1E
...@@ -236,12 +241,17 @@ static const char *wm8580_supply_names[WM8580_NUM_SUPPLIES] = { ...@@ -236,12 +241,17 @@ static const char *wm8580_supply_names[WM8580_NUM_SUPPLIES] = {
"PVDD", "PVDD",
}; };
struct wm8580_driver_data {
int num_dacs;
};
/* codec private data */ /* codec private data */
struct wm8580_priv { struct wm8580_priv {
struct regmap *regmap; struct regmap *regmap;
struct regulator_bulk_data supplies[WM8580_NUM_SUPPLIES]; struct regulator_bulk_data supplies[WM8580_NUM_SUPPLIES];
struct pll_state a; struct pll_state a;
struct pll_state b; struct pll_state b;
const struct wm8580_driver_data *drvdata;
int sysclk[2]; int sysclk[2];
}; };
...@@ -306,6 +316,19 @@ SOC_DOUBLE("Capture Switch", WM8580_ADC_CONTROL1, 0, 1, 1, 1), ...@@ -306,6 +316,19 @@ SOC_DOUBLE("Capture Switch", WM8580_ADC_CONTROL1, 0, 1, 1, 1),
SOC_SINGLE("Capture High-Pass Filter Switch", WM8580_ADC_CONTROL1, 4, 1, 0), SOC_SINGLE("Capture High-Pass Filter Switch", WM8580_ADC_CONTROL1, 4, 1, 0),
}; };
static const struct snd_kcontrol_new wm8581_snd_controls[] = {
SOC_DOUBLE_R_EXT_TLV("DAC4 Playback Volume",
WM8581_DIGITAL_ATTENUATION_DACL4,
WM8581_DIGITAL_ATTENUATION_DACR4,
0, 0xff, 0, snd_soc_get_volsw, wm8580_out_vu, dac_tlv),
SOC_SINGLE("DAC4 Deemphasis Switch", WM8580_DAC_CONTROL3, 3, 1, 0),
SOC_DOUBLE("DAC4 Invert Switch", WM8580_DAC_CONTROL4, 8, 7, 1, 0),
SOC_SINGLE("DAC4 Switch", WM8580_DAC_CONTROL5, 3, 1, 1),
};
static const struct snd_soc_dapm_widget wm8580_dapm_widgets[] = { static const struct snd_soc_dapm_widget wm8580_dapm_widgets[] = {
SND_SOC_DAPM_DAC("DAC1", "Playback", WM8580_PWRDN1, 2, 1), SND_SOC_DAPM_DAC("DAC1", "Playback", WM8580_PWRDN1, 2, 1),
SND_SOC_DAPM_DAC("DAC2", "Playback", WM8580_PWRDN1, 3, 1), SND_SOC_DAPM_DAC("DAC2", "Playback", WM8580_PWRDN1, 3, 1),
...@@ -324,6 +347,13 @@ SND_SOC_DAPM_INPUT("AINL"), ...@@ -324,6 +347,13 @@ SND_SOC_DAPM_INPUT("AINL"),
SND_SOC_DAPM_INPUT("AINR"), SND_SOC_DAPM_INPUT("AINR"),
}; };
static const struct snd_soc_dapm_widget wm8581_dapm_widgets[] = {
SND_SOC_DAPM_DAC("DAC4", "Playback", WM8580_PWRDN1, 5, 1),
SND_SOC_DAPM_OUTPUT("VOUT4L"),
SND_SOC_DAPM_OUTPUT("VOUT4R"),
};
static const struct snd_soc_dapm_route wm8580_dapm_routes[] = { static const struct snd_soc_dapm_route wm8580_dapm_routes[] = {
{ "VOUT1L", NULL, "DAC1" }, { "VOUT1L", NULL, "DAC1" },
{ "VOUT1R", NULL, "DAC1" }, { "VOUT1R", NULL, "DAC1" },
...@@ -338,6 +368,11 @@ static const struct snd_soc_dapm_route wm8580_dapm_routes[] = { ...@@ -338,6 +368,11 @@ static const struct snd_soc_dapm_route wm8580_dapm_routes[] = {
{ "ADC", NULL, "AINR" }, { "ADC", NULL, "AINR" },
}; };
static const struct snd_soc_dapm_route wm8581_dapm_routes[] = {
{ "VOUT4L", NULL, "DAC4" },
{ "VOUT4R", NULL, "DAC4" },
};
/* PLL divisors */ /* PLL divisors */
struct _pll_div { struct _pll_div {
u32 prescale:1; u32 prescale:1;
...@@ -815,10 +850,21 @@ static int wm8580_set_bias_level(struct snd_soc_codec *codec, ...@@ -815,10 +850,21 @@ static int wm8580_set_bias_level(struct snd_soc_codec *codec,
return 0; return 0;
} }
static int wm8580_playback_startup(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
struct snd_soc_codec *codec = dai->codec;
struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec);
return snd_pcm_hw_constraint_minmax(substream->runtime,
SNDRV_PCM_HW_PARAM_CHANNELS, 1, wm8580->drvdata->num_dacs * 2);
}
#define WM8580_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\ #define WM8580_FORMATS (SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_S20_3LE |\
SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE) SNDRV_PCM_FMTBIT_S24_LE | SNDRV_PCM_FMTBIT_S32_LE)
static const struct snd_soc_dai_ops wm8580_dai_ops_playback = { static const struct snd_soc_dai_ops wm8580_dai_ops_playback = {
.startup = wm8580_playback_startup,
.set_sysclk = wm8580_set_sysclk, .set_sysclk = wm8580_set_sysclk,
.hw_params = wm8580_paif_hw_params, .hw_params = wm8580_paif_hw_params,
.set_fmt = wm8580_set_paif_dai_fmt, .set_fmt = wm8580_set_paif_dai_fmt,
...@@ -842,7 +888,6 @@ static struct snd_soc_dai_driver wm8580_dai[] = { ...@@ -842,7 +888,6 @@ static struct snd_soc_dai_driver wm8580_dai[] = {
.playback = { .playback = {
.stream_name = "Playback", .stream_name = "Playback",
.channels_min = 1, .channels_min = 1,
.channels_max = 6,
.rates = SNDRV_PCM_RATE_8000_192000, .rates = SNDRV_PCM_RATE_8000_192000,
.formats = WM8580_FORMATS, .formats = WM8580_FORMATS,
}, },
...@@ -865,8 +910,22 @@ static struct snd_soc_dai_driver wm8580_dai[] = { ...@@ -865,8 +910,22 @@ static struct snd_soc_dai_driver wm8580_dai[] = {
static int wm8580_probe(struct snd_soc_codec *codec) static int wm8580_probe(struct snd_soc_codec *codec)
{ {
struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec); struct wm8580_priv *wm8580 = snd_soc_codec_get_drvdata(codec);
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec);
int ret = 0; int ret = 0;
switch (wm8580->drvdata->num_dacs) {
case 4:
snd_soc_add_codec_controls(codec, wm8581_snd_controls,
ARRAY_SIZE(wm8581_snd_controls));
snd_soc_dapm_new_controls(dapm, wm8581_dapm_widgets,
ARRAY_SIZE(wm8581_dapm_widgets));
snd_soc_dapm_add_routes(dapm, wm8581_dapm_routes,
ARRAY_SIZE(wm8581_dapm_routes));
break;
default:
break;
}
ret = regulator_bulk_enable(ARRAY_SIZE(wm8580->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(wm8580->supplies),
wm8580->supplies); wm8580->supplies);
if (ret != 0) { if (ret != 0) {
...@@ -914,12 +973,6 @@ static const struct snd_soc_codec_driver soc_codec_dev_wm8580 = { ...@@ -914,12 +973,6 @@ static const struct snd_soc_codec_driver soc_codec_dev_wm8580 = {
}, },
}; };
static const struct of_device_id wm8580_of_match[] = {
{ .compatible = "wlf,wm8580" },
{ },
};
MODULE_DEVICE_TABLE(of, wm8580_of_match);
static const struct regmap_config wm8580_regmap = { static const struct regmap_config wm8580_regmap = {
.reg_bits = 7, .reg_bits = 7,
.val_bits = 9, .val_bits = 9,
...@@ -932,10 +985,25 @@ static const struct regmap_config wm8580_regmap = { ...@@ -932,10 +985,25 @@ static const struct regmap_config wm8580_regmap = {
.volatile_reg = wm8580_volatile, .volatile_reg = wm8580_volatile,
}; };
#if IS_ENABLED(CONFIG_I2C) static const struct wm8580_driver_data wm8580_data = {
.num_dacs = 3,
};
static const struct wm8580_driver_data wm8581_data = {
.num_dacs = 4,
};
static const struct of_device_id wm8580_of_match[] = {
{ .compatible = "wlf,wm8580", .data = &wm8580_data },
{ .compatible = "wlf,wm8581", .data = &wm8581_data },
{ },
};
MODULE_DEVICE_TABLE(of, wm8580_of_match);
static int wm8580_i2c_probe(struct i2c_client *i2c, static int wm8580_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
const struct of_device_id *of_id;
struct wm8580_priv *wm8580; struct wm8580_priv *wm8580;
int ret, i; int ret, i;
...@@ -960,6 +1028,15 @@ static int wm8580_i2c_probe(struct i2c_client *i2c, ...@@ -960,6 +1028,15 @@ static int wm8580_i2c_probe(struct i2c_client *i2c,
i2c_set_clientdata(i2c, wm8580); i2c_set_clientdata(i2c, wm8580);
of_id = of_match_device(wm8580_of_match, &i2c->dev);
if (of_id)
wm8580->drvdata = of_id->data;
if (!wm8580->drvdata) {
dev_err(&i2c->dev, "failed to find driver data\n");
return -EINVAL;
}
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8580, wm8580_dai, ARRAY_SIZE(wm8580_dai)); &soc_codec_dev_wm8580, wm8580_dai, ARRAY_SIZE(wm8580_dai));
...@@ -973,7 +1050,8 @@ static int wm8580_i2c_remove(struct i2c_client *client) ...@@ -973,7 +1050,8 @@ static int wm8580_i2c_remove(struct i2c_client *client)
} }
static const struct i2c_device_id wm8580_i2c_id[] = { static const struct i2c_device_id wm8580_i2c_id[] = {
{ "wm8580", 0 }, { "wm8580", (kernel_ulong_t)&wm8580_data },
{ "wm8581", (kernel_ulong_t)&wm8581_data },
{ } { }
}; };
MODULE_DEVICE_TABLE(i2c, wm8580_i2c_id); MODULE_DEVICE_TABLE(i2c, wm8580_i2c_id);
...@@ -987,31 +1065,10 @@ static struct i2c_driver wm8580_i2c_driver = { ...@@ -987,31 +1065,10 @@ static struct i2c_driver wm8580_i2c_driver = {
.remove = wm8580_i2c_remove, .remove = wm8580_i2c_remove,
.id_table = wm8580_i2c_id, .id_table = wm8580_i2c_id,
}; };
#endif
static int __init wm8580_modinit(void) module_i2c_driver(wm8580_i2c_driver);
{
int ret = 0;
#if IS_ENABLED(CONFIG_I2C)
ret = i2c_add_driver(&wm8580_i2c_driver);
if (ret != 0) {
pr_err("Failed to register WM8580 I2C driver: %d\n", ret);
}
#endif
return ret;
}
module_init(wm8580_modinit);
static void __exit wm8580_exit(void)
{
#if IS_ENABLED(CONFIG_I2C)
i2c_del_driver(&wm8580_i2c_driver);
#endif
}
module_exit(wm8580_exit);
MODULE_DESCRIPTION("ASoC WM8580 driver"); MODULE_DESCRIPTION("ASoC WM8580 driver");
MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>"); MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfsonmicro.com>");
MODULE_AUTHOR("Matt Flax <flatmax@flatmax.org>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
sound/soc/codecs/wm8753.h
View file @ fb4587da
...@@ -112,7 +112,4 @@ ...@@ -112,7 +112,4 @@
#define WM8753_VXCLK_DIV_8 (3 << 6) #define WM8753_VXCLK_DIV_8 (3 << 6)
#define WM8753_VXCLK_DIV_16 (4 << 6) #define WM8753_VXCLK_DIV_16 (4 << 6)
#define WM8753_DAI_HIFI 0
#define WM8753_DAI_VOICE 1
#endif #endif
sound/soc/codecs/wm8978.h
View file @ fb4587da
...@@ -78,8 +78,8 @@ enum wm8978_clk_id { ...@@ -78,8 +78,8 @@ enum wm8978_clk_id {
}; };
enum wm8978_sysclk_src { enum wm8978_sysclk_src {
WM8978_MCLK = 0,
WM8978_PLL, WM8978_PLL,
WM8978_MCLK
}; };
#endif /* __WM8978_H__ */ #endif /* __WM8978_H__ */
sound/soc/codecs/wm9081.c
View file @ fb4587da
...@@ -1304,7 +1304,6 @@ static const struct regmap_config wm9081_regmap = { ...@@ -1304,7 +1304,6 @@ static const struct regmap_config wm9081_regmap = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
#if IS_ENABLED(CONFIG_I2C)
static int wm9081_i2c_probe(struct i2c_client *i2c, static int wm9081_i2c_probe(struct i2c_client *i2c,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
...@@ -1384,7 +1383,6 @@ static struct i2c_driver wm9081_i2c_driver = { ...@@ -1384,7 +1383,6 @@ static struct i2c_driver wm9081_i2c_driver = {
.remove = wm9081_i2c_remove, .remove = wm9081_i2c_remove,
.id_table = wm9081_i2c_id, .id_table = wm9081_i2c_id,
}; };
#endif
module_i2c_driver(wm9081_i2c_driver); module_i2c_driver(wm9081_i2c_driver);
......
sound/soc/codecs/wm9705.c
View file @ fb4587da
...@@ -14,37 +14,58 @@ ...@@ -14,37 +14,58 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/regmap.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/pcm.h> #include <sound/pcm.h>
#include <sound/ac97_codec.h> #include <sound/ac97_codec.h>
#include <sound/initval.h> #include <sound/initval.h>
#include <sound/soc.h> #include <sound/soc.h>
#include "wm9705.h"
#define WM9705_VENDOR_ID 0x574d4c05 #define WM9705_VENDOR_ID 0x574d4c05
#define WM9705_VENDOR_ID_MASK 0xffffffff #define WM9705_VENDOR_ID_MASK 0xffffffff
/* static const struct reg_default wm9705_reg_defaults[] = {
* WM9705 register cache { 0x02, 0x8000 },
*/ { 0x04, 0x8000 },
static const u16 wm9705_reg[] = { { 0x06, 0x8000 },
0x6150, 0x8000, 0x8000, 0x8000, /* 0x0 */ { 0x0a, 0x8000 },
0x0000, 0x8000, 0x8008, 0x8008, /* 0x8 */ { 0x0c, 0x8008 },
0x8808, 0x8808, 0x8808, 0x8808, /* 0x10 */ { 0x0e, 0x8008 },
0x8808, 0x0000, 0x8000, 0x0000, /* 0x18 */ { 0x10, 0x8808 },
0x0000, 0x0000, 0x0000, 0x000f, /* 0x20 */ { 0x12, 0x8808 },
0x0605, 0x0000, 0xbb80, 0x0000, /* 0x28 */ { 0x14, 0x8808 },
0x0000, 0xbb80, 0x0000, 0x0000, /* 0x30 */ { 0x16, 0x8808 },
0x0000, 0x2000, 0x0000, 0x0000, /* 0x38 */ { 0x18, 0x8808 },
0x0000, 0x0000, 0x0000, 0x0000, /* 0x40 */ { 0x1a, 0x0000 },
0x0000, 0x0000, 0x0000, 0x0000, /* 0x48 */ { 0x1c, 0x8000 },
0x0000, 0x0000, 0x0000, 0x0000, /* 0x50 */ { 0x20, 0x0000 },
0x0000, 0x0000, 0x0000, 0x0000, /* 0x58 */ { 0x22, 0x0000 },
0x0000, 0x0000, 0x0000, 0x0000, /* 0x60 */ { 0x26, 0x000f },
0x0000, 0x0000, 0x0000, 0x0000, /* 0x68 */ { 0x28, 0x0605 },
0x0000, 0x0808, 0x0000, 0x0006, /* 0x70 */ { 0x2a, 0x0000 },
0x0000, 0x0000, 0x574d, 0x4c05, /* 0x78 */ { 0x2c, 0xbb80 },
{ 0x32, 0xbb80 },
{ 0x34, 0x2000 },
{ 0x5a, 0x0000 },
{ 0x5c, 0x0000 },
{ 0x72, 0x0808 },
{ 0x74, 0x0000 },
{ 0x76, 0x0006 },
{ 0x78, 0x0000 },
{ 0x7a, 0x0000 },
};
static const struct regmap_config wm9705_regmap_config = {
.reg_bits = 16,
.reg_stride = 2,
.val_bits = 16,
.max_register = 0x7e,
.cache_type = REGCACHE_RBTREE,
.volatile_reg = regmap_ac97_default_volatile,
.reg_defaults = wm9705_reg_defaults,
.num_reg_defaults = ARRAY_SIZE(wm9705_reg_defaults),
}; };
static const struct snd_kcontrol_new wm9705_snd_ac97_controls[] = { static const struct snd_kcontrol_new wm9705_snd_ac97_controls[] = {
...@@ -203,57 +224,20 @@ static const struct snd_soc_dapm_route wm9705_audio_map[] = { ...@@ -203,57 +224,20 @@ static const struct snd_soc_dapm_route wm9705_audio_map[] = {
{"Right ADC", NULL, "ADC PGA"}, {"Right ADC", NULL, "ADC PGA"},
}; };
/* We use a register cache to enhance read performance. */
static unsigned int ac97_read(struct snd_soc_codec *codec, unsigned int reg)
{
struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
u16 *cache = codec->reg_cache;
switch (reg) {
case AC97_RESET:
case AC97_VENDOR_ID1:
case AC97_VENDOR_ID2:
return soc_ac97_ops->read(ac97, reg);
default:
reg = reg >> 1;
if (reg >= (ARRAY_SIZE(wm9705_reg)))
return -EIO;
return cache[reg];
}
}
static int ac97_write(struct snd_soc_codec *codec, unsigned int reg,
unsigned int val)
{
struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
u16 *cache = codec->reg_cache;
soc_ac97_ops->write(ac97, reg, val);
reg = reg >> 1;
if (reg < (ARRAY_SIZE(wm9705_reg)))
cache[reg] = val;
return 0;
}
static int ac97_prepare(struct snd_pcm_substream *substream, static int ac97_prepare(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_codec *codec = dai->codec;
int reg; int reg;
u16 vra;
vra = ac97_read(codec, AC97_EXTENDED_STATUS); snd_soc_update_bits(codec, AC97_EXTENDED_STATUS, 0x1, 0x1);
ac97_write(codec, AC97_EXTENDED_STATUS, vra | 0x1);
if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
reg = AC97_PCM_FRONT_DAC_RATE; reg = AC97_PCM_FRONT_DAC_RATE;
else else
reg = AC97_PCM_LR_ADC_RATE; reg = AC97_PCM_LR_ADC_RATE;
return ac97_write(codec, reg, substream->runtime->rate); return snd_soc_write(codec, reg, substream->runtime->rate);
} }
#define WM9705_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | \ #define WM9705_AC97_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 | \
...@@ -299,9 +283,9 @@ static struct snd_soc_dai_driver wm9705_dai[] = { ...@@ -299,9 +283,9 @@ static struct snd_soc_dai_driver wm9705_dai[] = {
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int wm9705_soc_suspend(struct snd_soc_codec *codec) static int wm9705_soc_suspend(struct snd_soc_codec *codec)
{ {
struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec); regcache_cache_bypass(codec->component.regmap, true);
snd_soc_write(codec, AC97_POWERDOWN, 0xffff);
soc_ac97_ops->write(ac97, AC97_POWERDOWN, 0xffff); regcache_cache_bypass(codec->component.regmap, false);
return 0; return 0;
} }
...@@ -309,17 +293,14 @@ static int wm9705_soc_suspend(struct snd_soc_codec *codec) ...@@ -309,17 +293,14 @@ static int wm9705_soc_suspend(struct snd_soc_codec *codec)
static int wm9705_soc_resume(struct snd_soc_codec *codec) static int wm9705_soc_resume(struct snd_soc_codec *codec)
{ {
struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec); struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
int i, ret; int ret;
u16 *cache = codec->reg_cache;
ret = snd_ac97_reset(ac97, true, WM9705_VENDOR_ID, ret = snd_ac97_reset(ac97, true, WM9705_VENDOR_ID,
WM9705_VENDOR_ID_MASK); WM9705_VENDOR_ID_MASK);
if (ret < 0) if (ret < 0)
return ret; return ret;
for (i = 2; i < ARRAY_SIZE(wm9705_reg) << 1; i += 2) { regcache_sync(codec->component.regmap);
soc_ac97_ops->write(ac97, i, cache[i>>1]);
}
return 0; return 0;
} }
...@@ -331,6 +312,8 @@ static int wm9705_soc_resume(struct snd_soc_codec *codec) ...@@ -331,6 +312,8 @@ static int wm9705_soc_resume(struct snd_soc_codec *codec)
static int wm9705_soc_probe(struct snd_soc_codec *codec) static int wm9705_soc_probe(struct snd_soc_codec *codec)
{ {
struct snd_ac97 *ac97; struct snd_ac97 *ac97;
struct regmap *regmap;
int ret;
ac97 = snd_soc_new_ac97_codec(codec, WM9705_VENDOR_ID, ac97 = snd_soc_new_ac97_codec(codec, WM9705_VENDOR_ID,
WM9705_VENDOR_ID_MASK); WM9705_VENDOR_ID_MASK);
...@@ -339,15 +322,26 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec) ...@@ -339,15 +322,26 @@ static int wm9705_soc_probe(struct snd_soc_codec *codec)
return PTR_ERR(ac97); return PTR_ERR(ac97);
} }
regmap = regmap_init_ac97(ac97, &wm9705_regmap_config);
if (IS_ERR(regmap)) {
ret = PTR_ERR(regmap);
goto err_free_ac97_codec;
}
snd_soc_codec_set_drvdata(codec, ac97); snd_soc_codec_set_drvdata(codec, ac97);
snd_soc_codec_init_regmap(codec, regmap);
return 0; return 0;
err_free_ac97_codec:
snd_soc_free_ac97_codec(ac97);
return ret;
} }
static int wm9705_soc_remove(struct snd_soc_codec *codec) static int wm9705_soc_remove(struct snd_soc_codec *codec)
{ {
struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec); struct snd_ac97 *ac97 = snd_soc_codec_get_drvdata(codec);
snd_soc_codec_exit_regmap(codec);
snd_soc_free_ac97_codec(ac97); snd_soc_free_ac97_codec(ac97);
return 0; return 0;
} }
...@@ -357,12 +351,6 @@ static const struct snd_soc_codec_driver soc_codec_dev_wm9705 = { ...@@ -357,12 +351,6 @@ static const struct snd_soc_codec_driver soc_codec_dev_wm9705 = {
.remove = wm9705_soc_remove, .remove = wm9705_soc_remove,
.suspend = wm9705_soc_suspend, .suspend = wm9705_soc_suspend,
.resume = wm9705_soc_resume, .resume = wm9705_soc_resume,
.read = ac97_read,
.write = ac97_write,
.reg_cache_size = ARRAY_SIZE(wm9705_reg),
.reg_word_size = sizeof(u16),
.reg_cache_step = 2,
.reg_cache_default = wm9705_reg,
.component_driver = { .component_driver = {
.controls = wm9705_snd_ac97_controls, .controls = wm9705_snd_ac97_controls,
......
sound/soc/codecs/wm9705.h deleted 100644 → 0
View file @ dc42c6cb
/*
* wm9705.h -- WM9705 Soc Audio driver
*/
#ifndef _WM9705_H
#define _WM9705_H
#define WM9705_DAI_AC97_HIFI 0
#define WM9705_DAI_AC97_AUX 1
#endif
sound/soc/pxa/e740_wm9705.c
View file @ fb4587da
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include "../codecs/wm9705.h"
#include "pxa2xx-ac97.h" #include "pxa2xx-ac97.h"
......
sound/soc/pxa/e750_wm9705.c
View file @ fb4587da
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <asm/mach-types.h> #include <asm/mach-types.h>
#include "../codecs/wm9705.h"
#include "pxa2xx-ac97.h" #include "pxa2xx-ac97.h"
static int e750_spk_amp_event(struct snd_soc_dapm_widget *w, static int e750_spk_amp_event(struct snd_soc_dapm_widget *w,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7