Skip to content

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

ASoC: Convert wm8993 to direct regmap API usage 

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 391d9e4e
Show whitespace changes
Inline Side-by-side
Showing with 271 additions and 149 deletions
sound/soc/codecs/wm8993.c
View file @ d0ad0af0
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/regmap.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/slab.h> #include <linux/slab.h>
...@@ -40,134 +41,112 @@ static const char *wm8993_supply_names[WM8993_NUM_SUPPLIES] = { ...@@ -40,134 +41,112 @@ static const char *wm8993_supply_names[WM8993_NUM_SUPPLIES] = {
"SPKVDD", "SPKVDD",
}; };
static u16 wm8993_reg_defaults[WM8993_REGISTER_COUNT] = { static struct reg_default wm8993_reg_defaults[] = {
0x8993, /* R0 - Software Reset */ { 1, 0x0000 }, /* R1 - Power Management (1) */
0x0000, /* R1 - Power Management (1) */ { 2, 0x6000 }, /* R2 - Power Management (2) */
0x6000, /* R2 - Power Management (2) */ { 3, 0x0000 }, /* R3 - Power Management (3) */
0x0000, /* R3 - Power Management (3) */ { 4, 0x4050 }, /* R4 - Audio Interface (1) */
0x4050, /* R4 - Audio Interface (1) */ { 5, 0x4000 }, /* R5 - Audio Interface (2) */
0x4000, /* R5 - Audio Interface (2) */ { 6, 0x01C8 }, /* R6 - Clocking 1 */
0x01C8, /* R6 - Clocking 1 */ { 7, 0x0000 }, /* R7 - Clocking 2 */
0x0000, /* R7 - Clocking 2 */ { 8, 0x0000 }, /* R8 - Audio Interface (3) */
0x0000, /* R8 - Audio Interface (3) */ { 9, 0x0040 }, /* R9 - Audio Interface (4) */
0x0040, /* R9 - Audio Interface (4) */ { 10, 0x0004 }, /* R10 - DAC CTRL */
0x0004, /* R10 - DAC CTRL */ { 11, 0x00C0 }, /* R11 - Left DAC Digital Volume */
0x00C0, /* R11 - Left DAC Digital Volume */ { 12, 0x00C0 }, /* R12 - Right DAC Digital Volume */
0x00C0, /* R12 - Right DAC Digital Volume */ { 13, 0x0000 }, /* R13 - Digital Side Tone */
0x0000, /* R13 - Digital Side Tone */ { 14, 0x0300 }, /* R14 - ADC CTRL */
0x0300, /* R14 - ADC CTRL */ { 15, 0x00C0 }, /* R15 - Left ADC Digital Volume */
0x00C0, /* R15 - Left ADC Digital Volume */ { 16, 0x00C0 }, /* R16 - Right ADC Digital Volume */
0x00C0, /* R16 - Right ADC Digital Volume */ { 18, 0x0000 }, /* R18 - GPIO CTRL 1 */
0x0000, /* R17 */ { 19, 0x0010 }, /* R19 - GPIO1 */
0x0000, /* R18 - GPIO CTRL 1 */ { 20, 0x0000 }, /* R20 - IRQ_DEBOUNCE */
0x0010, /* R19 - GPIO1 */ { 21, 0x8000 }, /* R22 - GPIOCTRL 2 */
0x0000, /* R20 - IRQ_DEBOUNCE */ { 22, 0x0800 }, /* R23 - GPIO_POL */
0x0000, /* R21 */ { 24, 0x008B }, /* R24 - Left Line Input 1&2 Volume */
0x8000, /* R22 - GPIOCTRL 2 */ { 25, 0x008B }, /* R25 - Left Line Input 3&4 Volume */
0x0800, /* R23 - GPIO_POL */ { 26, 0x008B }, /* R26 - Right Line Input 1&2 Volume */
0x008B, /* R24 - Left Line Input 1&2 Volume */ { 27, 0x008B }, /* R27 - Right Line Input 3&4 Volume */
0x008B, /* R25 - Left Line Input 3&4 Volume */ { 28, 0x006D }, /* R28 - Left Output Volume */
0x008B, /* R26 - Right Line Input 1&2 Volume */ { 29, 0x006D }, /* R29 - Right Output Volume */
0x008B, /* R27 - Right Line Input 3&4 Volume */ { 30, 0x0066 }, /* R30 - Line Outputs Volume */
0x006D, /* R28 - Left Output Volume */ { 31, 0x0020 }, /* R31 - HPOUT2 Volume */
0x006D, /* R29 - Right Output Volume */ { 32, 0x0079 }, /* R32 - Left OPGA Volume */
0x0066, /* R30 - Line Outputs Volume */ { 33, 0x0079 }, /* R33 - Right OPGA Volume */
0x0020, /* R31 - HPOUT2 Volume */ { 34, 0x0003 }, /* R34 - SPKMIXL Attenuation */
0x0079, /* R32 - Left OPGA Volume */ { 35, 0x0003 }, /* R35 - SPKMIXR Attenuation */
0x0079, /* R33 - Right OPGA Volume */ { 36, 0x0011 }, /* R36 - SPKOUT Mixers */
0x0003, /* R34 - SPKMIXL Attenuation */ { 37, 0x0100 }, /* R37 - SPKOUT Boost */
0x0003, /* R35 - SPKMIXR Attenuation */ { 38, 0x0079 }, /* R38 - Speaker Volume Left */
0x0011, /* R36 - SPKOUT Mixers */ { 39, 0x0079 }, /* R39 - Speaker Volume Right */
0x0100, /* R37 - SPKOUT Boost */ { 40, 0x0000 }, /* R40 - Input Mixer2 */
0x0079, /* R38 - Speaker Volume Left */ { 41, 0x0000 }, /* R41 - Input Mixer3 */
0x0079, /* R39 - Speaker Volume Right */ { 42, 0x0000 }, /* R42 - Input Mixer4 */
0x0000, /* R40 - Input Mixer2 */ { 43, 0x0000 }, /* R43 - Input Mixer5 */
0x0000, /* R41 - Input Mixer3 */ { 44, 0x0000 }, /* R44 - Input Mixer6 */
0x0000, /* R42 - Input Mixer4 */ { 45, 0x0000 }, /* R45 - Output Mixer1 */
0x0000, /* R43 - Input Mixer5 */ { 46, 0x0000 }, /* R46 - Output Mixer2 */
0x0000, /* R44 - Input Mixer6 */ { 47, 0x0000 }, /* R47 - Output Mixer3 */
0x0000, /* R45 - Output Mixer1 */ { 48, 0x0000 }, /* R48 - Output Mixer4 */
0x0000, /* R46 - Output Mixer2 */ { 49, 0x0000 }, /* R49 - Output Mixer5 */
0x0000, /* R47 - Output Mixer3 */ { 50, 0x0000 }, /* R50 - Output Mixer6 */
0x0000, /* R48 - Output Mixer4 */ { 51, 0x0000 }, /* R51 - HPOUT2 Mixer */
0x0000, /* R49 - Output Mixer5 */ { 52, 0x0000 }, /* R52 - Line Mixer1 */
0x0000, /* R50 - Output Mixer6 */ { 53, 0x0000 }, /* R53 - Line Mixer2 */
0x0000, /* R51 - HPOUT2 Mixer */ { 54, 0x0000 }, /* R54 - Speaker Mixer */
0x0000, /* R52 - Line Mixer1 */ { 55, 0x0000 }, /* R55 - Additional Control */
0x0000, /* R53 - Line Mixer2 */ { 56, 0x0000 }, /* R56 - AntiPOP1 */
0x0000, /* R54 - Speaker Mixer */ { 57, 0x0000 }, /* R57 - AntiPOP2 */
0x0000, /* R55 - Additional Control */ { 58, 0x0000 }, /* R58 - MICBIAS */
0x0000, /* R56 - AntiPOP1 */ { 60, 0x0000 }, /* R60 - FLL Control 1 */
0x0000, /* R57 - AntiPOP2 */ { 61, 0x0000 }, /* R61 - FLL Control 2 */
0x0000, /* R58 - MICBIAS */ { 62, 0x0000 }, /* R62 - FLL Control 3 */
0x0000, /* R59 */ { 63, 0x2EE0 }, /* R63 - FLL Control 4 */
0x0000, /* R60 - FLL Control 1 */ { 64, 0x0002 }, /* R64 - FLL Control 5 */
0x0000, /* R61 - FLL Control 2 */ { 65, 0x2287 }, /* R65 - Clocking 3 */
0x0000, /* R62 - FLL Control 3 */ { 66, 0x025F }, /* R66 - Clocking 4 */
0x2EE0, /* R63 - FLL Control 4 */ { 67, 0x0000 }, /* R67 - MW Slave Control */
0x0002, /* R64 - FLL Control 5 */ { 69, 0x0002 }, /* R69 - Bus Control 1 */
0x2287, /* R65 - Clocking 3 */ { 70, 0x0000 }, /* R70 - Write Sequencer 0 */
0x025F, /* R66 - Clocking 4 */ { 71, 0x0000 }, /* R71 - Write Sequencer 1 */
0x0000, /* R67 - MW Slave Control */ { 72, 0x0000 }, /* R72 - Write Sequencer 2 */
0x0000, /* R68 */ { 73, 0x0000 }, /* R73 - Write Sequencer 3 */
0x0002, /* R69 - Bus Control 1 */ { 74, 0x0000 }, /* R74 - Write Sequencer 4 */
0x0000, /* R70 - Write Sequencer 0 */ { 75, 0x0000 }, /* R75 - Write Sequencer 5 */
0x0000, /* R71 - Write Sequencer 1 */ { 76, 0x1F25 }, /* R76 - Charge Pump 1 */
0x0000, /* R72 - Write Sequencer 2 */ { 81, 0x0000 }, /* R81 - Class W 0 */
0x0000, /* R73 - Write Sequencer 3 */ { 85, 0x054A }, /* R85 - DC Servo 1 */
0x0000, /* R74 - Write Sequencer 4 */ { 87, 0x0000 }, /* R87 - DC Servo 3 */
0x0000, /* R75 - Write Sequencer 5 */ { 96, 0x0100 }, /* R96 - Analogue HP 0 */
0x1F25, /* R76 - Charge Pump 1 */ { 98, 0x0000 }, /* R98 - EQ1 */
0x0000, /* R77 */ { 99, 0x000C }, /* R99 - EQ2 */
0x0000, /* R78 */ { 100, 0x000C }, /* R100 - EQ3 */
0x0000, /* R79 */ { 101, 0x000C }, /* R101 - EQ4 */
0x0000, /* R80 */ { 102, 0x000C }, /* R102 - EQ5 */
0x0000, /* R81 - Class W 0 */ { 103, 0x000C }, /* R103 - EQ6 */
0x0000, /* R82 */ { 104, 0x0FCA }, /* R104 - EQ7 */
0x0000, /* R83 */ { 105, 0x0400 }, /* R105 - EQ8 */
0x0000, /* R84 - DC Servo 0 */ { 106, 0x00D8 }, /* R106 - EQ9 */
0x054A, /* R85 - DC Servo 1 */ { 107, 0x1EB5 }, /* R107 - EQ10 */
0x0000, /* R86 */ { 108, 0xF145 }, /* R108 - EQ11 */
0x0000, /* R87 - DC Servo 3 */ { 109, 0x0B75 }, /* R109 - EQ12 */
0x0000, /* R88 - DC Servo Readback 0 */ { 110, 0x01C5 }, /* R110 - EQ13 */
0x0000, /* R89 - DC Servo Readback 1 */ { 111, 0x1C58 }, /* R111 - EQ14 */
0x0000, /* R90 - DC Servo Readback 2 */ { 112, 0xF373 }, /* R112 - EQ15 */
0x0000, /* R91 */ { 113, 0x0A54 }, /* R113 - EQ16 */
0x0000, /* R92 */ { 114, 0x0558 }, /* R114 - EQ17 */
0x0000, /* R93 */ { 115, 0x168E }, /* R115 - EQ18 */
0x0000, /* R94 */ { 116, 0xF829 }, /* R116 - EQ19 */
0x0000, /* R95 */ { 117, 0x07AD }, /* R117 - EQ20 */
0x0100, /* R96 - Analogue HP 0 */ { 118, 0x1103 }, /* R118 - EQ21 */
0x0000, /* R97 */ { 119, 0x0564 }, /* R119 - EQ22 */
0x0000, /* R98 - EQ1 */ { 120, 0x0559 }, /* R120 - EQ23 */
0x000C, /* R99 - EQ2 */ { 121, 0x4000 }, /* R121 - EQ24 */
0x000C, /* R100 - EQ3 */ { 122, 0x0000 }, /* R122 - Digital Pulls */
0x000C, /* R101 - EQ4 */ { 123, 0x0F08 }, /* R123 - DRC Control 1 */
0x000C, /* R102 - EQ5 */ { 124, 0x0000 }, /* R124 - DRC Control 2 */
0x000C, /* R103 - EQ6 */ { 125, 0x0080 }, /* R125 - DRC Control 3 */
0x0FCA, /* R104 - EQ7 */ { 126, 0x0000 }, /* R126 - DRC Control 4 */
0x0400, /* R105 - EQ8 */
0x00D8, /* R106 - EQ9 */
0x1EB5, /* R107 - EQ10 */
0xF145, /* R108 - EQ11 */
0x0B75, /* R109 - EQ12 */
0x01C5, /* R110 - EQ13 */
0x1C58, /* R111 - EQ14 */
0xF373, /* R112 - EQ15 */
0x0A54, /* R113 - EQ16 */
0x0558, /* R114 - EQ17 */
0x168E, /* R115 - EQ18 */
0xF829, /* R116 - EQ19 */
0x07AD, /* R117 - EQ20 */
0x1103, /* R118 - EQ21 */
0x0564, /* R119 - EQ22 */
0x0559, /* R120 - EQ23 */
0x4000, /* R121 - EQ24 */
0x0000, /* R122 - Digital Pulls */
0x0F08, /* R123 - DRC Control 1 */
0x0000, /* R124 - DRC Control 2 */
0x0080, /* R125 - DRC Control 3 */
0x0000, /* R126 - DRC Control 4 */
}; };
static struct { static struct {
...@@ -225,9 +204,9 @@ static struct { ...@@ -225,9 +204,9 @@ static struct {
struct wm8993_priv { struct wm8993_priv {
struct wm_hubs_data hubs_data; struct wm_hubs_data hubs_data;
struct regmap *regmap;
struct regulator_bulk_data supplies[WM8993_NUM_SUPPLIES]; struct regulator_bulk_data supplies[WM8993_NUM_SUPPLIES];
struct wm8993_platform_data pdata; struct wm8993_platform_data pdata;
enum snd_soc_control_type control_type;
int master; int master;
int sysclk_source; int sysclk_source;
int tdm_slots; int tdm_slots;
...@@ -242,7 +221,7 @@ struct wm8993_priv { ...@@ -242,7 +221,7 @@ struct wm8993_priv {
int fll_src; int fll_src;
}; };
static int wm8993_volatile(struct snd_soc_codec *codec, unsigned int reg) static bool wm8993_volatile(struct device *dev, unsigned int reg)
{ {
switch (reg) { switch (reg) {
case WM8993_SOFTWARE_RESET: case WM8993_SOFTWARE_RESET:
...@@ -250,9 +229,128 @@ static int wm8993_volatile(struct snd_soc_codec *codec, unsigned int reg) ...@@ -250,9 +229,128 @@ static int wm8993_volatile(struct snd_soc_codec *codec, unsigned int reg)
case WM8993_DC_SERVO_READBACK_0: case WM8993_DC_SERVO_READBACK_0:
case WM8993_DC_SERVO_READBACK_1: case WM8993_DC_SERVO_READBACK_1:
case WM8993_DC_SERVO_READBACK_2: case WM8993_DC_SERVO_READBACK_2:
return 1; return true;
default: default:
return 0; return false;
}
}
static bool wm8993_readable(struct device *dev, unsigned int reg)
{
switch (reg) {
case WM8993_SOFTWARE_RESET:
case WM8993_POWER_MANAGEMENT_1:
case WM8993_POWER_MANAGEMENT_2:
case WM8993_POWER_MANAGEMENT_3:
case WM8993_AUDIO_INTERFACE_1:
case WM8993_AUDIO_INTERFACE_2:
case WM8993_CLOCKING_1:
case WM8993_CLOCKING_2:
case WM8993_AUDIO_INTERFACE_3:
case WM8993_AUDIO_INTERFACE_4:
case WM8993_DAC_CTRL:
case WM8993_LEFT_DAC_DIGITAL_VOLUME:
case WM8993_RIGHT_DAC_DIGITAL_VOLUME:
case WM8993_DIGITAL_SIDE_TONE:
case WM8993_ADC_CTRL:
case WM8993_LEFT_ADC_DIGITAL_VOLUME:
case WM8993_RIGHT_ADC_DIGITAL_VOLUME:
case WM8993_GPIO_CTRL_1:
case WM8993_GPIO1:
case WM8993_IRQ_DEBOUNCE:
case WM8993_GPIOCTRL_2:
case WM8993_GPIO_POL:
case WM8993_LEFT_LINE_INPUT_1_2_VOLUME:
case WM8993_LEFT_LINE_INPUT_3_4_VOLUME:
case WM8993_RIGHT_LINE_INPUT_1_2_VOLUME:
case WM8993_RIGHT_LINE_INPUT_3_4_VOLUME:
case WM8993_LEFT_OUTPUT_VOLUME:
case WM8993_RIGHT_OUTPUT_VOLUME:
case WM8993_LINE_OUTPUTS_VOLUME:
case WM8993_HPOUT2_VOLUME:
case WM8993_LEFT_OPGA_VOLUME:
case WM8993_RIGHT_OPGA_VOLUME:
case WM8993_SPKMIXL_ATTENUATION:
case WM8993_SPKMIXR_ATTENUATION:
case WM8993_SPKOUT_MIXERS:
case WM8993_SPKOUT_BOOST:
case WM8993_SPEAKER_VOLUME_LEFT:
case WM8993_SPEAKER_VOLUME_RIGHT:
case WM8993_INPUT_MIXER2:
case WM8993_INPUT_MIXER3:
case WM8993_INPUT_MIXER4:
case WM8993_INPUT_MIXER5:
case WM8993_INPUT_MIXER6:
case WM8993_OUTPUT_MIXER1:
case WM8993_OUTPUT_MIXER2:
case WM8993_OUTPUT_MIXER3:
case WM8993_OUTPUT_MIXER4:
case WM8993_OUTPUT_MIXER5:
case WM8993_OUTPUT_MIXER6:
case WM8993_HPOUT2_MIXER:
case WM8993_LINE_MIXER1:
case WM8993_LINE_MIXER2:
case WM8993_SPEAKER_MIXER:
case WM8993_ADDITIONAL_CONTROL:
case WM8993_ANTIPOP1:
case WM8993_ANTIPOP2:
case WM8993_MICBIAS:
case WM8993_FLL_CONTROL_1:
case WM8993_FLL_CONTROL_2:
case WM8993_FLL_CONTROL_3:
case WM8993_FLL_CONTROL_4:
case WM8993_FLL_CONTROL_5:
case WM8993_CLOCKING_3:
case WM8993_CLOCKING_4:
case WM8993_MW_SLAVE_CONTROL:
case WM8993_BUS_CONTROL_1:
case WM8993_WRITE_SEQUENCER_0:
case WM8993_WRITE_SEQUENCER_1:
case WM8993_WRITE_SEQUENCER_2:
case WM8993_WRITE_SEQUENCER_3:
case WM8993_WRITE_SEQUENCER_4:
case WM8993_WRITE_SEQUENCER_5:
case WM8993_CHARGE_PUMP_1:
case WM8993_CLASS_W_0:
case WM8993_DC_SERVO_0:
case WM8993_DC_SERVO_1:
case WM8993_DC_SERVO_3:
case WM8993_DC_SERVO_READBACK_0:
case WM8993_DC_SERVO_READBACK_1:
case WM8993_DC_SERVO_READBACK_2:
case WM8993_ANALOGUE_HP_0:
case WM8993_EQ1:
case WM8993_EQ2:
case WM8993_EQ3:
case WM8993_EQ4:
case WM8993_EQ5:
case WM8993_EQ6:
case WM8993_EQ7:
case WM8993_EQ8:
case WM8993_EQ9:
case WM8993_EQ10:
case WM8993_EQ11:
case WM8993_EQ12:
case WM8993_EQ13:
case WM8993_EQ14:
case WM8993_EQ15:
case WM8993_EQ16:
case WM8993_EQ17:
case WM8993_EQ18:
case WM8993_EQ19:
case WM8993_EQ20:
case WM8993_EQ21:
case WM8993_EQ22:
case WM8993_EQ23:
case WM8993_EQ24:
case WM8993_DIGITAL_PULLS:
case WM8993_DRC_CONTROL_1:
case WM8993_DRC_CONTROL_2:
case WM8993_DRC_CONTROL_3:
case WM8993_DRC_CONTROL_4:
return true;
default:
return false;
} }
} }
...@@ -963,7 +1061,8 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec, ...@@ -963,7 +1061,8 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec,
if (ret != 0) if (ret != 0)
return ret; return ret;
snd_soc_cache_sync(codec); regcache_cache_only(wm8993->regmap, false);
regcache_sync(wm8993->regmap);
/* Tune DC servo configuration */ /* Tune DC servo configuration */
snd_soc_write(codec, 0x44, 3); snd_soc_write(codec, 0x44, 3);
...@@ -1024,14 +1123,8 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec, ...@@ -1024,14 +1123,8 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec,
WM8993_VMID_RAMP_MASK | WM8993_VMID_RAMP_MASK |
WM8993_BIAS_SRC, 0); WM8993_BIAS_SRC, 0);
#ifdef CONFIG_REGULATOR regcache_cache_only(wm8993->regmap, true);
/* Post 2.6.34 we will be able to get a callback when regcache_mark_dirty(wm8993->regmap);
* the regulators are disabled which we can use but
* for now just assume that the power will be cut if
* the regulator API is in use.
*/
codec->cache_sync = 1;
#endif
regulator_bulk_disable(ARRAY_SIZE(wm8993->supplies), regulator_bulk_disable(ARRAY_SIZE(wm8993->supplies),
wm8993->supplies); wm8993->supplies);
...@@ -1425,7 +1518,8 @@ static int wm8993_probe(struct snd_soc_codec *codec) ...@@ -1425,7 +1518,8 @@ static int wm8993_probe(struct snd_soc_codec *codec)
wm8993->hubs_data.dcs_codes_r = -2; wm8993->hubs_data.dcs_codes_r = -2;
wm8993->hubs_data.series_startup = 1; wm8993->hubs_data.series_startup = 1;
ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_I2C); codec->control_data = wm8993->regmap;
ret = snd_soc_codec_set_cache_io(codec, 8, 16, SND_SOC_REGMAP);
if (ret != 0) { if (ret != 0) {
dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret); dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
return ret; return ret;
...@@ -1449,7 +1543,7 @@ static int wm8993_probe(struct snd_soc_codec *codec) ...@@ -1449,7 +1543,7 @@ static int wm8993_probe(struct snd_soc_codec *codec)
} }
val = snd_soc_read(codec, WM8993_SOFTWARE_RESET); val = snd_soc_read(codec, WM8993_SOFTWARE_RESET);
if (val != wm8993_reg_defaults[WM8993_SOFTWARE_RESET]) { if (val != 0x8993) {
dev_err(codec->dev, "Invalid ID register value %x\n", val); dev_err(codec->dev, "Invalid ID register value %x\n", val);
ret = -EINVAL; ret = -EINVAL;
goto err_enable; goto err_enable;
...@@ -1459,7 +1553,7 @@ static int wm8993_probe(struct snd_soc_codec *codec) ...@@ -1459,7 +1553,7 @@ static int wm8993_probe(struct snd_soc_codec *codec)
if (ret != 0) if (ret != 0)
goto err_enable; goto err_enable;
codec->cache_only = 1; regcache_cache_only(wm8993->regmap, true);
/* By default we're using the output mixers */ /* By default we're using the output mixers */
wm8993->class_w_users = 2; wm8993->class_w_users = 2;
...@@ -1578,16 +1672,25 @@ static int wm8993_resume(struct snd_soc_codec *codec) ...@@ -1578,16 +1672,25 @@ static int wm8993_resume(struct snd_soc_codec *codec)
#define wm8993_resume NULL #define wm8993_resume NULL
#endif #endif
static const struct regmap_config wm8993_regmap = {
.reg_bits = 8,
.val_bits = 16,
.max_register = WM8993_MAX_REGISTER,
.volatile_reg = wm8993_volatile,
.readable_reg = wm8993_readable,
.cache_type = REGCACHE_RBTREE,
.reg_defaults = wm8993_reg_defaults,
.num_reg_defaults = ARRAY_SIZE(wm8993_reg_defaults),
};
static struct snd_soc_codec_driver soc_codec_dev_wm8993 = { static struct snd_soc_codec_driver soc_codec_dev_wm8993 = {
.probe = wm8993_probe, .probe = wm8993_probe,
.remove = wm8993_remove, .remove = wm8993_remove,
.suspend = wm8993_suspend, .suspend = wm8993_suspend,
.resume = wm8993_resume, .resume = wm8993_resume,
.set_bias_level = wm8993_set_bias_level, .set_bias_level = wm8993_set_bias_level,
.reg_cache_size = ARRAY_SIZE(wm8993_reg_defaults),
.reg_word_size = sizeof(u16),
.reg_cache_default = wm8993_reg_defaults,
.volatile_register = wm8993_volatile,
}; };
#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE) #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
...@@ -1602,17 +1705,36 @@ static __devinit int wm8993_i2c_probe(struct i2c_client *i2c, ...@@ -1602,17 +1705,36 @@ static __devinit int wm8993_i2c_probe(struct i2c_client *i2c,
if (wm8993 == NULL) if (wm8993 == NULL)
return -ENOMEM; return -ENOMEM;
wm8993->regmap = regmap_init_i2c(i2c, &wm8993_regmap);
if (IS_ERR(wm8993->regmap)) {
ret = PTR_ERR(wm8993->regmap);
dev_err(&i2c->dev, "Failed to allocate regmap: %d\n", ret);
return ret;
}
i2c_set_clientdata(i2c, wm8993); i2c_set_clientdata(i2c, wm8993);
ret = snd_soc_register_codec(&i2c->dev, ret = snd_soc_register_codec(&i2c->dev,
&soc_codec_dev_wm8993, &wm8993_dai, 1); &soc_codec_dev_wm8993, &wm8993_dai, 1);
if (ret != 0) {
dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);
goto err;
}
return ret;
err:
regmap_exit(wm8993->regmap);
return ret; return ret;
} }
static __devexit int wm8993_i2c_remove(struct i2c_client *client) static __devexit int wm8993_i2c_remove(struct i2c_client *client)
{ {
struct wm8993_priv *wm8993 = i2c_get_clientdata(client);
snd_soc_unregister_codec(&client->dev); snd_soc_unregister_codec(&client->dev);
kfree(i2c_get_clientdata(client)); regmap_exit(wm8993->regmap);
return 0; return 0;
} }
......
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