hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: wm8993/wm8994/wm8958: replace codec to component 

Now we can replace Codec to Component. Let's do it.

Becase wm8993/wm8994/wm8958 are using wm_hubs feature,
we need to update these all related drivers in same time.
Otherwise compile error/warning happen

wm8993:
	xxx_codec_xxx()		->	xxx_component_xxx()
	.idle_bias_off = 0	->	.idle_bias_on = 1
	.ignore_pmdown_time = 0	->	.use_pmdown_time = 1
	-			->	.endianness = 1
	-			->	.non_legacy_dai_naming = 1

wm8994:
	xxx_codec_xxx()		->	xxx_component_xxx()
	.idle_bias_off = 0	->	.idle_bias_on = 1
	.ignore_pmdown_time = 0	->	.use_pmdown_time = 1
	-			->	.endianness = 1
	-			->	.non_legacy_dai_naming = 1

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2018-01-29 03:12:21 +00:00 committed by Mark Brown
parent 7928b2cbe5
commit 00a6941c84
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
7 changed files with 809 additions and 804 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

278
sound/soc/codecs/wm8958-dsp2.c
View File

@ -39,10 +39,10 @@
#define WM_FW_BLOCK_A 0x08 #define WM_FW_BLOCK_A 0x08
#define WM_FW_BLOCK_C 0x0c #define WM_FW_BLOCK_C 0x0c
static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name, static int wm8958_dsp2_fw(struct snd_soc_component *component, const char *name,
const struct firmware *fw, bool check) const struct firmware *fw, bool check)
{ {
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
u64 data64; u64 data64;
u32 data32; u32 data32;
const u8 *data; const u8 *data;
@ -55,7 +55,7 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name,
return 0; return 0;
if (fw->size < 32) { if (fw->size < 32) {
dev_err(codec->dev, "%s: firmware too short (%zd bytes)\n", dev_err(component->dev, "%s: firmware too short (%zd bytes)\n",
name, fw->size); name, fw->size);
goto err; goto err;
} }
@ -63,7 +63,7 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name,
if (memcmp(fw->data, "WMFW", 4) != 0) { if (memcmp(fw->data, "WMFW", 4) != 0) {
memcpy(&data32, fw->data, sizeof(data32)); memcpy(&data32, fw->data, sizeof(data32));
data32 = be32_to_cpu(data32); data32 = be32_to_cpu(data32);
dev_err(codec->dev, "%s: firmware has bad file magic %08x\n", dev_err(component->dev, "%s: firmware has bad file magic %08x\n",
name, data32); name, data32);
goto err; goto err;
} }
@ -74,35 +74,35 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name,
memcpy(&data32, fw->data + 8, sizeof(data32)); memcpy(&data32, fw->data + 8, sizeof(data32));
data32 = be32_to_cpu(data32); data32 = be32_to_cpu(data32);
if ((data32 >> 24) & 0xff) { if ((data32 >> 24) & 0xff) {
dev_err(codec->dev, "%s: unsupported firmware version %d\n", dev_err(component->dev, "%s: unsupported firmware version %d\n",
name, (data32 >> 24) & 0xff); name, (data32 >> 24) & 0xff);
goto err; goto err;
} }
if ((data32 & 0xffff) != 8958) { if ((data32 & 0xffff) != 8958) {
dev_err(codec->dev, "%s: unsupported target device %d\n", dev_err(component->dev, "%s: unsupported target device %d\n",
name, data32 & 0xffff); name, data32 & 0xffff);
goto err; goto err;
} }
if (((data32 >> 16) & 0xff) != 0xc) { if (((data32 >> 16) & 0xff) != 0xc) {
dev_err(codec->dev, "%s: unsupported target core %d\n", dev_err(component->dev, "%s: unsupported target core %d\n",
name, (data32 >> 16) & 0xff); name, (data32 >> 16) & 0xff);
goto err; goto err;
} }
if (check) { if (check) {
memcpy(&data64, fw->data + 24, sizeof(u64)); memcpy(&data64, fw->data + 24, sizeof(u64));
dev_info(codec->dev, "%s timestamp %llx\n", dev_info(component->dev, "%s timestamp %llx\n",
name, be64_to_cpu(data64)); name, be64_to_cpu(data64));
} else { } else {
snd_soc_write(codec, 0x102, 0x2); snd_soc_component_write(component, 0x102, 0x2);
snd_soc_write(codec, 0x900, 0x2); snd_soc_component_write(component, 0x900, 0x2);
} }
data = fw->data + len; data = fw->data + len;
len = fw->size - len; len = fw->size - len;
while (len) { while (len) {
if (len < 12) { if (len < 12) {
dev_err(codec->dev, "%s short data block of %zd\n", dev_err(component->dev, "%s short data block of %zd\n",
name, len); name, len);
goto err; goto err;
} }
@ -110,12 +110,12 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name,
memcpy(&data32, data + 4, sizeof(data32)); memcpy(&data32, data + 4, sizeof(data32));
block_len = be32_to_cpu(data32); block_len = be32_to_cpu(data32);
if (block_len + 8 > len) { if (block_len + 8 > len) {
dev_err(codec->dev, "%zd byte block longer than file\n", dev_err(component->dev, "%zd byte block longer than file\n",
block_len); block_len);
goto err; goto err;
} }
if (block_len == 0) { if (block_len == 0) {
dev_err(codec->dev, "Zero length block\n"); dev_err(component->dev, "Zero length block\n");
goto err; goto err;
} }
@ -131,10 +131,10 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name,
str = kzalloc(block_len + 1, GFP_KERNEL); str = kzalloc(block_len + 1, GFP_KERNEL);
if (str) { if (str) {
memcpy(str, data + 8, block_len); memcpy(str, data + 8, block_len);
dev_info(codec->dev, "%s: %s\n", name, str); dev_info(component->dev, "%s: %s\n", name, str);
kfree(str); kfree(str);
} else { } else {
dev_err(codec->dev, "Out of memory\n"); dev_err(component->dev, "Out of memory\n");
} }
break; break;
case WM_FW_BLOCK_PM: case WM_FW_BLOCK_PM:
@ -144,7 +144,7 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name,
case WM_FW_BLOCK_I: case WM_FW_BLOCK_I:
case WM_FW_BLOCK_A: case WM_FW_BLOCK_A:
case WM_FW_BLOCK_C: case WM_FW_BLOCK_C:
dev_dbg(codec->dev, "%s: %zd bytes of %x@%x\n", name, dev_dbg(component->dev, "%s: %zd bytes of %x@%x\n", name,
block_len, (data32 >> 24) & 0xff, block_len, (data32 >> 24) & 0xff,
data32 & 0xffffff); data32 & 0xffffff);
@ -160,7 +160,7 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name,
break; break;
default: default:
dev_warn(codec->dev, "%s: unknown block type %d\n", dev_warn(component->dev, "%s: unknown block type %d\n",
name, (data32 >> 24) & 0xff); name, (data32 >> 24) & 0xff);
break; break;
} }
@ -173,10 +173,10 @@ static int wm8958_dsp2_fw(struct snd_soc_codec *codec, const char *name,
} }
if (!check) { if (!check) {
dev_dbg(codec->dev, "%s: download done\n", name); dev_dbg(component->dev, "%s: download done\n", name);
wm8994->cur_fw = fw; wm8994->cur_fw = fw;
} else { } else {
dev_info(codec->dev, "%s: got firmware\n", name); dev_info(component->dev, "%s: got firmware\n", name);
} }
goto ok; goto ok;
@ -185,28 +185,28 @@ err:
ret = -EINVAL; ret = -EINVAL;
ok: ok:
if (!check) { if (!check) {
snd_soc_write(codec, 0x900, 0x0); snd_soc_component_write(component, 0x900, 0x0);
snd_soc_write(codec, 0x102, 0x0); snd_soc_component_write(component, 0x102, 0x0);
} }
return ret; return ret;
} }
static void wm8958_dsp_start_mbc(struct snd_soc_codec *codec, int path) static void wm8958_dsp_start_mbc(struct snd_soc_component *component, int path)
{ {
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
struct wm8994 *control = wm8994->wm8994; struct wm8994 *control = wm8994->wm8994;
int i; int i;
/* If the DSP is already running then noop */ /* If the DSP is already running then noop */
if (snd_soc_read(codec, WM8958_DSP2_PROGRAM) & WM8958_DSP2_ENA) if (snd_soc_component_read32(component, WM8958_DSP2_PROGRAM) & WM8958_DSP2_ENA)
return; return;
/* If we have MBC firmware download it */ /* If we have MBC firmware download it */
if (wm8994->mbc) if (wm8994->mbc)
wm8958_dsp2_fw(codec, "MBC", wm8994->mbc, false); wm8958_dsp2_fw(component, "MBC", wm8994->mbc, false);
snd_soc_update_bits(codec, WM8958_DSP2_PROGRAM, snd_soc_component_update_bits(component, WM8958_DSP2_PROGRAM,
WM8958_DSP2_ENA, WM8958_DSP2_ENA); WM8958_DSP2_ENA, WM8958_DSP2_ENA);
/* If we've got user supplied MBC settings use them */ /* If we've got user supplied MBC settings use them */
@ -215,37 +215,37 @@ static void wm8958_dsp_start_mbc(struct snd_soc_codec *codec, int path)
= &control->pdata.mbc_cfgs[wm8994->mbc_cfg]; = &control->pdata.mbc_cfgs[wm8994->mbc_cfg];
for (i = 0; i < ARRAY_SIZE(cfg->coeff_regs); i++) for (i = 0; i < ARRAY_SIZE(cfg->coeff_regs); i++)
snd_soc_write(codec, i + WM8958_MBC_BAND_1_K_1, snd_soc_component_write(component, i + WM8958_MBC_BAND_1_K_1,
cfg->coeff_regs[i]); cfg->coeff_regs[i]);
for (i = 0; i < ARRAY_SIZE(cfg->cutoff_regs); i++) for (i = 0; i < ARRAY_SIZE(cfg->cutoff_regs); i++)
snd_soc_write(codec, snd_soc_component_write(component,
i + WM8958_MBC_BAND_2_LOWER_CUTOFF_C1_1, i + WM8958_MBC_BAND_2_LOWER_CUTOFF_C1_1,
cfg->cutoff_regs[i]); cfg->cutoff_regs[i]);
} }
/* Run the DSP */ /* Run the DSP */
snd_soc_write(codec, WM8958_DSP2_EXECCONTROL, snd_soc_component_write(component, WM8958_DSP2_EXECCONTROL,
WM8958_DSP2_RUNR); WM8958_DSP2_RUNR);
/* And we're off! */ /* And we're off! */
snd_soc_update_bits(codec, WM8958_DSP2_CONFIG, snd_soc_component_update_bits(component, WM8958_DSP2_CONFIG,
WM8958_MBC_ENA | WM8958_MBC_ENA |
WM8958_MBC_SEL_MASK, WM8958_MBC_SEL_MASK,
path << WM8958_MBC_SEL_SHIFT | path << WM8958_MBC_SEL_SHIFT |
WM8958_MBC_ENA); WM8958_MBC_ENA);
} }
static void wm8958_dsp_start_vss(struct snd_soc_codec *codec, int path) static void wm8958_dsp_start_vss(struct snd_soc_component *component, int path)
{ {
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
struct wm8994 *control = wm8994->wm8994; struct wm8994 *control = wm8994->wm8994;
int i, ena; int i, ena;
if (wm8994->mbc_vss) if (wm8994->mbc_vss)
wm8958_dsp2_fw(codec, "MBC+VSS", wm8994->mbc_vss, false); wm8958_dsp2_fw(component, "MBC+VSS", wm8994->mbc_vss, false);
snd_soc_update_bits(codec, WM8958_DSP2_PROGRAM, snd_soc_component_update_bits(component, WM8958_DSP2_PROGRAM,
WM8958_DSP2_ENA, WM8958_DSP2_ENA); WM8958_DSP2_ENA, WM8958_DSP2_ENA);
/* If we've got user supplied settings use them */ /* If we've got user supplied settings use them */
@ -254,7 +254,7 @@ static void wm8958_dsp_start_vss(struct snd_soc_codec *codec, int path)
= &control->pdata.mbc_cfgs[wm8994->mbc_cfg]; = &control->pdata.mbc_cfgs[wm8994->mbc_cfg];
for (i = 0; i < ARRAY_SIZE(cfg->combined_regs); i++) for (i = 0; i < ARRAY_SIZE(cfg->combined_regs); i++)
snd_soc_write(codec, i + 0x2800, snd_soc_component_write(component, i + 0x2800,
cfg->combined_regs[i]); cfg->combined_regs[i]);
} }
@ -263,7 +263,7 @@ static void wm8958_dsp_start_vss(struct snd_soc_codec *codec, int path)
= &control->pdata.vss_cfgs[wm8994->vss_cfg]; = &control->pdata.vss_cfgs[wm8994->vss_cfg];
for (i = 0; i < ARRAY_SIZE(cfg->regs); i++) for (i = 0; i < ARRAY_SIZE(cfg->regs); i++)
snd_soc_write(codec, i + 0x2600, cfg->regs[i]); snd_soc_component_write(component, i + 0x2600, cfg->regs[i]);
} }
if (control->pdata.num_vss_hpf_cfgs) { if (control->pdata.num_vss_hpf_cfgs) {
@ -271,11 +271,11 @@ static void wm8958_dsp_start_vss(struct snd_soc_codec *codec, int path)
= &control->pdata.vss_hpf_cfgs[wm8994->vss_hpf_cfg]; = &control->pdata.vss_hpf_cfgs[wm8994->vss_hpf_cfg];
for (i = 0; i < ARRAY_SIZE(cfg->regs); i++) for (i = 0; i < ARRAY_SIZE(cfg->regs); i++)
snd_soc_write(codec, i + 0x2400, cfg->regs[i]); snd_soc_component_write(component, i + 0x2400, cfg->regs[i]);
} }
/* Run the DSP */ /* Run the DSP */
snd_soc_write(codec, WM8958_DSP2_EXECCONTROL, snd_soc_component_write(component, WM8958_DSP2_EXECCONTROL,
WM8958_DSP2_RUNR); WM8958_DSP2_RUNR);
/* Enable the algorithms we've selected */ /* Enable the algorithms we've selected */
@ -289,23 +289,23 @@ static void wm8958_dsp_start_vss(struct snd_soc_codec *codec, int path)
if (wm8994->vss_ena[path]) if (wm8994->vss_ena[path])
ena |= 0x1; ena |= 0x1;
snd_soc_write(codec, 0x2201, ena); snd_soc_component_write(component, 0x2201, ena);
/* Switch the DSP into the data path */ /* Switch the DSP into the data path */
snd_soc_update_bits(codec, WM8958_DSP2_CONFIG, snd_soc_component_update_bits(component, WM8958_DSP2_CONFIG,
WM8958_MBC_SEL_MASK | WM8958_MBC_ENA, WM8958_MBC_SEL_MASK | WM8958_MBC_ENA,
path << WM8958_MBC_SEL_SHIFT | WM8958_MBC_ENA); path << WM8958_MBC_SEL_SHIFT | WM8958_MBC_ENA);
} }
static void wm8958_dsp_start_enh_eq(struct snd_soc_codec *codec, int path) static void wm8958_dsp_start_enh_eq(struct snd_soc_component *component, int path)
{ {
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
struct wm8994 *control = wm8994->wm8994; struct wm8994 *control = wm8994->wm8994;
int i; int i;
wm8958_dsp2_fw(codec, "ENH_EQ", wm8994->enh_eq, false); wm8958_dsp2_fw(component, "ENH_EQ", wm8994->enh_eq, false);
snd_soc_update_bits(codec, WM8958_DSP2_PROGRAM, snd_soc_component_update_bits(component, WM8958_DSP2_PROGRAM,
WM8958_DSP2_ENA, WM8958_DSP2_ENA); WM8958_DSP2_ENA, WM8958_DSP2_ENA);
/* If we've got user supplied settings use them */ /* If we've got user supplied settings use them */
@ -314,24 +314,24 @@ static void wm8958_dsp_start_enh_eq(struct snd_soc_codec *codec, int path)
= &control->pdata.enh_eq_cfgs[wm8994->enh_eq_cfg]; = &control->pdata.enh_eq_cfgs[wm8994->enh_eq_cfg];
for (i = 0; i < ARRAY_SIZE(cfg->regs); i++) for (i = 0; i < ARRAY_SIZE(cfg->regs); i++)
snd_soc_write(codec, i + 0x2200, snd_soc_component_write(component, i + 0x2200,
cfg->regs[i]); cfg->regs[i]);
} }
/* Run the DSP */ /* Run the DSP */
snd_soc_write(codec, WM8958_DSP2_EXECCONTROL, snd_soc_component_write(component, WM8958_DSP2_EXECCONTROL,
WM8958_DSP2_RUNR); WM8958_DSP2_RUNR);
/* Switch the DSP into the data path */ /* Switch the DSP into the data path */
snd_soc_update_bits(codec, WM8958_DSP2_CONFIG, snd_soc_component_update_bits(component, WM8958_DSP2_CONFIG,
WM8958_MBC_SEL_MASK | WM8958_MBC_ENA, WM8958_MBC_SEL_MASK | WM8958_MBC_ENA,
path << WM8958_MBC_SEL_SHIFT | WM8958_MBC_ENA); path << WM8958_MBC_SEL_SHIFT | WM8958_MBC_ENA);
} }
static void wm8958_dsp_apply(struct snd_soc_codec *codec, int path, int start) static void wm8958_dsp_apply(struct snd_soc_component *component, int path, int start)
{ {
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
int pwr_reg = snd_soc_read(codec, WM8994_POWER_MANAGEMENT_5); int pwr_reg = snd_soc_component_read32(component, WM8994_POWER_MANAGEMENT_5);
int ena, reg, aif; int ena, reg, aif;
switch (path) { switch (path) {
@ -359,9 +359,9 @@ static void wm8958_dsp_apply(struct snd_soc_codec *codec, int path, int start)
if (!pwr_reg) if (!pwr_reg)
ena = 0; ena = 0;
reg = snd_soc_read(codec, WM8958_DSP2_PROGRAM); reg = snd_soc_component_read32(component, WM8958_DSP2_PROGRAM);
dev_dbg(codec->dev, "DSP path %d %d startup: %d, power: %x, DSP: %x\n", dev_dbg(component->dev, "DSP path %d %d startup: %d, power: %x, DSP: %x\n",
path, wm8994->dsp_active, start, pwr_reg, reg); path, wm8994->dsp_active, start, pwr_reg, reg);
if (start && ena) { if (start && ena) {
@ -370,29 +370,29 @@ static void wm8958_dsp_apply(struct snd_soc_codec *codec, int path, int start)
return; return;
/* If either AIFnCLK is not yet enabled postpone */ /* If either AIFnCLK is not yet enabled postpone */
if (!(snd_soc_read(codec, WM8994_AIF1_CLOCKING_1) if (!(snd_soc_component_read32(component, WM8994_AIF1_CLOCKING_1)
& WM8994_AIF1CLK_ENA_MASK) && & WM8994_AIF1CLK_ENA_MASK) &&
!(snd_soc_read(codec, WM8994_AIF2_CLOCKING_1) !(snd_soc_component_read32(component, WM8994_AIF2_CLOCKING_1)
& WM8994_AIF2CLK_ENA_MASK)) & WM8994_AIF2CLK_ENA_MASK))
return; return;
/* Switch the clock over to the appropriate AIF */ /* Switch the clock over to the appropriate AIF */
snd_soc_update_bits(codec, WM8994_CLOCKING_1, snd_soc_component_update_bits(component, WM8994_CLOCKING_1,
WM8958_DSP2CLK_SRC | WM8958_DSP2CLK_ENA, WM8958_DSP2CLK_SRC | WM8958_DSP2CLK_ENA,
aif << WM8958_DSP2CLK_SRC_SHIFT | aif << WM8958_DSP2CLK_SRC_SHIFT |
WM8958_DSP2CLK_ENA); WM8958_DSP2CLK_ENA);
if (wm8994->enh_eq_ena[path]) if (wm8994->enh_eq_ena[path])
wm8958_dsp_start_enh_eq(codec, path); wm8958_dsp_start_enh_eq(component, path);
else if (wm8994->vss_ena[path] || wm8994->hpf1_ena[path] || else if (wm8994->vss_ena[path] || wm8994->hpf1_ena[path] ||
wm8994->hpf2_ena[path]) wm8994->hpf2_ena[path])
wm8958_dsp_start_vss(codec, path); wm8958_dsp_start_vss(component, path);
else if (wm8994->mbc_ena[path]) else if (wm8994->mbc_ena[path])
wm8958_dsp_start_mbc(codec, path); wm8958_dsp_start_mbc(component, path);
wm8994->dsp_active = path; wm8994->dsp_active = path;
dev_dbg(codec->dev, "DSP running in path %d\n", path); dev_dbg(component->dev, "DSP running in path %d\n", path);
} }
if (!start && wm8994->dsp_active == path) { if (!start && wm8994->dsp_active == path) {
@ -400,37 +400,37 @@ static void wm8958_dsp_apply(struct snd_soc_codec *codec, int path, int start)
if (!(reg & WM8958_DSP2_ENA)) if (!(reg & WM8958_DSP2_ENA))
return; return;
snd_soc_update_bits(codec, WM8958_DSP2_CONFIG, snd_soc_component_update_bits(component, WM8958_DSP2_CONFIG,
WM8958_MBC_ENA, 0); WM8958_MBC_ENA, 0);
snd_soc_write(codec, WM8958_DSP2_EXECCONTROL, snd_soc_component_write(component, WM8958_DSP2_EXECCONTROL,
WM8958_DSP2_STOP); WM8958_DSP2_STOP);
snd_soc_update_bits(codec, WM8958_DSP2_PROGRAM, snd_soc_component_update_bits(component, WM8958_DSP2_PROGRAM,
WM8958_DSP2_ENA, 0); WM8958_DSP2_ENA, 0);
snd_soc_update_bits(codec, WM8994_CLOCKING_1, snd_soc_component_update_bits(component, WM8994_CLOCKING_1,
WM8958_DSP2CLK_ENA, 0); WM8958_DSP2CLK_ENA, 0);
wm8994->dsp_active = -1; wm8994->dsp_active = -1;
dev_dbg(codec->dev, "DSP stopped\n"); dev_dbg(component->dev, "DSP stopped\n");
} }
} }
int wm8958_aif_ev(struct snd_soc_dapm_widget *w, int wm8958_aif_ev(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
int i; int i;
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
wm8958_dsp_apply(codec, i, 1); wm8958_dsp_apply(component, i, 1);
break; break;
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
wm8958_dsp_apply(codec, i, 0); wm8958_dsp_apply(component, i, 0);
break; break;
} }
@ -456,14 +456,14 @@ static int wm8958_dsp2_busy(struct wm8994_priv *wm8994, int aif)
static int wm8958_put_mbc_enum(struct snd_kcontrol *kcontrol, static int wm8958_put_mbc_enum(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
struct wm8994 *control = wm8994->wm8994; struct wm8994 *control = wm8994->wm8994;
int value = ucontrol->value.enumerated.item[0]; int value = ucontrol->value.enumerated.item[0];
int reg; int reg;
/* Don't allow on the fly reconfiguration */ /* Don't allow on the fly reconfiguration */
reg = snd_soc_read(codec, WM8994_CLOCKING_1); reg = snd_soc_component_read32(component, WM8994_CLOCKING_1);
if (reg < 0 || reg & WM8958_DSP2CLK_ENA) if (reg < 0 || reg & WM8958_DSP2CLK_ENA)
return -EBUSY; return -EBUSY;
@ -478,8 +478,8 @@ static int wm8958_put_mbc_enum(struct snd_kcontrol *kcontrol,
static int wm8958_get_mbc_enum(struct snd_kcontrol *kcontrol, static int wm8958_get_mbc_enum(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
ucontrol->value.enumerated.item[0] = wm8994->mbc_cfg; ucontrol->value.enumerated.item[0] = wm8994->mbc_cfg;
@ -500,8 +500,8 @@ static int wm8958_mbc_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
int mbc = kcontrol->private_value; int mbc = kcontrol->private_value;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
ucontrol->value.integer.value[0] = wm8994->mbc_ena[mbc]; ucontrol->value.integer.value[0] = wm8994->mbc_ena[mbc];
@ -512,8 +512,8 @@ static int wm8958_mbc_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
int mbc = kcontrol->private_value; int mbc = kcontrol->private_value;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
if (wm8994->mbc_ena[mbc] == ucontrol->value.integer.value[0]) if (wm8994->mbc_ena[mbc] == ucontrol->value.integer.value[0])
return 0; return 0;
@ -522,7 +522,7 @@ static int wm8958_mbc_put(struct snd_kcontrol *kcontrol,
return -EINVAL; return -EINVAL;
if (wm8958_dsp2_busy(wm8994, mbc)) { if (wm8958_dsp2_busy(wm8994, mbc)) {
dev_dbg(codec->dev, "DSP2 active on %d already\n", mbc); dev_dbg(component->dev, "DSP2 active on %d already\n", mbc);
return -EBUSY; return -EBUSY;
} }
@ -531,7 +531,7 @@ static int wm8958_mbc_put(struct snd_kcontrol *kcontrol,
wm8994->mbc_ena[mbc] = ucontrol->value.integer.value[0]; wm8994->mbc_ena[mbc] = ucontrol->value.integer.value[0];
wm8958_dsp_apply(codec, mbc, wm8994->mbc_ena[mbc]); wm8958_dsp_apply(component, mbc, wm8994->mbc_ena[mbc]);
return 0; return 0;
} }
@ -546,14 +546,14 @@ static int wm8958_mbc_put(struct snd_kcontrol *kcontrol,
static int wm8958_put_vss_enum(struct snd_kcontrol *kcontrol, static int wm8958_put_vss_enum(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
struct wm8994 *control = wm8994->wm8994; struct wm8994 *control = wm8994->wm8994;
int value = ucontrol->value.enumerated.item[0]; int value = ucontrol->value.enumerated.item[0];
int reg; int reg;
/* Don't allow on the fly reconfiguration */ /* Don't allow on the fly reconfiguration */
reg = snd_soc_read(codec, WM8994_CLOCKING_1); reg = snd_soc_component_read32(component, WM8994_CLOCKING_1);
if (reg < 0 || reg & WM8958_DSP2CLK_ENA) if (reg < 0 || reg & WM8958_DSP2CLK_ENA)
return -EBUSY; return -EBUSY;
@ -568,8 +568,8 @@ static int wm8958_put_vss_enum(struct snd_kcontrol *kcontrol,
static int wm8958_get_vss_enum(struct snd_kcontrol *kcontrol, static int wm8958_get_vss_enum(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
ucontrol->value.enumerated.item[0] = wm8994->vss_cfg; ucontrol->value.enumerated.item[0] = wm8994->vss_cfg;
@ -579,14 +579,14 @@ static int wm8958_get_vss_enum(struct snd_kcontrol *kcontrol,
static int wm8958_put_vss_hpf_enum(struct snd_kcontrol *kcontrol, static int wm8958_put_vss_hpf_enum(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
struct wm8994 *control = wm8994->wm8994; struct wm8994 *control = wm8994->wm8994;
int value = ucontrol->value.enumerated.item[0]; int value = ucontrol->value.enumerated.item[0];
int reg; int reg;
/* Don't allow on the fly reconfiguration */ /* Don't allow on the fly reconfiguration */
reg = snd_soc_read(codec, WM8994_CLOCKING_1); reg = snd_soc_component_read32(component, WM8994_CLOCKING_1);
if (reg < 0 || reg & WM8958_DSP2CLK_ENA) if (reg < 0 || reg & WM8958_DSP2CLK_ENA)
return -EBUSY; return -EBUSY;
@ -601,8 +601,8 @@ static int wm8958_put_vss_hpf_enum(struct snd_kcontrol *kcontrol,
static int wm8958_get_vss_hpf_enum(struct snd_kcontrol *kcontrol, static int wm8958_get_vss_hpf_enum(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
ucontrol->value.enumerated.item[0] = wm8994->vss_hpf_cfg; ucontrol->value.enumerated.item[0] = wm8994->vss_hpf_cfg;
@ -623,8 +623,8 @@ static int wm8958_vss_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
int vss = kcontrol->private_value; int vss = kcontrol->private_value;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
ucontrol->value.integer.value[0] = wm8994->vss_ena[vss]; ucontrol->value.integer.value[0] = wm8994->vss_ena[vss];
@ -635,8 +635,8 @@ static int wm8958_vss_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
int vss = kcontrol->private_value; int vss = kcontrol->private_value;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
if (wm8994->vss_ena[vss] == ucontrol->value.integer.value[0]) if (wm8994->vss_ena[vss] == ucontrol->value.integer.value[0])
return 0; return 0;
@ -648,7 +648,7 @@ static int wm8958_vss_put(struct snd_kcontrol *kcontrol,
return -ENODEV; return -ENODEV;
if (wm8958_dsp2_busy(wm8994, vss)) { if (wm8958_dsp2_busy(wm8994, vss)) {
dev_dbg(codec->dev, "DSP2 active on %d already\n", vss); dev_dbg(component->dev, "DSP2 active on %d already\n", vss);
return -EBUSY; return -EBUSY;
} }
@ -657,7 +657,7 @@ static int wm8958_vss_put(struct snd_kcontrol *kcontrol,
wm8994->vss_ena[vss] = ucontrol->value.integer.value[0]; wm8994->vss_ena[vss] = ucontrol->value.integer.value[0];
wm8958_dsp_apply(codec, vss, wm8994->vss_ena[vss]); wm8958_dsp_apply(component, vss, wm8994->vss_ena[vss]);
return 0; return 0;
} }
@ -684,8 +684,8 @@ static int wm8958_hpf_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
int hpf = kcontrol->private_value; int hpf = kcontrol->private_value;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
if (hpf < 3) if (hpf < 3)
ucontrol->value.integer.value[0] = wm8994->hpf1_ena[hpf % 3]; ucontrol->value.integer.value[0] = wm8994->hpf1_ena[hpf % 3];
@ -699,8 +699,8 @@ static int wm8958_hpf_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
int hpf = kcontrol->private_value; int hpf = kcontrol->private_value;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
if (hpf < 3) { if (hpf < 3) {
if (wm8994->hpf1_ena[hpf % 3] == if (wm8994->hpf1_ena[hpf % 3] ==
@ -719,7 +719,7 @@ static int wm8958_hpf_put(struct snd_kcontrol *kcontrol,
return -ENODEV; return -ENODEV;
if (wm8958_dsp2_busy(wm8994, hpf % 3)) { if (wm8958_dsp2_busy(wm8994, hpf % 3)) {
dev_dbg(codec->dev, "DSP2 active on %d already\n", hpf); dev_dbg(component->dev, "DSP2 active on %d already\n", hpf);
return -EBUSY; return -EBUSY;
} }
@ -731,7 +731,7 @@ static int wm8958_hpf_put(struct snd_kcontrol *kcontrol,
else else
wm8994->hpf2_ena[hpf % 3] = ucontrol->value.integer.value[0]; wm8994->hpf2_ena[hpf % 3] = ucontrol->value.integer.value[0];
wm8958_dsp_apply(codec, hpf % 3, ucontrol->value.integer.value[0]); wm8958_dsp_apply(component, hpf % 3, ucontrol->value.integer.value[0]);
return 0; return 0;
} }
@ -746,14 +746,14 @@ static int wm8958_hpf_put(struct snd_kcontrol *kcontrol,
static int wm8958_put_enh_eq_enum(struct snd_kcontrol *kcontrol, static int wm8958_put_enh_eq_enum(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
struct wm8994 *control = wm8994->wm8994; struct wm8994 *control = wm8994->wm8994;
int value = ucontrol->value.enumerated.item[0]; int value = ucontrol->value.enumerated.item[0];
int reg; int reg;
/* Don't allow on the fly reconfiguration */ /* Don't allow on the fly reconfiguration */
reg = snd_soc_read(codec, WM8994_CLOCKING_1); reg = snd_soc_component_read32(component, WM8994_CLOCKING_1);
if (reg < 0 || reg & WM8958_DSP2CLK_ENA) if (reg < 0 || reg & WM8958_DSP2CLK_ENA)
return -EBUSY; return -EBUSY;
@ -768,8 +768,8 @@ static int wm8958_put_enh_eq_enum(struct snd_kcontrol *kcontrol,
static int wm8958_get_enh_eq_enum(struct snd_kcontrol *kcontrol, static int wm8958_get_enh_eq_enum(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
ucontrol->value.enumerated.item[0] = wm8994->enh_eq_cfg; ucontrol->value.enumerated.item[0] = wm8994->enh_eq_cfg;
@ -790,8 +790,8 @@ static int wm8958_enh_eq_get(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
int eq = kcontrol->private_value; int eq = kcontrol->private_value;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
ucontrol->value.integer.value[0] = wm8994->enh_eq_ena[eq]; ucontrol->value.integer.value[0] = wm8994->enh_eq_ena[eq];
@ -802,8 +802,8 @@ static int wm8958_enh_eq_put(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
int eq = kcontrol->private_value; int eq = kcontrol->private_value;
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
if (wm8994->enh_eq_ena[eq] == ucontrol->value.integer.value[0]) if (wm8994->enh_eq_ena[eq] == ucontrol->value.integer.value[0])
return 0; return 0;
@ -815,7 +815,7 @@ static int wm8958_enh_eq_put(struct snd_kcontrol *kcontrol,
return -ENODEV; return -ENODEV;
if (wm8958_dsp2_busy(wm8994, eq)) { if (wm8958_dsp2_busy(wm8994, eq)) {
dev_dbg(codec->dev, "DSP2 active on %d already\n", eq); dev_dbg(component->dev, "DSP2 active on %d already\n", eq);
return -EBUSY; return -EBUSY;
} }
@ -825,7 +825,7 @@ static int wm8958_enh_eq_put(struct snd_kcontrol *kcontrol,
wm8994->enh_eq_ena[eq] = ucontrol->value.integer.value[0]; wm8994->enh_eq_ena[eq] = ucontrol->value.integer.value[0];
wm8958_dsp_apply(codec, eq, ucontrol->value.integer.value[0]); wm8958_dsp_apply(component, eq, ucontrol->value.integer.value[0]);
return 0; return 0;
} }
@ -863,10 +863,10 @@ WM8958_ENH_EQ_SWITCH("AIF2DAC Enhanced EQ Switch", 2),
static void wm8958_enh_eq_loaded(const struct firmware *fw, void *context) static void wm8958_enh_eq_loaded(const struct firmware *fw, void *context)
{ {
struct snd_soc_codec *codec = context; struct snd_soc_component *component = context;
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
if (fw && (wm8958_dsp2_fw(codec, "ENH_EQ", fw, true) == 0)) { if (fw && (wm8958_dsp2_fw(component, "ENH_EQ", fw, true) == 0)) {
mutex_lock(&wm8994->fw_lock); mutex_lock(&wm8994->fw_lock);
wm8994->enh_eq = fw; wm8994->enh_eq = fw;
mutex_unlock(&wm8994->fw_lock); mutex_unlock(&wm8994->fw_lock);
@ -875,10 +875,10 @@ static void wm8958_enh_eq_loaded(const struct firmware *fw, void *context)
static void wm8958_mbc_vss_loaded(const struct firmware *fw, void *context) static void wm8958_mbc_vss_loaded(const struct firmware *fw, void *context)
{ {
struct snd_soc_codec *codec = context; struct snd_soc_component *component = context;
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
if (fw && (wm8958_dsp2_fw(codec, "MBC+VSS", fw, true) == 0)) { if (fw && (wm8958_dsp2_fw(component, "MBC+VSS", fw, true) == 0)) {
mutex_lock(&wm8994->fw_lock); mutex_lock(&wm8994->fw_lock);
wm8994->mbc_vss = fw; wm8994->mbc_vss = fw;
mutex_unlock(&wm8994->fw_lock); mutex_unlock(&wm8994->fw_lock);
@ -887,43 +887,43 @@ static void wm8958_mbc_vss_loaded(const struct firmware *fw, void *context)
static void wm8958_mbc_loaded(const struct firmware *fw, void *context) static void wm8958_mbc_loaded(const struct firmware *fw, void *context)
{ {
struct snd_soc_codec *codec = context; struct snd_soc_component *component = context;
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
if (fw && (wm8958_dsp2_fw(codec, "MBC", fw, true) == 0)) { if (fw && (wm8958_dsp2_fw(component, "MBC", fw, true) == 0)) {
mutex_lock(&wm8994->fw_lock); mutex_lock(&wm8994->fw_lock);
wm8994->mbc = fw; wm8994->mbc = fw;
mutex_unlock(&wm8994->fw_lock); mutex_unlock(&wm8994->fw_lock);
} }
} }
void wm8958_dsp2_init(struct snd_soc_codec *codec) void wm8958_dsp2_init(struct snd_soc_component *component)
{ {
struct wm8994_priv *wm8994 = snd_soc_codec_get_drvdata(codec); struct wm8994_priv *wm8994 = snd_soc_component_get_drvdata(component);
struct wm8994 *control = wm8994->wm8994; struct wm8994 *control = wm8994->wm8994;
struct wm8994_pdata *pdata = &control->pdata; struct wm8994_pdata *pdata = &control->pdata;
int ret, i; int ret, i;
wm8994->dsp_active = -1; wm8994->dsp_active = -1;
snd_soc_add_codec_controls(codec, wm8958_mbc_snd_controls, snd_soc_add_component_controls(component, wm8958_mbc_snd_controls,
ARRAY_SIZE(wm8958_mbc_snd_controls)); ARRAY_SIZE(wm8958_mbc_snd_controls));
snd_soc_add_codec_controls(codec, wm8958_vss_snd_controls, snd_soc_add_component_controls(component, wm8958_vss_snd_controls,
ARRAY_SIZE(wm8958_vss_snd_controls)); ARRAY_SIZE(wm8958_vss_snd_controls));
snd_soc_add_codec_controls(codec, wm8958_enh_eq_snd_controls, snd_soc_add_component_controls(component, wm8958_enh_eq_snd_controls,
ARRAY_SIZE(wm8958_enh_eq_snd_controls)); ARRAY_SIZE(wm8958_enh_eq_snd_controls));
/* We don't *require* firmware and don't want to delay boot */ /* We don't *require* firmware and don't want to delay boot */
request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG,
"wm8958_mbc.wfw", codec->dev, GFP_KERNEL, "wm8958_mbc.wfw", component->dev, GFP_KERNEL,
codec, wm8958_mbc_loaded); component, wm8958_mbc_loaded);
request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG,
"wm8958_mbc_vss.wfw", codec->dev, GFP_KERNEL, "wm8958_mbc_vss.wfw", component->dev, GFP_KERNEL,
codec, wm8958_mbc_vss_loaded); component, wm8958_mbc_vss_loaded);
request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG, request_firmware_nowait(THIS_MODULE, FW_ACTION_HOTPLUG,
"wm8958_enh_eq.wfw", codec->dev, GFP_KERNEL, "wm8958_enh_eq.wfw", component->dev, GFP_KERNEL,
codec, wm8958_enh_eq_loaded); component, wm8958_enh_eq_loaded);
if (pdata->num_mbc_cfgs) { if (pdata->num_mbc_cfgs) {
struct snd_kcontrol_new control[] = { struct snd_kcontrol_new control[] = {
@ -943,10 +943,10 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
wm8994->mbc_enum.items = pdata->num_mbc_cfgs; wm8994->mbc_enum.items = pdata->num_mbc_cfgs;
wm8994->mbc_enum.texts = wm8994->mbc_texts; wm8994->mbc_enum.texts = wm8994->mbc_texts;
ret = snd_soc_add_codec_controls(wm8994->hubs.codec, ret = snd_soc_add_component_controls(wm8994->hubs.component,
control, 1); control, 1);
if (ret != 0) if (ret != 0)
dev_err(wm8994->hubs.codec->dev, dev_err(wm8994->hubs.component->dev,
"Failed to add MBC mode controls: %d\n", ret); "Failed to add MBC mode controls: %d\n", ret);
} }
@ -968,10 +968,10 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
wm8994->vss_enum.items = pdata->num_vss_cfgs; wm8994->vss_enum.items = pdata->num_vss_cfgs;
wm8994->vss_enum.texts = wm8994->vss_texts; wm8994->vss_enum.texts = wm8994->vss_texts;
ret = snd_soc_add_codec_controls(wm8994->hubs.codec, ret = snd_soc_add_component_controls(wm8994->hubs.component,
control, 1); control, 1);
if (ret != 0) if (ret != 0)
dev_err(wm8994->hubs.codec->dev, dev_err(wm8994->hubs.component->dev,
"Failed to add VSS mode controls: %d\n", ret); "Failed to add VSS mode controls: %d\n", ret);
} }
@ -994,10 +994,10 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
wm8994->vss_hpf_enum.items = pdata->num_vss_hpf_cfgs; wm8994->vss_hpf_enum.items = pdata->num_vss_hpf_cfgs;
wm8994->vss_hpf_enum.texts = wm8994->vss_hpf_texts; wm8994->vss_hpf_enum.texts = wm8994->vss_hpf_texts;
ret = snd_soc_add_codec_controls(wm8994->hubs.codec, ret = snd_soc_add_component_controls(wm8994->hubs.component,
control, 1); control, 1);
if (ret != 0) if (ret != 0)
dev_err(wm8994->hubs.codec->dev, dev_err(wm8994->hubs.component->dev,
"Failed to add VSS HPFmode controls: %d\n", "Failed to add VSS HPFmode controls: %d\n",
ret); ret);
} }
@ -1021,10 +1021,10 @@ void wm8958_dsp2_init(struct snd_soc_codec *codec)
wm8994->enh_eq_enum.items = pdata->num_enh_eq_cfgs; wm8994->enh_eq_enum.items = pdata->num_enh_eq_cfgs;
wm8994->enh_eq_enum.texts = wm8994->enh_eq_texts; wm8994->enh_eq_enum.texts = wm8994->enh_eq_texts;
ret = snd_soc_add_codec_controls(wm8994->hubs.codec, ret = snd_soc_add_component_controls(wm8994->hubs.component,
control, 1); control, 1);
if (ret != 0) if (ret != 0)
dev_err(wm8994->hubs.codec->dev, dev_err(wm8994->hubs.component->dev,
"Failed to add enhanced EQ controls: %d\n", "Failed to add enhanced EQ controls: %d\n",
ret); ret);
} }

237
sound/soc/codecs/wm8993.c
View File

@ -466,11 +466,11 @@ static int fll_factors(struct _fll_div *fll_div, unsigned int Fref,
return 0; return 0;
} }
static int _wm8993_set_fll(struct snd_soc_codec *codec, int fll_id, int source, static int _wm8993_set_fll(struct snd_soc_component *component, int fll_id, int source,
unsigned int Fref, unsigned int Fout) unsigned int Fref, unsigned int Fout)
{ {
struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); struct wm8993_priv *wm8993 = snd_soc_component_get_drvdata(component);
struct i2c_client *i2c = to_i2c_client(codec->dev); struct i2c_client *i2c = to_i2c_client(component->dev);
u16 reg1, reg4, reg5; u16 reg1, reg4, reg5;
struct _fll_div fll_div; struct _fll_div fll_div;
unsigned int timeout; unsigned int timeout;
@ -482,13 +482,13 @@ static int _wm8993_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
/* Disable the FLL */ /* Disable the FLL */
if (Fout == 0) { if (Fout == 0) {
dev_dbg(codec->dev, "FLL disabled\n"); dev_dbg(component->dev, "FLL disabled\n");
wm8993->fll_fref = 0; wm8993->fll_fref = 0;
wm8993->fll_fout = 0; wm8993->fll_fout = 0;
reg1 = snd_soc_read(codec, WM8993_FLL_CONTROL_1); reg1 = snd_soc_component_read32(component, WM8993_FLL_CONTROL_1);
reg1 &= ~WM8993_FLL_ENA; reg1 &= ~WM8993_FLL_ENA;
snd_soc_write(codec, WM8993_FLL_CONTROL_1, reg1); snd_soc_component_write(component, WM8993_FLL_CONTROL_1, reg1);
return 0; return 0;
} }
@ -497,7 +497,7 @@ static int _wm8993_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
if (ret != 0) if (ret != 0)
return ret; return ret;
reg5 = snd_soc_read(codec, WM8993_FLL_CONTROL_5); reg5 = snd_soc_component_read32(component, WM8993_FLL_CONTROL_5);
reg5 &= ~WM8993_FLL_CLK_SRC_MASK; reg5 &= ~WM8993_FLL_CLK_SRC_MASK;
switch (fll_id) { switch (fll_id) {
@ -513,36 +513,36 @@ static int _wm8993_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
break; break;
default: default:
dev_err(codec->dev, "Unknown FLL ID %d\n", fll_id); dev_err(component->dev, "Unknown FLL ID %d\n", fll_id);
return -EINVAL; return -EINVAL;
} }
/* Any FLL configuration change requires that the FLL be /* Any FLL configuration change requires that the FLL be
* disabled first. */ * disabled first. */
reg1 = snd_soc_read(codec, WM8993_FLL_CONTROL_1); reg1 = snd_soc_component_read32(component, WM8993_FLL_CONTROL_1);
reg1 &= ~WM8993_FLL_ENA; reg1 &= ~WM8993_FLL_ENA;
snd_soc_write(codec, WM8993_FLL_CONTROL_1, reg1); snd_soc_component_write(component, WM8993_FLL_CONTROL_1, reg1);
/* Apply the configuration */ /* Apply the configuration */
if (fll_div.k) if (fll_div.k)
reg1 |= WM8993_FLL_FRAC_MASK; reg1 |= WM8993_FLL_FRAC_MASK;
else else
reg1 &= ~WM8993_FLL_FRAC_MASK; reg1 &= ~WM8993_FLL_FRAC_MASK;
snd_soc_write(codec, WM8993_FLL_CONTROL_1, reg1); snd_soc_component_write(component, WM8993_FLL_CONTROL_1, reg1);
snd_soc_write(codec, WM8993_FLL_CONTROL_2, snd_soc_component_write(component, WM8993_FLL_CONTROL_2,
(fll_div.fll_outdiv << WM8993_FLL_OUTDIV_SHIFT) | (fll_div.fll_outdiv << WM8993_FLL_OUTDIV_SHIFT) |
(fll_div.fll_fratio << WM8993_FLL_FRATIO_SHIFT)); (fll_div.fll_fratio << WM8993_FLL_FRATIO_SHIFT));
snd_soc_write(codec, WM8993_FLL_CONTROL_3, fll_div.k); snd_soc_component_write(component, WM8993_FLL_CONTROL_3, fll_div.k);
reg4 = snd_soc_read(codec, WM8993_FLL_CONTROL_4); reg4 = snd_soc_component_read32(component, WM8993_FLL_CONTROL_4);
reg4 &= ~WM8993_FLL_N_MASK; reg4 &= ~WM8993_FLL_N_MASK;
reg4 |= fll_div.n << WM8993_FLL_N_SHIFT; reg4 |= fll_div.n << WM8993_FLL_N_SHIFT;
snd_soc_write(codec, WM8993_FLL_CONTROL_4, reg4); snd_soc_component_write(component, WM8993_FLL_CONTROL_4, reg4);
reg5 &= ~WM8993_FLL_CLK_REF_DIV_MASK; reg5 &= ~WM8993_FLL_CLK_REF_DIV_MASK;
reg5 |= fll_div.fll_clk_ref_div << WM8993_FLL_CLK_REF_DIV_SHIFT; reg5 |= fll_div.fll_clk_ref_div << WM8993_FLL_CLK_REF_DIV_SHIFT;
snd_soc_write(codec, WM8993_FLL_CONTROL_5, reg5); snd_soc_component_write(component, WM8993_FLL_CONTROL_5, reg5);
/* If we've got an interrupt wired up make sure we get it */ /* If we've got an interrupt wired up make sure we get it */
if (i2c->irq) if (i2c->irq)
@ -555,13 +555,13 @@ static int _wm8993_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
try_wait_for_completion(&wm8993->fll_lock); try_wait_for_completion(&wm8993->fll_lock);
/* Enable the FLL */ /* Enable the FLL */
snd_soc_write(codec, WM8993_FLL_CONTROL_1, reg1 | WM8993_FLL_ENA); snd_soc_component_write(component, WM8993_FLL_CONTROL_1, reg1 | WM8993_FLL_ENA);
timeout = wait_for_completion_timeout(&wm8993->fll_lock, timeout); timeout = wait_for_completion_timeout(&wm8993->fll_lock, timeout);
if (i2c->irq && !timeout) if (i2c->irq && !timeout)
dev_warn(codec->dev, "Timed out waiting for FLL\n"); dev_warn(component->dev, "Timed out waiting for FLL\n");
dev_dbg(codec->dev, "FLL enabled at %dHz->%dHz\n", Fref, Fout); dev_dbg(component->dev, "FLL enabled at %dHz->%dHz\n", Fref, Fout);
wm8993->fll_fref = Fref; wm8993->fll_fref = Fref;
wm8993->fll_fout = Fout; wm8993->fll_fout = Fout;
@ -573,20 +573,20 @@ static int _wm8993_set_fll(struct snd_soc_codec *codec, int fll_id, int source,
static int wm8993_set_fll(struct snd_soc_dai *dai, int fll_id, int source, static int wm8993_set_fll(struct snd_soc_dai *dai, int fll_id, int source,
unsigned int Fref, unsigned int Fout) unsigned int Fref, unsigned int Fout)
{ {
return _wm8993_set_fll(dai->codec, fll_id, source, Fref, Fout); return _wm8993_set_fll(dai->component, fll_id, source, Fref, Fout);
} }
static int configure_clock(struct snd_soc_codec *codec) static int configure_clock(struct snd_soc_component *component)
{ {
struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); struct wm8993_priv *wm8993 = snd_soc_component_get_drvdata(component);
unsigned int reg; unsigned int reg;
/* This should be done on init() for bypass paths */ /* This should be done on init() for bypass paths */
switch (wm8993->sysclk_source) { switch (wm8993->sysclk_source) {
case WM8993_SYSCLK_MCLK: case WM8993_SYSCLK_MCLK:
dev_dbg(codec->dev, "Using %dHz MCLK\n", wm8993->mclk_rate); dev_dbg(component->dev, "Using %dHz MCLK\n", wm8993->mclk_rate);
reg = snd_soc_read(codec, WM8993_CLOCKING_2); reg = snd_soc_component_read32(component, WM8993_CLOCKING_2);
reg &= ~(WM8993_MCLK_DIV | WM8993_SYSCLK_SRC); reg &= ~(WM8993_MCLK_DIV | WM8993_SYSCLK_SRC);
if (wm8993->mclk_rate > 13500000) { if (wm8993->mclk_rate > 13500000) {
reg |= WM8993_MCLK_DIV; reg |= WM8993_MCLK_DIV;
@ -595,14 +595,14 @@ static int configure_clock(struct snd_soc_codec *codec)
reg &= ~WM8993_MCLK_DIV; reg &= ~WM8993_MCLK_DIV;
wm8993->sysclk_rate = wm8993->mclk_rate; wm8993->sysclk_rate = wm8993->mclk_rate;
} }
snd_soc_write(codec, WM8993_CLOCKING_2, reg); snd_soc_component_write(component, WM8993_CLOCKING_2, reg);
break; break;
case WM8993_SYSCLK_FLL: case WM8993_SYSCLK_FLL:
dev_dbg(codec->dev, "Using %dHz FLL clock\n", dev_dbg(component->dev, "Using %dHz FLL clock\n",
wm8993->fll_fout); wm8993->fll_fout);
reg = snd_soc_read(codec, WM8993_CLOCKING_2); reg = snd_soc_component_read32(component, WM8993_CLOCKING_2);
reg |= WM8993_SYSCLK_SRC; reg |= WM8993_SYSCLK_SRC;
if (wm8993->fll_fout > 13500000) { if (wm8993->fll_fout > 13500000) {
reg |= WM8993_MCLK_DIV; reg |= WM8993_MCLK_DIV;
@ -611,15 +611,15 @@ static int configure_clock(struct snd_soc_codec *codec)
reg &= ~WM8993_MCLK_DIV; reg &= ~WM8993_MCLK_DIV;
wm8993->sysclk_rate = wm8993->fll_fout; wm8993->sysclk_rate = wm8993->fll_fout;
} }
snd_soc_write(codec, WM8993_CLOCKING_2, reg); snd_soc_component_write(component, WM8993_CLOCKING_2, reg);
break; break;
default: default:
dev_err(codec->dev, "System clock not configured\n"); dev_err(component->dev, "System clock not configured\n");
return -EINVAL; return -EINVAL;
} }
dev_dbg(codec->dev, "CLK_SYS is %dHz\n", wm8993->sysclk_rate); dev_dbg(component->dev, "CLK_SYS is %dHz\n", wm8993->sysclk_rate);
return 0; return 0;
} }
@ -809,11 +809,11 @@ SOC_SINGLE_TLV("EQ5 Volume", WM8993_EQ6, 0, 24, 0, eq_tlv),
static int clk_sys_event(struct snd_soc_dapm_widget *w, static int clk_sys_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
switch (event) { switch (event) {
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
return configure_clock(codec); return configure_clock(component);
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
break; break;
@ -972,26 +972,26 @@ static const struct snd_soc_dapm_route routes[] = {
{ "Right Headphone Mux", "DAC", "DACR" }, { "Right Headphone Mux", "DAC", "DACR" },
}; };
static int wm8993_set_bias_level(struct snd_soc_codec *codec, static int wm8993_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); struct wm8993_priv *wm8993 = snd_soc_component_get_drvdata(component);
int ret; int ret;
wm_hubs_set_bias_level(codec, level); wm_hubs_set_bias_level(component, level);
switch (level) { switch (level) {
case SND_SOC_BIAS_ON: case SND_SOC_BIAS_ON:
case SND_SOC_BIAS_PREPARE: case SND_SOC_BIAS_PREPARE:
/* VMID=2*40k */ /* VMID=2*40k */
snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8993_POWER_MANAGEMENT_1,
WM8993_VMID_SEL_MASK, 0x2); WM8993_VMID_SEL_MASK, 0x2);
snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_2, snd_soc_component_update_bits(component, WM8993_POWER_MANAGEMENT_2,
WM8993_TSHUT_ENA, WM8993_TSHUT_ENA); WM8993_TSHUT_ENA, WM8993_TSHUT_ENA);
break; break;
case SND_SOC_BIAS_STANDBY: case SND_SOC_BIAS_STANDBY:
if (snd_soc_codec_get_bias_level(codec) == SND_SOC_BIAS_OFF) { if (snd_soc_component_get_bias_level(component) == SND_SOC_BIAS_OFF) {
ret = regulator_bulk_enable(ARRAY_SIZE(wm8993->supplies), ret = regulator_bulk_enable(ARRAY_SIZE(wm8993->supplies),
wm8993->supplies); wm8993->supplies);
if (ret != 0) if (ret != 0)
@ -1000,10 +1000,10 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec,
regcache_cache_only(wm8993->regmap, false); regcache_cache_only(wm8993->regmap, false);
regcache_sync(wm8993->regmap); regcache_sync(wm8993->regmap);
wm_hubs_vmid_ena(codec); wm_hubs_vmid_ena(component);
/* Bring up VMID with fast soft start */ /* Bring up VMID with fast soft start */
snd_soc_update_bits(codec, WM8993_ANTIPOP2, snd_soc_component_update_bits(component, WM8993_ANTIPOP2,
WM8993_STARTUP_BIAS_ENA | WM8993_STARTUP_BIAS_ENA |
WM8993_VMID_BUF_ENA | WM8993_VMID_BUF_ENA |
WM8993_VMID_RAMP_MASK | WM8993_VMID_RAMP_MASK |
@ -1017,40 +1017,40 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec,
* need the VMID buffer */ * need the VMID buffer */
if (!wm8993->pdata.lineout1_diff || if (!wm8993->pdata.lineout1_diff ||
!wm8993->pdata.lineout2_diff) !wm8993->pdata.lineout2_diff)
snd_soc_update_bits(codec, WM8993_ANTIPOP1, snd_soc_component_update_bits(component, WM8993_ANTIPOP1,
WM8993_LINEOUT_VMID_BUF_ENA, WM8993_LINEOUT_VMID_BUF_ENA,
WM8993_LINEOUT_VMID_BUF_ENA); WM8993_LINEOUT_VMID_BUF_ENA);
/* VMID=2*40k */ /* VMID=2*40k */
snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8993_POWER_MANAGEMENT_1,
WM8993_VMID_SEL_MASK | WM8993_VMID_SEL_MASK |
WM8993_BIAS_ENA, WM8993_BIAS_ENA,
WM8993_BIAS_ENA | 0x2); WM8993_BIAS_ENA | 0x2);
msleep(32); msleep(32);
/* Switch to normal bias */ /* Switch to normal bias */
snd_soc_update_bits(codec, WM8993_ANTIPOP2, snd_soc_component_update_bits(component, WM8993_ANTIPOP2,
WM8993_BIAS_SRC | WM8993_BIAS_SRC |
WM8993_STARTUP_BIAS_ENA, 0); WM8993_STARTUP_BIAS_ENA, 0);
} }
/* VMID=2*240k */ /* VMID=2*240k */
snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8993_POWER_MANAGEMENT_1,
WM8993_VMID_SEL_MASK, 0x4); WM8993_VMID_SEL_MASK, 0x4);
snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_2, snd_soc_component_update_bits(component, WM8993_POWER_MANAGEMENT_2,
WM8993_TSHUT_ENA, 0); WM8993_TSHUT_ENA, 0);
break; break;
case SND_SOC_BIAS_OFF: case SND_SOC_BIAS_OFF:
snd_soc_update_bits(codec, WM8993_ANTIPOP1, snd_soc_component_update_bits(component, WM8993_ANTIPOP1,
WM8993_LINEOUT_VMID_BUF_ENA, 0); WM8993_LINEOUT_VMID_BUF_ENA, 0);
snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8993_POWER_MANAGEMENT_1,
WM8993_VMID_SEL_MASK | WM8993_BIAS_ENA, WM8993_VMID_SEL_MASK | WM8993_BIAS_ENA,
0); 0);
snd_soc_update_bits(codec, WM8993_ANTIPOP2, snd_soc_component_update_bits(component, WM8993_ANTIPOP2,
WM8993_STARTUP_BIAS_ENA | WM8993_STARTUP_BIAS_ENA |
WM8993_VMID_BUF_ENA | WM8993_VMID_BUF_ENA |
WM8993_VMID_RAMP_MASK | WM8993_VMID_RAMP_MASK |
@ -1070,8 +1070,8 @@ static int wm8993_set_bias_level(struct snd_soc_codec *codec,
static int wm8993_set_sysclk(struct snd_soc_dai *codec_dai, static int wm8993_set_sysclk(struct snd_soc_dai *codec_dai,
int clk_id, unsigned int freq, int dir) int clk_id, unsigned int freq, int dir)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); struct wm8993_priv *wm8993 = snd_soc_component_get_drvdata(component);
switch (clk_id) { switch (clk_id) {
case WM8993_SYSCLK_MCLK: case WM8993_SYSCLK_MCLK:
@ -1091,10 +1091,10 @@ static int wm8993_set_sysclk(struct snd_soc_dai *codec_dai,
static int wm8993_set_dai_fmt(struct snd_soc_dai *dai, static int wm8993_set_dai_fmt(struct snd_soc_dai *dai,
unsigned int fmt) unsigned int fmt)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); struct wm8993_priv *wm8993 = snd_soc_component_get_drvdata(component);
unsigned int aif1 = snd_soc_read(codec, WM8993_AUDIO_INTERFACE_1); unsigned int aif1 = snd_soc_component_read32(component, WM8993_AUDIO_INTERFACE_1);
unsigned int aif4 = snd_soc_read(codec, WM8993_AUDIO_INTERFACE_4); unsigned int aif4 = snd_soc_component_read32(component, WM8993_AUDIO_INTERFACE_4);
aif1 &= ~(WM8993_BCLK_DIR | WM8993_AIF_BCLK_INV | aif1 &= ~(WM8993_BCLK_DIR | WM8993_AIF_BCLK_INV |
WM8993_AIF_LRCLK_INV | WM8993_AIF_FMT_MASK); WM8993_AIF_LRCLK_INV | WM8993_AIF_FMT_MASK);
@ -1178,8 +1178,8 @@ static int wm8993_set_dai_fmt(struct snd_soc_dai *dai,
return -EINVAL; return -EINVAL;
} }
snd_soc_write(codec, WM8993_AUDIO_INTERFACE_1, aif1); snd_soc_component_write(component, WM8993_AUDIO_INTERFACE_1, aif1);
snd_soc_write(codec, WM8993_AUDIO_INTERFACE_4, aif4); snd_soc_component_write(component, WM8993_AUDIO_INTERFACE_4, aif4);
return 0; return 0;
} }
@ -1188,28 +1188,28 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream,
struct snd_pcm_hw_params *params, struct snd_pcm_hw_params *params,
struct snd_soc_dai *dai) struct snd_soc_dai *dai)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); struct wm8993_priv *wm8993 = snd_soc_component_get_drvdata(component);
int ret, i, best, best_val, cur_val; int ret, i, best, best_val, cur_val;
unsigned int clocking1, clocking3, aif1, aif4; unsigned int clocking1, clocking3, aif1, aif4;
clocking1 = snd_soc_read(codec, WM8993_CLOCKING_1); clocking1 = snd_soc_component_read32(component, WM8993_CLOCKING_1);
clocking1 &= ~WM8993_BCLK_DIV_MASK; clocking1 &= ~WM8993_BCLK_DIV_MASK;
clocking3 = snd_soc_read(codec, WM8993_CLOCKING_3); clocking3 = snd_soc_component_read32(component, WM8993_CLOCKING_3);
clocking3 &= ~(WM8993_CLK_SYS_RATE_MASK | WM8993_SAMPLE_RATE_MASK); clocking3 &= ~(WM8993_CLK_SYS_RATE_MASK | WM8993_SAMPLE_RATE_MASK);
aif1 = snd_soc_read(codec, WM8993_AUDIO_INTERFACE_1); aif1 = snd_soc_component_read32(component, WM8993_AUDIO_INTERFACE_1);
aif1 &= ~WM8993_AIF_WL_MASK; aif1 &= ~WM8993_AIF_WL_MASK;
aif4 = snd_soc_read(codec, WM8993_AUDIO_INTERFACE_4); aif4 = snd_soc_component_read32(component, WM8993_AUDIO_INTERFACE_4);
aif4 &= ~WM8993_LRCLK_RATE_MASK; aif4 &= ~WM8993_LRCLK_RATE_MASK;
/* What BCLK do we need? */ /* What BCLK do we need? */
wm8993->fs = params_rate(params); wm8993->fs = params_rate(params);
wm8993->bclk = 2 * wm8993->fs; wm8993->bclk = 2 * wm8993->fs;
if (wm8993->tdm_slots) { if (wm8993->tdm_slots) {
dev_dbg(codec->dev, "Configuring for %d %d bit TDM slots\n", dev_dbg(component->dev, "Configuring for %d %d bit TDM slots\n",
wm8993->tdm_slots, wm8993->tdm_width); wm8993->tdm_slots, wm8993->tdm_width);
wm8993->bclk *= wm8993->tdm_width * wm8993->tdm_slots; wm8993->bclk *= wm8993->tdm_width * wm8993->tdm_slots;
} else { } else {
@ -1234,9 +1234,9 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream,
} }
} }
dev_dbg(codec->dev, "Target BCLK is %dHz\n", wm8993->bclk); dev_dbg(component->dev, "Target BCLK is %dHz\n", wm8993->bclk);
ret = configure_clock(codec); ret = configure_clock(component);
if (ret != 0) if (ret != 0)
return ret; return ret;
@ -1252,7 +1252,7 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream,
best_val = cur_val; best_val = cur_val;
} }
} }
dev_dbg(codec->dev, "Selected CLK_SYS_RATIO of %d\n", dev_dbg(component->dev, "Selected CLK_SYS_RATIO of %d\n",
clk_sys_rates[best].ratio); clk_sys_rates[best].ratio);
clocking3 |= (clk_sys_rates[best].clk_sys_rate clocking3 |= (clk_sys_rates[best].clk_sys_rate
<< WM8993_CLK_SYS_RATE_SHIFT); << WM8993_CLK_SYS_RATE_SHIFT);
@ -1268,7 +1268,7 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream,
best_val = cur_val; best_val = cur_val;
} }
} }
dev_dbg(codec->dev, "Selected SAMPLE_RATE of %dHz\n", dev_dbg(component->dev, "Selected SAMPLE_RATE of %dHz\n",
sample_rates[best].rate); sample_rates[best].rate);
clocking3 |= (sample_rates[best].sample_rate clocking3 |= (sample_rates[best].sample_rate
<< WM8993_SAMPLE_RATE_SHIFT); << WM8993_SAMPLE_RATE_SHIFT);
@ -1287,22 +1287,22 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream,
} }
} }
wm8993->bclk = (wm8993->sysclk_rate * 10) / bclk_divs[best].div; wm8993->bclk = (wm8993->sysclk_rate * 10) / bclk_divs[best].div;
dev_dbg(codec->dev, "Selected BCLK_DIV of %d for %dHz BCLK\n", dev_dbg(component->dev, "Selected BCLK_DIV of %d for %dHz BCLK\n",
bclk_divs[best].div, wm8993->bclk); bclk_divs[best].div, wm8993->bclk);
clocking1 |= bclk_divs[best].bclk_div << WM8993_BCLK_DIV_SHIFT; clocking1 |= bclk_divs[best].bclk_div << WM8993_BCLK_DIV_SHIFT;
/* LRCLK is a simple fraction of BCLK */ /* LRCLK is a simple fraction of BCLK */
dev_dbg(codec->dev, "LRCLK_RATE is %d\n", wm8993->bclk / wm8993->fs); dev_dbg(component->dev, "LRCLK_RATE is %d\n", wm8993->bclk / wm8993->fs);
aif4 |= wm8993->bclk / wm8993->fs; aif4 |= wm8993->bclk / wm8993->fs;
snd_soc_write(codec, WM8993_CLOCKING_1, clocking1); snd_soc_component_write(component, WM8993_CLOCKING_1, clocking1);
snd_soc_write(codec, WM8993_CLOCKING_3, clocking3); snd_soc_component_write(component, WM8993_CLOCKING_3, clocking3);
snd_soc_write(codec, WM8993_AUDIO_INTERFACE_1, aif1); snd_soc_component_write(component, WM8993_AUDIO_INTERFACE_1, aif1);
snd_soc_write(codec, WM8993_AUDIO_INTERFACE_4, aif4); snd_soc_component_write(component, WM8993_AUDIO_INTERFACE_4, aif4);
/* ReTune Mobile? */ /* ReTune Mobile? */
if (wm8993->pdata.num_retune_configs) { if (wm8993->pdata.num_retune_configs) {
u16 eq1 = snd_soc_read(codec, WM8993_EQ1); u16 eq1 = snd_soc_component_read32(component, WM8993_EQ1);
struct wm8993_retune_mobile_setting *s; struct wm8993_retune_mobile_setting *s;
best = 0; best = 0;
@ -1318,16 +1318,16 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream,
} }
s = &wm8993->pdata.retune_configs[best]; s = &wm8993->pdata.retune_configs[best];
dev_dbg(codec->dev, "ReTune Mobile %s tuned for %dHz\n", dev_dbg(component->dev, "ReTune Mobile %s tuned for %dHz\n",
s->name, s->rate); s->name, s->rate);
/* Disable EQ while we reconfigure */ /* Disable EQ while we reconfigure */
snd_soc_update_bits(codec, WM8993_EQ1, WM8993_EQ_ENA, 0); snd_soc_component_update_bits(component, WM8993_EQ1, WM8993_EQ_ENA, 0);
for (i = 1; i < ARRAY_SIZE(s->config); i++) for (i = 1; i < ARRAY_SIZE(s->config); i++)
snd_soc_write(codec, WM8993_EQ1 + i, s->config[i]); snd_soc_component_write(component, WM8993_EQ1 + i, s->config[i]);
snd_soc_update_bits(codec, WM8993_EQ1, WM8993_EQ_ENA, eq1); snd_soc_component_update_bits(component, WM8993_EQ1, WM8993_EQ_ENA, eq1);
} }
return 0; return 0;
@ -1335,17 +1335,17 @@ static int wm8993_hw_params(struct snd_pcm_substream *substream,
static int wm8993_digital_mute(struct snd_soc_dai *codec_dai, int mute) static int wm8993_digital_mute(struct snd_soc_dai *codec_dai, int mute)
{ {
struct snd_soc_codec *codec = codec_dai->codec; struct snd_soc_component *component = codec_dai->component;
unsigned int reg; unsigned int reg;
reg = snd_soc_read(codec, WM8993_DAC_CTRL); reg = snd_soc_component_read32(component, WM8993_DAC_CTRL);
if (mute) if (mute)
reg |= WM8993_DAC_MUTE; reg |= WM8993_DAC_MUTE;
else else
reg &= ~WM8993_DAC_MUTE; reg &= ~WM8993_DAC_MUTE;
snd_soc_write(codec, WM8993_DAC_CTRL, reg); snd_soc_component_write(component, WM8993_DAC_CTRL, reg);
return 0; return 0;
} }
@ -1353,8 +1353,8 @@ static int wm8993_digital_mute(struct snd_soc_dai *codec_dai, int mute)
static int wm8993_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask, static int wm8993_set_tdm_slot(struct snd_soc_dai *dai, unsigned int tx_mask,
unsigned int rx_mask, int slots, int slot_width) unsigned int rx_mask, int slots, int slot_width)
{ {
struct snd_soc_codec *codec = dai->codec; struct snd_soc_component *component = dai->component;
struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); struct wm8993_priv *wm8993 = snd_soc_component_get_drvdata(component);
int aif1 = 0; int aif1 = 0;
int aif2 = 0; int aif2 = 0;
@ -1396,9 +1396,9 @@ out:
wm8993->tdm_width = slot_width; wm8993->tdm_width = slot_width;
wm8993->tdm_slots = slots / 2; wm8993->tdm_slots = slots / 2;
snd_soc_update_bits(codec, WM8993_AUDIO_INTERFACE_1, snd_soc_component_update_bits(component, WM8993_AUDIO_INTERFACE_1,
WM8993_AIFADC_TDM | WM8993_AIFADC_TDM_CHAN, aif1); WM8993_AIFADC_TDM | WM8993_AIFADC_TDM_CHAN, aif1);
snd_soc_update_bits(codec, WM8993_AUDIO_INTERFACE_2, snd_soc_component_update_bits(component, WM8993_AUDIO_INTERFACE_2,
WM8993_AIFDAC_TDM | WM8993_AIFDAC_TDM_CHAN, aif2); WM8993_AIFDAC_TDM | WM8993_AIFDAC_TDM_CHAN, aif2);
return 0; return 0;
@ -1481,10 +1481,10 @@ static struct snd_soc_dai_driver wm8993_dai = {
.symmetric_rates = 1, .symmetric_rates = 1,
}; };
static int wm8993_probe(struct snd_soc_codec *codec) static int wm8993_probe(struct snd_soc_component *component)
{ {
struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); struct wm8993_priv *wm8993 = snd_soc_component_get_drvdata(component);
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
wm8993->hubs_data.hp_startup_mode = 1; wm8993->hubs_data.hp_startup_mode = 1;
wm8993->hubs_data.dcs_codes_l = -2; wm8993->hubs_data.dcs_codes_l = -2;
@ -1492,20 +1492,20 @@ static int wm8993_probe(struct snd_soc_codec *codec)
wm8993->hubs_data.series_startup = 1; wm8993->hubs_data.series_startup = 1;
/* Latch volume update bits and default ZC on */ /* Latch volume update bits and default ZC on */
snd_soc_update_bits(codec, WM8993_RIGHT_DAC_DIGITAL_VOLUME, snd_soc_component_update_bits(component, WM8993_RIGHT_DAC_DIGITAL_VOLUME,
WM8993_DAC_VU, WM8993_DAC_VU); WM8993_DAC_VU, WM8993_DAC_VU);
snd_soc_update_bits(codec, WM8993_RIGHT_ADC_DIGITAL_VOLUME, snd_soc_component_update_bits(component, WM8993_RIGHT_ADC_DIGITAL_VOLUME,
WM8993_ADC_VU, WM8993_ADC_VU); WM8993_ADC_VU, WM8993_ADC_VU);
/* Manualy manage the HPOUT sequencing for independent stereo /* Manualy manage the HPOUT sequencing for independent stereo
* control. */ * control. */
snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0, snd_soc_component_update_bits(component, WM8993_ANALOGUE_HP_0,
WM8993_HPOUT1_AUTO_PU, 0); WM8993_HPOUT1_AUTO_PU, 0);
/* Use automatic clock configuration */ /* Use automatic clock configuration */
snd_soc_update_bits(codec, WM8993_CLOCKING_4, WM8993_SR_MODE, 0); snd_soc_component_update_bits(component, WM8993_CLOCKING_4, WM8993_SR_MODE, 0);
wm_hubs_handle_analogue_pdata(codec, wm8993->pdata.lineout1_diff, wm_hubs_handle_analogue_pdata(component, wm8993->pdata.lineout1_diff,
wm8993->pdata.lineout2_diff, wm8993->pdata.lineout2_diff,
wm8993->pdata.lineout1fb, wm8993->pdata.lineout1fb,
wm8993->pdata.lineout2fb, wm8993->pdata.lineout2fb,
@ -1516,22 +1516,22 @@ static int wm8993_probe(struct snd_soc_codec *codec)
wm8993->pdata.micbias1_lvl, wm8993->pdata.micbias1_lvl,
wm8993->pdata.micbias2_lvl); wm8993->pdata.micbias2_lvl);
snd_soc_add_codec_controls(codec, wm8993_snd_controls, snd_soc_add_component_controls(component, wm8993_snd_controls,
ARRAY_SIZE(wm8993_snd_controls)); ARRAY_SIZE(wm8993_snd_controls));
if (wm8993->pdata.num_retune_configs != 0) { if (wm8993->pdata.num_retune_configs != 0) {
dev_dbg(codec->dev, "Using ReTune Mobile\n"); dev_dbg(component->dev, "Using ReTune Mobile\n");
} else { } else {
dev_dbg(codec->dev, "No ReTune Mobile, using normal EQ\n"); dev_dbg(component->dev, "No ReTune Mobile, using normal EQ\n");
snd_soc_add_codec_controls(codec, wm8993_eq_controls, snd_soc_add_component_controls(component, wm8993_eq_controls,
ARRAY_SIZE(wm8993_eq_controls)); ARRAY_SIZE(wm8993_eq_controls));
} }
snd_soc_dapm_new_controls(dapm, wm8993_dapm_widgets, snd_soc_dapm_new_controls(dapm, wm8993_dapm_widgets,
ARRAY_SIZE(wm8993_dapm_widgets)); ARRAY_SIZE(wm8993_dapm_widgets));
wm_hubs_add_analogue_controls(codec); wm_hubs_add_analogue_controls(component);
snd_soc_dapm_add_routes(dapm, routes, ARRAY_SIZE(routes)); snd_soc_dapm_add_routes(dapm, routes, ARRAY_SIZE(routes));
wm_hubs_add_analogue_routes(codec, wm8993->pdata.lineout1_diff, wm_hubs_add_analogue_routes(component, wm8993->pdata.lineout1_diff,
wm8993->pdata.lineout2_diff); wm8993->pdata.lineout2_diff);
/* If the line outputs are differential then we aren't presenting /* If the line outputs are differential then we aren't presenting
@ -1545,34 +1545,34 @@ static int wm8993_probe(struct snd_soc_codec *codec)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int wm8993_suspend(struct snd_soc_codec *codec) static int wm8993_suspend(struct snd_soc_component *component)
{ {
struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); struct wm8993_priv *wm8993 = snd_soc_component_get_drvdata(component);
int fll_fout = wm8993->fll_fout; int fll_fout = wm8993->fll_fout;
int fll_fref = wm8993->fll_fref; int fll_fref = wm8993->fll_fref;
int ret; int ret;
/* Stop the FLL in an orderly fashion */ /* Stop the FLL in an orderly fashion */
ret = _wm8993_set_fll(codec, 0, 0, 0, 0); ret = _wm8993_set_fll(component, 0, 0, 0, 0);
if (ret != 0) { if (ret != 0) {
dev_err(codec->dev, "Failed to stop FLL\n"); dev_err(component->dev, "Failed to stop FLL\n");
return ret; return ret;
} }
wm8993->fll_fout = fll_fout; wm8993->fll_fout = fll_fout;
wm8993->fll_fref = fll_fref; wm8993->fll_fref = fll_fref;
snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_OFF); snd_soc_component_force_bias_level(component, SND_SOC_BIAS_OFF);
return 0; return 0;
} }
static int wm8993_resume(struct snd_soc_codec *codec) static int wm8993_resume(struct snd_soc_component *component)
{ {
struct wm8993_priv *wm8993 = snd_soc_codec_get_drvdata(codec); struct wm8993_priv *wm8993 = snd_soc_component_get_drvdata(component);
int ret; int ret;
snd_soc_codec_force_bias_level(codec, SND_SOC_BIAS_STANDBY); snd_soc_component_force_bias_level(component, SND_SOC_BIAS_STANDBY);
/* Restart the FLL? */ /* Restart the FLL? */
if (wm8993->fll_fout) { if (wm8993->fll_fout) {
@ -1582,10 +1582,10 @@ static int wm8993_resume(struct snd_soc_codec *codec)
wm8993->fll_fref = 0; wm8993->fll_fref = 0;
wm8993->fll_fout = 0; wm8993->fll_fout = 0;
ret = _wm8993_set_fll(codec, 0, wm8993->fll_src, ret = _wm8993_set_fll(component, 0, wm8993->fll_src,
fll_fref, fll_fout); fll_fref, fll_fout);
if (ret != 0) if (ret != 0)
dev_err(codec->dev, "Failed to restart FLL\n"); dev_err(component->dev, "Failed to restart FLL\n");
} }
return 0; return 0;
@ -1615,11 +1615,15 @@ static const struct regmap_config wm8993_regmap = {
.num_reg_defaults = ARRAY_SIZE(wm8993_reg_defaults), .num_reg_defaults = ARRAY_SIZE(wm8993_reg_defaults),
}; };
static const struct snd_soc_codec_driver soc_codec_dev_wm8993 = { static const struct snd_soc_component_driver soc_component_dev_wm8993 = {
.probe = wm8993_probe, .probe = wm8993_probe,
.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,
.idle_bias_on = 1,
.use_pmdown_time = 1,
.endianness = 1,
.non_legacy_dai_naming = 1,
}; };
static int wm8993_i2c_probe(struct i2c_client *i2c, static int wm8993_i2c_probe(struct i2c_client *i2c,
@ -1705,8 +1709,8 @@ static int wm8993_i2c_probe(struct i2c_client *i2c,
regcache_cache_only(wm8993->regmap, true); regcache_cache_only(wm8993->regmap, true);
ret = snd_soc_register_codec(&i2c->dev, ret = devm_snd_soc_register_component(&i2c->dev,
&soc_codec_dev_wm8993, &wm8993_dai, 1); &soc_component_dev_wm8993, &wm8993_dai, 1);
if (ret != 0) { if (ret != 0) {
dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret); dev_err(&i2c->dev, "Failed to register CODEC: %d\n", ret);
goto err_irq; goto err_irq;
@ -1726,7 +1730,6 @@ static int wm8993_i2c_remove(struct i2c_client *i2c)
{ {
struct wm8993_priv *wm8993 = i2c_get_clientdata(i2c); struct wm8993_priv *wm8993 = i2c_get_clientdata(i2c);
snd_soc_unregister_codec(&i2c->dev);
if (i2c->irq) if (i2c->irq)
free_irq(i2c->irq, wm8993); free_irq(i2c->irq, wm8993);
regulator_bulk_disable(ARRAY_SIZE(wm8993->supplies), wm8993->supplies); regulator_bulk_disable(ARRAY_SIZE(wm8993->supplies), wm8993->supplies);

810
sound/soc/codecs/wm8994.c
View File

File diff suppressed because it is too large Load Diff

8
sound/soc/codecs/wm8994.h
View File

@ -43,18 +43,18 @@ enum wm8994_vmid_mode {
typedef void (*wm1811_micdet_cb)(void *data); typedef void (*wm1811_micdet_cb)(void *data);
typedef void (*wm1811_mic_id_cb)(void *data, u16 status); typedef void (*wm1811_mic_id_cb)(void *data, u16 status);
int wm8994_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, int wm8994_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jack,
int micbias); int micbias);
int wm8958_mic_detect(struct snd_soc_codec *codec, struct snd_soc_jack *jack, int wm8958_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jack,
wm1811_micdet_cb cb, void *det_cb_data, wm1811_micdet_cb cb, void *det_cb_data,
wm1811_mic_id_cb id_cb, void *id_cb_data); wm1811_mic_id_cb id_cb, void *id_cb_data);
int wm8994_vmid_mode(struct snd_soc_codec *codec, enum wm8994_vmid_mode mode); int wm8994_vmid_mode(struct snd_soc_component *component, enum wm8994_vmid_mode mode);
int wm8958_aif_ev(struct snd_soc_dapm_widget *w, int wm8958_aif_ev(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event); struct snd_kcontrol *kcontrol, int event);
void wm8958_dsp2_init(struct snd_soc_codec *codec); void wm8958_dsp2_init(struct snd_soc_component *component);
struct wm8994_micdet { struct wm8994_micdet {
struct snd_soc_jack *jack; struct snd_soc_jack *jack;

254
sound/soc/codecs/wm_hubs.c
View File

@ -60,9 +60,9 @@ static const char *speaker_mode_text[] = {
static SOC_ENUM_SINGLE_DECL(speaker_mode, static SOC_ENUM_SINGLE_DECL(speaker_mode,
WM8993_SPKMIXR_ATTENUATION, 8, speaker_mode_text); WM8993_SPKMIXR_ATTENUATION, 8, speaker_mode_text);
static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op) static void wait_for_dc_servo(struct snd_soc_component *component, unsigned int op)
{ {
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
unsigned int reg; unsigned int reg;
int count = 0; int count = 0;
int timeout; int timeout;
@ -71,9 +71,9 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op)
val = op | WM8993_DCS_ENA_CHAN_0 | WM8993_DCS_ENA_CHAN_1; val = op | WM8993_DCS_ENA_CHAN_0 | WM8993_DCS_ENA_CHAN_1;
/* Trigger the command */ /* Trigger the command */
snd_soc_write(codec, WM8993_DC_SERVO_0, val); snd_soc_component_write(component, WM8993_DC_SERVO_0, val);
dev_dbg(codec->dev, "Waiting for DC servo...\n"); dev_dbg(component->dev, "Waiting for DC servo...\n");
if (hubs->dcs_done_irq) if (hubs->dcs_done_irq)
timeout = 4; timeout = 4;
@ -89,12 +89,12 @@ static void wait_for_dc_servo(struct snd_soc_codec *codec, unsigned int op)
else else
msleep(1); msleep(1);
reg = snd_soc_read(codec, WM8993_DC_SERVO_0); reg = snd_soc_component_read32(component, WM8993_DC_SERVO_0);
dev_dbg(codec->dev, "DC servo: %x\n", reg); dev_dbg(component->dev, "DC servo: %x\n", reg);
} while (reg & op && count < timeout); } while (reg & op && count < timeout);
if (reg & op) if (reg & op)
dev_err(codec->dev, "Timed out waiting for DC Servo %x\n", dev_err(component->dev, "Timed out waiting for DC Servo %x\n",
op); op);
} }
@ -108,35 +108,35 @@ irqreturn_t wm_hubs_dcs_done(int irq, void *data)
} }
EXPORT_SYMBOL_GPL(wm_hubs_dcs_done); EXPORT_SYMBOL_GPL(wm_hubs_dcs_done);
static bool wm_hubs_dac_hp_direct(struct snd_soc_codec *codec) static bool wm_hubs_dac_hp_direct(struct snd_soc_component *component)
{ {
int reg; int reg;
/* If we're going via the mixer we'll need to do additional checks */ /* If we're going via the mixer we'll need to do additional checks */
reg = snd_soc_read(codec, WM8993_OUTPUT_MIXER1); reg = snd_soc_component_read32(component, WM8993_OUTPUT_MIXER1);
if (!(reg & WM8993_DACL_TO_HPOUT1L)) { if (!(reg & WM8993_DACL_TO_HPOUT1L)) {
if (reg & ~WM8993_DACL_TO_MIXOUTL) { if (reg & ~WM8993_DACL_TO_MIXOUTL) {
dev_vdbg(codec->dev, "Analogue paths connected: %x\n", dev_vdbg(component->dev, "Analogue paths connected: %x\n",
reg & ~WM8993_DACL_TO_HPOUT1L); reg & ~WM8993_DACL_TO_HPOUT1L);
return false; return false;
} else { } else {
dev_vdbg(codec->dev, "HPL connected to mixer\n"); dev_vdbg(component->dev, "HPL connected to mixer\n");
} }
} else { } else {
dev_vdbg(codec->dev, "HPL connected to DAC\n"); dev_vdbg(component->dev, "HPL connected to DAC\n");
} }
reg = snd_soc_read(codec, WM8993_OUTPUT_MIXER2); reg = snd_soc_component_read32(component, WM8993_OUTPUT_MIXER2);
if (!(reg & WM8993_DACR_TO_HPOUT1R)) { if (!(reg & WM8993_DACR_TO_HPOUT1R)) {
if (reg & ~WM8993_DACR_TO_MIXOUTR) { if (reg & ~WM8993_DACR_TO_MIXOUTR) {
dev_vdbg(codec->dev, "Analogue paths connected: %x\n", dev_vdbg(component->dev, "Analogue paths connected: %x\n",
reg & ~WM8993_DACR_TO_HPOUT1R); reg & ~WM8993_DACR_TO_HPOUT1R);
return false; return false;
} else { } else {
dev_vdbg(codec->dev, "HPR connected to mixer\n"); dev_vdbg(component->dev, "HPR connected to mixer\n");
} }
} else { } else {
dev_vdbg(codec->dev, "HPR connected to DAC\n"); dev_vdbg(component->dev, "HPR connected to DAC\n");
} }
return true; return true;
@ -149,17 +149,17 @@ struct wm_hubs_dcs_cache {
u16 dcs_cfg; u16 dcs_cfg;
}; };
static bool wm_hubs_dcs_cache_get(struct snd_soc_codec *codec, static bool wm_hubs_dcs_cache_get(struct snd_soc_component *component,
struct wm_hubs_dcs_cache **entry) struct wm_hubs_dcs_cache **entry)
{ {
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
struct wm_hubs_dcs_cache *cache; struct wm_hubs_dcs_cache *cache;
unsigned int left, right; unsigned int left, right;
left = snd_soc_read(codec, WM8993_LEFT_OUTPUT_VOLUME); left = snd_soc_component_read32(component, WM8993_LEFT_OUTPUT_VOLUME);
left &= WM8993_HPOUT1L_VOL_MASK; left &= WM8993_HPOUT1L_VOL_MASK;
right = snd_soc_read(codec, WM8993_RIGHT_OUTPUT_VOLUME); right = snd_soc_component_read32(component, WM8993_RIGHT_OUTPUT_VOLUME);
right &= WM8993_HPOUT1R_VOL_MASK; right &= WM8993_HPOUT1R_VOL_MASK;
list_for_each_entry(cache, &hubs->dcs_cache, list) { list_for_each_entry(cache, &hubs->dcs_cache, list) {
@ -173,22 +173,22 @@ static bool wm_hubs_dcs_cache_get(struct snd_soc_codec *codec,
return false; return false;
} }
static void wm_hubs_dcs_cache_set(struct snd_soc_codec *codec, u16 dcs_cfg) static void wm_hubs_dcs_cache_set(struct snd_soc_component *component, u16 dcs_cfg)
{ {
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
struct wm_hubs_dcs_cache *cache; struct wm_hubs_dcs_cache *cache;
if (hubs->no_cache_dac_hp_direct) if (hubs->no_cache_dac_hp_direct)
return; return;
cache = devm_kzalloc(codec->dev, sizeof(*cache), GFP_KERNEL); cache = devm_kzalloc(component->dev, sizeof(*cache), GFP_KERNEL);
if (!cache) if (!cache)
return; return;
cache->left = snd_soc_read(codec, WM8993_LEFT_OUTPUT_VOLUME); cache->left = snd_soc_component_read32(component, WM8993_LEFT_OUTPUT_VOLUME);
cache->left &= WM8993_HPOUT1L_VOL_MASK; cache->left &= WM8993_HPOUT1L_VOL_MASK;
cache->right = snd_soc_read(codec, WM8993_RIGHT_OUTPUT_VOLUME); cache->right = snd_soc_component_read32(component, WM8993_RIGHT_OUTPUT_VOLUME);
cache->right &= WM8993_HPOUT1R_VOL_MASK; cache->right &= WM8993_HPOUT1R_VOL_MASK;
cache->dcs_cfg = dcs_cfg; cache->dcs_cfg = dcs_cfg;
@ -196,10 +196,10 @@ static void wm_hubs_dcs_cache_set(struct snd_soc_codec *codec, u16 dcs_cfg)
list_add_tail(&cache->list, &hubs->dcs_cache); list_add_tail(&cache->list, &hubs->dcs_cache);
} }
static int wm_hubs_read_dc_servo(struct snd_soc_codec *codec, static int wm_hubs_read_dc_servo(struct snd_soc_component *component,
u16 *reg_l, u16 *reg_r) u16 *reg_l, u16 *reg_r)
{ {
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
u16 dcs_reg, reg; u16 dcs_reg, reg;
int ret = 0; int ret = 0;
@ -220,14 +220,14 @@ static int wm_hubs_read_dc_servo(struct snd_soc_codec *codec,
*/ */
switch (hubs->dcs_readback_mode) { switch (hubs->dcs_readback_mode) {
case 0: case 0:
*reg_l = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_1) *reg_l = snd_soc_component_read32(component, WM8993_DC_SERVO_READBACK_1)
& WM8993_DCS_INTEG_CHAN_0_MASK; & WM8993_DCS_INTEG_CHAN_0_MASK;
*reg_r = snd_soc_read(codec, WM8993_DC_SERVO_READBACK_2) *reg_r = snd_soc_component_read32(component, WM8993_DC_SERVO_READBACK_2)
& WM8993_DCS_INTEG_CHAN_1_MASK; & WM8993_DCS_INTEG_CHAN_1_MASK;
break; break;
case 2: case 2:
case 1: case 1:
reg = snd_soc_read(codec, dcs_reg); reg = snd_soc_component_read32(component, dcs_reg);
*reg_r = (reg & WM8993_DCS_DAC_WR_VAL_1_MASK) *reg_r = (reg & WM8993_DCS_DAC_WR_VAL_1_MASK)
>> WM8993_DCS_DAC_WR_VAL_1_SHIFT; >> WM8993_DCS_DAC_WR_VAL_1_SHIFT;
*reg_l = reg & WM8993_DCS_DAC_WR_VAL_0_MASK; *reg_l = reg & WM8993_DCS_DAC_WR_VAL_0_MASK;
@ -242,9 +242,9 @@ static int wm_hubs_read_dc_servo(struct snd_soc_codec *codec,
/* /*
* Startup calibration of the DC servo * Startup calibration of the DC servo
*/ */
static void enable_dc_servo(struct snd_soc_codec *codec) static void enable_dc_servo(struct snd_soc_component *component)
{ {
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
struct wm_hubs_dcs_cache *cache; struct wm_hubs_dcs_cache *cache;
s8 offset; s8 offset;
u16 reg_l, reg_r, dcs_cfg, dcs_reg; u16 reg_l, reg_r, dcs_cfg, dcs_reg;
@ -260,12 +260,12 @@ static void enable_dc_servo(struct snd_soc_codec *codec)
/* If we're using a digital only path and have a previously /* If we're using a digital only path and have a previously
* callibrated DC servo offset stored then use that. */ * callibrated DC servo offset stored then use that. */
if (wm_hubs_dac_hp_direct(codec) && if (wm_hubs_dac_hp_direct(component) &&
wm_hubs_dcs_cache_get(codec, &cache)) { wm_hubs_dcs_cache_get(component, &cache)) {
dev_dbg(codec->dev, "Using cached DCS offset %x for %d,%d\n", dev_dbg(component->dev, "Using cached DCS offset %x for %d,%d\n",
cache->dcs_cfg, cache->left, cache->right); cache->dcs_cfg, cache->left, cache->right);
snd_soc_write(codec, dcs_reg, cache->dcs_cfg); snd_soc_component_write(component, dcs_reg, cache->dcs_cfg);
wait_for_dc_servo(codec, wait_for_dc_servo(component,
WM8993_DCS_TRIG_DAC_WR_0 | WM8993_DCS_TRIG_DAC_WR_0 |
WM8993_DCS_TRIG_DAC_WR_1); WM8993_DCS_TRIG_DAC_WR_1);
return; return;
@ -273,48 +273,48 @@ static void enable_dc_servo(struct snd_soc_codec *codec)
if (hubs->series_startup) { if (hubs->series_startup) {
/* Set for 32 series updates */ /* Set for 32 series updates */
snd_soc_update_bits(codec, WM8993_DC_SERVO_1, snd_soc_component_update_bits(component, WM8993_DC_SERVO_1,
WM8993_DCS_SERIES_NO_01_MASK, WM8993_DCS_SERIES_NO_01_MASK,
32 << WM8993_DCS_SERIES_NO_01_SHIFT); 32 << WM8993_DCS_SERIES_NO_01_SHIFT);
wait_for_dc_servo(codec, wait_for_dc_servo(component,
WM8993_DCS_TRIG_SERIES_0 | WM8993_DCS_TRIG_SERIES_0 |
WM8993_DCS_TRIG_SERIES_1); WM8993_DCS_TRIG_SERIES_1);
} else { } else {
wait_for_dc_servo(codec, wait_for_dc_servo(component,
WM8993_DCS_TRIG_STARTUP_0 | WM8993_DCS_TRIG_STARTUP_0 |
WM8993_DCS_TRIG_STARTUP_1); WM8993_DCS_TRIG_STARTUP_1);
} }
if (wm_hubs_read_dc_servo(codec, &reg_l, &reg_r) < 0) if (wm_hubs_read_dc_servo(component, &reg_l, &reg_r) < 0)
return; return;
dev_dbg(codec->dev, "DCS input: %x %x\n", reg_l, reg_r); dev_dbg(component->dev, "DCS input: %x %x\n", reg_l, reg_r);
/* Apply correction to DC servo result */ /* Apply correction to DC servo result */
if (hubs->dcs_codes_l || hubs->dcs_codes_r) { if (hubs->dcs_codes_l || hubs->dcs_codes_r) {
dev_dbg(codec->dev, dev_dbg(component->dev,
"Applying %d/%d code DC servo correction\n", "Applying %d/%d code DC servo correction\n",
hubs->dcs_codes_l, hubs->dcs_codes_r); hubs->dcs_codes_l, hubs->dcs_codes_r);
/* HPOUT1R */ /* HPOUT1R */
offset = (s8)reg_r; offset = (s8)reg_r;
dev_dbg(codec->dev, "DCS right %d->%d\n", offset, dev_dbg(component->dev, "DCS right %d->%d\n", offset,
offset + hubs->dcs_codes_r); offset + hubs->dcs_codes_r);
offset += hubs->dcs_codes_r; offset += hubs->dcs_codes_r;
dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT; dcs_cfg = (u8)offset << WM8993_DCS_DAC_WR_VAL_1_SHIFT;
/* HPOUT1L */ /* HPOUT1L */
offset = (s8)reg_l; offset = (s8)reg_l;
dev_dbg(codec->dev, "DCS left %d->%d\n", offset, dev_dbg(component->dev, "DCS left %d->%d\n", offset,
offset + hubs->dcs_codes_l); offset + hubs->dcs_codes_l);
offset += hubs->dcs_codes_l; offset += hubs->dcs_codes_l;
dcs_cfg |= (u8)offset; dcs_cfg |= (u8)offset;
dev_dbg(codec->dev, "DCS result: %x\n", dcs_cfg); dev_dbg(component->dev, "DCS result: %x\n", dcs_cfg);
/* Do it */ /* Do it */
snd_soc_write(codec, dcs_reg, dcs_cfg); snd_soc_component_write(component, dcs_reg, dcs_cfg);
wait_for_dc_servo(codec, wait_for_dc_servo(component,
WM8993_DCS_TRIG_DAC_WR_0 | WM8993_DCS_TRIG_DAC_WR_0 |
WM8993_DCS_TRIG_DAC_WR_1); WM8993_DCS_TRIG_DAC_WR_1);
} else { } else {
@ -324,8 +324,8 @@ static void enable_dc_servo(struct snd_soc_codec *codec)
/* Save the callibrated offset if we're in class W mode and /* Save the callibrated offset if we're in class W mode and
* therefore don't have any analogue signal mixed in. */ * therefore don't have any analogue signal mixed in. */
if (wm_hubs_dac_hp_direct(codec)) if (wm_hubs_dac_hp_direct(component))
wm_hubs_dcs_cache_set(codec, dcs_cfg); wm_hubs_dcs_cache_set(component, dcs_cfg);
} }
/* /*
@ -334,8 +334,8 @@ static void enable_dc_servo(struct snd_soc_codec *codec)
static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol, static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_kcontrol_component(kcontrol);
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
int ret; int ret;
ret = snd_soc_put_volsw(kcontrol, ucontrol); ret = snd_soc_put_volsw(kcontrol, ucontrol);
@ -346,9 +346,9 @@ static int wm8993_put_dc_servo(struct snd_kcontrol *kcontrol,
return ret; return ret;
/* Only need to do this if the outputs are active */ /* Only need to do this if the outputs are active */
if (snd_soc_read(codec, WM8993_POWER_MANAGEMENT_1) if (snd_soc_component_read32(component, WM8993_POWER_MANAGEMENT_1)
& (WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA)) & (WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA))
snd_soc_update_bits(codec, snd_soc_component_update_bits(component,
WM8993_DC_SERVO_0, WM8993_DC_SERVO_0,
WM8993_DCS_TRIG_SINGLE_0 | WM8993_DCS_TRIG_SINGLE_0 |
WM8993_DCS_TRIG_SINGLE_1, WM8993_DCS_TRIG_SINGLE_1,
@ -499,8 +499,8 @@ SOC_SINGLE_TLV("LINEOUT2 Volume", WM8993_LINE_OUTPUTS_VOLUME, 0, 1, 1,
static int hp_supply_event(struct snd_soc_dapm_widget *w, static int hp_supply_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
switch (event) { switch (event) {
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
@ -509,28 +509,28 @@ static int hp_supply_event(struct snd_soc_dapm_widget *w,
break; break;
case 1: case 1:
/* Enable the headphone amp */ /* Enable the headphone amp */
snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8993_POWER_MANAGEMENT_1,
WM8993_HPOUT1L_ENA | WM8993_HPOUT1L_ENA |
WM8993_HPOUT1R_ENA, WM8993_HPOUT1R_ENA,
WM8993_HPOUT1L_ENA | WM8993_HPOUT1L_ENA |
WM8993_HPOUT1R_ENA); WM8993_HPOUT1R_ENA);
/* Enable the second stage */ /* Enable the second stage */
snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0, snd_soc_component_update_bits(component, WM8993_ANALOGUE_HP_0,
WM8993_HPOUT1L_DLY | WM8993_HPOUT1L_DLY |
WM8993_HPOUT1R_DLY, WM8993_HPOUT1R_DLY,
WM8993_HPOUT1L_DLY | WM8993_HPOUT1L_DLY |
WM8993_HPOUT1R_DLY); WM8993_HPOUT1R_DLY);
break; break;
default: default:
dev_err(codec->dev, "Unknown HP startup mode %d\n", dev_err(component->dev, "Unknown HP startup mode %d\n",
hubs->hp_startup_mode); hubs->hp_startup_mode);
break; break;
} }
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
snd_soc_update_bits(codec, WM8993_CHARGE_PUMP_1, snd_soc_component_update_bits(component, WM8993_CHARGE_PUMP_1,
WM8993_CP_ENA, 0); WM8993_CP_ENA, 0);
break; break;
} }
@ -541,47 +541,47 @@ static int hp_supply_event(struct snd_soc_dapm_widget *w,
static int hp_event(struct snd_soc_dapm_widget *w, static int hp_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
unsigned int reg = snd_soc_read(codec, WM8993_ANALOGUE_HP_0); unsigned int reg = snd_soc_component_read32(component, WM8993_ANALOGUE_HP_0);
switch (event) { switch (event) {
case SND_SOC_DAPM_POST_PMU: case SND_SOC_DAPM_POST_PMU:
snd_soc_update_bits(codec, WM8993_CHARGE_PUMP_1, snd_soc_component_update_bits(component, WM8993_CHARGE_PUMP_1,
WM8993_CP_ENA, WM8993_CP_ENA); WM8993_CP_ENA, WM8993_CP_ENA);
msleep(5); msleep(5);
snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8993_POWER_MANAGEMENT_1,
WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA, WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA,
WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA); WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA);
reg |= WM8993_HPOUT1L_DLY | WM8993_HPOUT1R_DLY; reg |= WM8993_HPOUT1L_DLY | WM8993_HPOUT1R_DLY;
snd_soc_write(codec, WM8993_ANALOGUE_HP_0, reg); snd_soc_component_write(component, WM8993_ANALOGUE_HP_0, reg);
snd_soc_update_bits(codec, WM8993_DC_SERVO_1, snd_soc_component_update_bits(component, WM8993_DC_SERVO_1,
WM8993_DCS_TIMER_PERIOD_01_MASK, 0); WM8993_DCS_TIMER_PERIOD_01_MASK, 0);
enable_dc_servo(codec); enable_dc_servo(component);
reg |= WM8993_HPOUT1R_OUTP | WM8993_HPOUT1R_RMV_SHORT | reg |= WM8993_HPOUT1R_OUTP | WM8993_HPOUT1R_RMV_SHORT |
WM8993_HPOUT1L_OUTP | WM8993_HPOUT1L_RMV_SHORT; WM8993_HPOUT1L_OUTP | WM8993_HPOUT1L_RMV_SHORT;
snd_soc_write(codec, WM8993_ANALOGUE_HP_0, reg); snd_soc_component_write(component, WM8993_ANALOGUE_HP_0, reg);
break; break;
case SND_SOC_DAPM_PRE_PMD: case SND_SOC_DAPM_PRE_PMD:
snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0, snd_soc_component_update_bits(component, WM8993_ANALOGUE_HP_0,
WM8993_HPOUT1L_OUTP | WM8993_HPOUT1L_OUTP |
WM8993_HPOUT1R_OUTP | WM8993_HPOUT1R_OUTP |
WM8993_HPOUT1L_RMV_SHORT | WM8993_HPOUT1L_RMV_SHORT |
WM8993_HPOUT1R_RMV_SHORT, 0); WM8993_HPOUT1R_RMV_SHORT, 0);
snd_soc_update_bits(codec, WM8993_ANALOGUE_HP_0, snd_soc_component_update_bits(component, WM8993_ANALOGUE_HP_0,
WM8993_HPOUT1L_DLY | WM8993_HPOUT1L_DLY |
WM8993_HPOUT1R_DLY, 0); WM8993_HPOUT1R_DLY, 0);
snd_soc_write(codec, WM8993_DC_SERVO_0, 0); snd_soc_component_write(component, WM8993_DC_SERVO_0, 0);
snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_1, snd_soc_component_update_bits(component, WM8993_POWER_MANAGEMENT_1,
WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA, WM8993_HPOUT1L_ENA | WM8993_HPOUT1R_ENA,
0); 0);
break; break;
@ -593,18 +593,18 @@ static int hp_event(struct snd_soc_dapm_widget *w,
static int earpiece_event(struct snd_soc_dapm_widget *w, static int earpiece_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *control, int event) struct snd_kcontrol *control, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
u16 reg = snd_soc_read(codec, WM8993_ANTIPOP1) & ~WM8993_HPOUT2_IN_ENA; u16 reg = snd_soc_component_read32(component, WM8993_ANTIPOP1) & ~WM8993_HPOUT2_IN_ENA;
switch (event) { switch (event) {
case SND_SOC_DAPM_PRE_PMU: case SND_SOC_DAPM_PRE_PMU:
reg |= WM8993_HPOUT2_IN_ENA; reg |= WM8993_HPOUT2_IN_ENA;
snd_soc_write(codec, WM8993_ANTIPOP1, reg); snd_soc_component_write(component, WM8993_ANTIPOP1, reg);
udelay(50); udelay(50);
break; break;
case SND_SOC_DAPM_POST_PMD: case SND_SOC_DAPM_POST_PMD:
snd_soc_write(codec, WM8993_ANTIPOP1, reg); snd_soc_component_write(component, WM8993_ANTIPOP1, reg);
break; break;
default: default:
@ -618,8 +618,8 @@ static int earpiece_event(struct snd_soc_dapm_widget *w,
static int lineout_event(struct snd_soc_dapm_widget *w, static int lineout_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *control, int event) struct snd_kcontrol *control, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
bool *flag; bool *flag;
switch (w->shift) { switch (w->shift) {
@ -648,8 +648,8 @@ static int lineout_event(struct snd_soc_dapm_widget *w,
static int micbias_event(struct snd_soc_dapm_widget *w, static int micbias_event(struct snd_soc_dapm_widget *w,
struct snd_kcontrol *kcontrol, int event) struct snd_kcontrol *kcontrol, int event)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_to_codec(w->dapm); struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
switch (w->shift) { switch (w->shift) {
case WM8993_MICB1_ENA_SHIFT: case WM8993_MICB1_ENA_SHIFT:
@ -667,26 +667,26 @@ static int micbias_event(struct snd_soc_dapm_widget *w,
return 0; return 0;
} }
void wm_hubs_update_class_w(struct snd_soc_codec *codec) void wm_hubs_update_class_w(struct snd_soc_component *component)
{ {
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
int enable = WM8993_CP_DYN_V | WM8993_CP_DYN_FREQ; int enable = WM8993_CP_DYN_V | WM8993_CP_DYN_FREQ;
if (!wm_hubs_dac_hp_direct(codec)) if (!wm_hubs_dac_hp_direct(component))
enable = false; enable = false;
if (hubs->check_class_w_digital && !hubs->check_class_w_digital(codec)) if (hubs->check_class_w_digital && !hubs->check_class_w_digital(component))
enable = false; enable = false;
dev_vdbg(codec->dev, "Class W %s\n", enable ? "enabled" : "disabled"); dev_vdbg(component->dev, "Class W %s\n", enable ? "enabled" : "disabled");
snd_soc_update_bits(codec, WM8993_CLASS_W_0, snd_soc_component_update_bits(component, WM8993_CLASS_W_0,
WM8993_CP_DYN_V | WM8993_CP_DYN_FREQ, enable); WM8993_CP_DYN_V | WM8993_CP_DYN_FREQ, enable);
snd_soc_write(codec, WM8993_LEFT_OUTPUT_VOLUME, snd_soc_component_write(component, WM8993_LEFT_OUTPUT_VOLUME,
snd_soc_read(codec, WM8993_LEFT_OUTPUT_VOLUME)); snd_soc_component_read32(component, WM8993_LEFT_OUTPUT_VOLUME));
snd_soc_write(codec, WM8993_RIGHT_OUTPUT_VOLUME, snd_soc_component_write(component, WM8993_RIGHT_OUTPUT_VOLUME,
snd_soc_read(codec, WM8993_RIGHT_OUTPUT_VOLUME)); snd_soc_component_read32(component, WM8993_RIGHT_OUTPUT_VOLUME));
} }
EXPORT_SYMBOL_GPL(wm_hubs_update_class_w); EXPORT_SYMBOL_GPL(wm_hubs_update_class_w);
@ -697,12 +697,12 @@ EXPORT_SYMBOL_GPL(wm_hubs_update_class_w);
static int class_w_put_volsw(struct snd_kcontrol *kcontrol, static int class_w_put_volsw(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);
int ret; int ret;
ret = snd_soc_dapm_put_volsw(kcontrol, ucontrol); ret = snd_soc_dapm_put_volsw(kcontrol, ucontrol);
wm_hubs_update_class_w(codec); wm_hubs_update_class_w(component);
return ret; return ret;
} }
@ -717,12 +717,12 @@ static int class_w_put_volsw(struct snd_kcontrol *kcontrol,
static int class_w_put_double(struct snd_kcontrol *kcontrol, static int class_w_put_double(struct snd_kcontrol *kcontrol,
struct snd_ctl_elem_value *ucontrol) struct snd_ctl_elem_value *ucontrol)
{ {
struct snd_soc_codec *codec = snd_soc_dapm_kcontrol_codec(kcontrol); struct snd_soc_component *component = snd_soc_dapm_kcontrol_component(kcontrol);
int ret; int ret;
ret = snd_soc_dapm_put_enum_double(kcontrol, ucontrol); ret = snd_soc_dapm_put_enum_double(kcontrol, ucontrol);
wm_hubs_update_class_w(codec); wm_hubs_update_class_w(component);
return ret; return ret;
} }
@ -1113,40 +1113,40 @@ static const struct snd_soc_dapm_route lineout2_se_routes[] = {
{ "LINEOUT2P Driver", NULL, "LINEOUT2P Mixer" }, { "LINEOUT2P Driver", NULL, "LINEOUT2P Mixer" },
}; };
int wm_hubs_add_analogue_controls(struct snd_soc_codec *codec) int wm_hubs_add_analogue_controls(struct snd_soc_component *component)
{ {
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
/* Latch volume update bits & default ZC on */ /* Latch volume update bits & default ZC on */
snd_soc_update_bits(codec, WM8993_LEFT_LINE_INPUT_1_2_VOLUME, snd_soc_component_update_bits(component, WM8993_LEFT_LINE_INPUT_1_2_VOLUME,
WM8993_IN1_VU, WM8993_IN1_VU); WM8993_IN1_VU, WM8993_IN1_VU);
snd_soc_update_bits(codec, WM8993_RIGHT_LINE_INPUT_1_2_VOLUME, snd_soc_component_update_bits(component, WM8993_RIGHT_LINE_INPUT_1_2_VOLUME,
WM8993_IN1_VU, WM8993_IN1_VU); WM8993_IN1_VU, WM8993_IN1_VU);
snd_soc_update_bits(codec, WM8993_LEFT_LINE_INPUT_3_4_VOLUME, snd_soc_component_update_bits(component, WM8993_LEFT_LINE_INPUT_3_4_VOLUME,
WM8993_IN2_VU, WM8993_IN2_VU); WM8993_IN2_VU, WM8993_IN2_VU);
snd_soc_update_bits(codec, WM8993_RIGHT_LINE_INPUT_3_4_VOLUME, snd_soc_component_update_bits(component, WM8993_RIGHT_LINE_INPUT_3_4_VOLUME,
WM8993_IN2_VU, WM8993_IN2_VU); WM8993_IN2_VU, WM8993_IN2_VU);
snd_soc_update_bits(codec, WM8993_SPEAKER_VOLUME_LEFT, snd_soc_component_update_bits(component, WM8993_SPEAKER_VOLUME_LEFT,
WM8993_SPKOUT_VU, WM8993_SPKOUT_VU); WM8993_SPKOUT_VU, WM8993_SPKOUT_VU);
snd_soc_update_bits(codec, WM8993_SPEAKER_VOLUME_RIGHT, snd_soc_component_update_bits(component, WM8993_SPEAKER_VOLUME_RIGHT,
WM8993_SPKOUT_VU, WM8993_SPKOUT_VU); WM8993_SPKOUT_VU, WM8993_SPKOUT_VU);
snd_soc_update_bits(codec, WM8993_LEFT_OUTPUT_VOLUME, snd_soc_component_update_bits(component, WM8993_LEFT_OUTPUT_VOLUME,
WM8993_HPOUT1_VU | WM8993_HPOUT1L_ZC, WM8993_HPOUT1_VU | WM8993_HPOUT1L_ZC,
WM8993_HPOUT1_VU | WM8993_HPOUT1L_ZC); WM8993_HPOUT1_VU | WM8993_HPOUT1L_ZC);
snd_soc_update_bits(codec, WM8993_RIGHT_OUTPUT_VOLUME, snd_soc_component_update_bits(component, WM8993_RIGHT_OUTPUT_VOLUME,
WM8993_HPOUT1_VU | WM8993_HPOUT1R_ZC, WM8993_HPOUT1_VU | WM8993_HPOUT1R_ZC,
WM8993_HPOUT1_VU | WM8993_HPOUT1R_ZC); WM8993_HPOUT1_VU | WM8993_HPOUT1R_ZC);
snd_soc_update_bits(codec, WM8993_LEFT_OPGA_VOLUME, snd_soc_component_update_bits(component, WM8993_LEFT_OPGA_VOLUME,
WM8993_MIXOUTL_ZC | WM8993_MIXOUT_VU, WM8993_MIXOUTL_ZC | WM8993_MIXOUT_VU,
WM8993_MIXOUTL_ZC | WM8993_MIXOUT_VU); WM8993_MIXOUTL_ZC | WM8993_MIXOUT_VU);
snd_soc_update_bits(codec, WM8993_RIGHT_OPGA_VOLUME, snd_soc_component_update_bits(component, WM8993_RIGHT_OPGA_VOLUME,
WM8993_MIXOUTR_ZC | WM8993_MIXOUT_VU, WM8993_MIXOUTR_ZC | WM8993_MIXOUT_VU,
WM8993_MIXOUTR_ZC | WM8993_MIXOUT_VU); WM8993_MIXOUTR_ZC | WM8993_MIXOUT_VU);
snd_soc_add_codec_controls(codec, analogue_snd_controls, snd_soc_add_component_controls(component, analogue_snd_controls,
ARRAY_SIZE(analogue_snd_controls)); ARRAY_SIZE(analogue_snd_controls));
snd_soc_dapm_new_controls(dapm, analogue_dapm_widgets, snd_soc_dapm_new_controls(dapm, analogue_dapm_widgets,
@ -1155,13 +1155,13 @@ int wm_hubs_add_analogue_controls(struct snd_soc_codec *codec)
} }
EXPORT_SYMBOL_GPL(wm_hubs_add_analogue_controls); EXPORT_SYMBOL_GPL(wm_hubs_add_analogue_controls);
int wm_hubs_add_analogue_routes(struct snd_soc_codec *codec, int wm_hubs_add_analogue_routes(struct snd_soc_component *component,
int lineout1_diff, int lineout2_diff) int lineout1_diff, int lineout2_diff)
{ {
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
struct snd_soc_dapm_context *dapm = snd_soc_codec_get_dapm(codec); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
hubs->codec = codec; hubs->component = component;
INIT_LIST_HEAD(&hubs->dcs_cache); INIT_LIST_HEAD(&hubs->dcs_cache);
init_completion(&hubs->dcs_done); init_completion(&hubs->dcs_done);
@ -1191,14 +1191,14 @@ int wm_hubs_add_analogue_routes(struct snd_soc_codec *codec,
} }
EXPORT_SYMBOL_GPL(wm_hubs_add_analogue_routes); EXPORT_SYMBOL_GPL(wm_hubs_add_analogue_routes);
int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *codec, int wm_hubs_handle_analogue_pdata(struct snd_soc_component *component,
int lineout1_diff, int lineout2_diff, int lineout1_diff, int lineout2_diff,
int lineout1fb, int lineout2fb, int lineout1fb, int lineout2fb,
int jd_scthr, int jd_thr, int jd_scthr, int jd_thr,
int micbias1_delay, int micbias2_delay, int micbias1_delay, int micbias2_delay,
int micbias1_lvl, int micbias2_lvl) int micbias1_lvl, int micbias2_lvl)
{ {
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
hubs->lineout1_se = !lineout1_diff; hubs->lineout1_se = !lineout1_diff;
hubs->lineout2_se = !lineout2_diff; hubs->lineout2_se = !lineout2_diff;
@ -1206,28 +1206,28 @@ int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *codec,
hubs->micb2_delay = micbias2_delay; hubs->micb2_delay = micbias2_delay;
if (!lineout1_diff) if (!lineout1_diff)
snd_soc_update_bits(codec, WM8993_LINE_MIXER1, snd_soc_component_update_bits(component, WM8993_LINE_MIXER1,
WM8993_LINEOUT1_MODE, WM8993_LINEOUT1_MODE,
WM8993_LINEOUT1_MODE); WM8993_LINEOUT1_MODE);
if (!lineout2_diff) if (!lineout2_diff)
snd_soc_update_bits(codec, WM8993_LINE_MIXER2, snd_soc_component_update_bits(component, WM8993_LINE_MIXER2,
WM8993_LINEOUT2_MODE, WM8993_LINEOUT2_MODE,
WM8993_LINEOUT2_MODE); WM8993_LINEOUT2_MODE);
if (!lineout1_diff && !lineout2_diff) if (!lineout1_diff && !lineout2_diff)
snd_soc_update_bits(codec, WM8993_ANTIPOP1, snd_soc_component_update_bits(component, WM8993_ANTIPOP1,
WM8993_LINEOUT_VMID_BUF_ENA, WM8993_LINEOUT_VMID_BUF_ENA,
WM8993_LINEOUT_VMID_BUF_ENA); WM8993_LINEOUT_VMID_BUF_ENA);
if (lineout1fb) if (lineout1fb)
snd_soc_update_bits(codec, WM8993_ADDITIONAL_CONTROL, snd_soc_component_update_bits(component, WM8993_ADDITIONAL_CONTROL,
WM8993_LINEOUT1_FB, WM8993_LINEOUT1_FB); WM8993_LINEOUT1_FB, WM8993_LINEOUT1_FB);
if (lineout2fb) if (lineout2fb)
snd_soc_update_bits(codec, WM8993_ADDITIONAL_CONTROL, snd_soc_component_update_bits(component, WM8993_ADDITIONAL_CONTROL,
WM8993_LINEOUT2_FB, WM8993_LINEOUT2_FB); WM8993_LINEOUT2_FB, WM8993_LINEOUT2_FB);
snd_soc_update_bits(codec, WM8993_MICBIAS, snd_soc_component_update_bits(component, WM8993_MICBIAS,
WM8993_JD_SCTHR_MASK | WM8993_JD_THR_MASK | WM8993_JD_SCTHR_MASK | WM8993_JD_THR_MASK |
WM8993_MICB1_LVL | WM8993_MICB2_LVL, WM8993_MICB1_LVL | WM8993_MICB2_LVL,
jd_scthr << WM8993_JD_SCTHR_SHIFT | jd_scthr << WM8993_JD_SCTHR_SHIFT |
@ -1239,9 +1239,9 @@ int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *codec,
} }
EXPORT_SYMBOL_GPL(wm_hubs_handle_analogue_pdata); EXPORT_SYMBOL_GPL(wm_hubs_handle_analogue_pdata);
void wm_hubs_vmid_ena(struct snd_soc_codec *codec) void wm_hubs_vmid_ena(struct snd_soc_component *component)
{ {
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
int val = 0; int val = 0;
if (hubs->lineout1_se) if (hubs->lineout1_se)
@ -1251,20 +1251,20 @@ void wm_hubs_vmid_ena(struct snd_soc_codec *codec)
val |= WM8993_LINEOUT2N_ENA | WM8993_LINEOUT2P_ENA; val |= WM8993_LINEOUT2N_ENA | WM8993_LINEOUT2P_ENA;
/* Enable the line outputs while we power up */ /* Enable the line outputs while we power up */
snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_3, val, val); snd_soc_component_update_bits(component, WM8993_POWER_MANAGEMENT_3, val, val);
} }
EXPORT_SYMBOL_GPL(wm_hubs_vmid_ena); EXPORT_SYMBOL_GPL(wm_hubs_vmid_ena);
void wm_hubs_set_bias_level(struct snd_soc_codec *codec, void wm_hubs_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level) enum snd_soc_bias_level level)
{ {
struct wm_hubs_data *hubs = snd_soc_codec_get_drvdata(codec); struct wm_hubs_data *hubs = snd_soc_component_get_drvdata(component);
int mask, val; int mask, val;
switch (level) { switch (level) {
case SND_SOC_BIAS_STANDBY: case SND_SOC_BIAS_STANDBY:
/* Clamp the inputs to VMID while we ramp to charge caps */ /* Clamp the inputs to VMID while we ramp to charge caps */
snd_soc_update_bits(codec, WM8993_INPUTS_CLAMP_REG, snd_soc_component_update_bits(component, WM8993_INPUTS_CLAMP_REG,
WM8993_INPUTS_CLAMP, WM8993_INPUTS_CLAMP); WM8993_INPUTS_CLAMP, WM8993_INPUTS_CLAMP);
break; break;
@ -1291,11 +1291,11 @@ void wm_hubs_set_bias_level(struct snd_soc_codec *codec,
if (hubs->lineout2_se && hubs->lineout2p_ena) if (hubs->lineout2_se && hubs->lineout2p_ena)
val |= WM8993_LINEOUT2P_ENA; val |= WM8993_LINEOUT2P_ENA;
snd_soc_update_bits(codec, WM8993_POWER_MANAGEMENT_3, snd_soc_component_update_bits(component, WM8993_POWER_MANAGEMENT_3,
mask, val); mask, val);
/* Remove the input clamps */ /* Remove the input clamps */
snd_soc_update_bits(codec, WM8993_INPUTS_CLAMP_REG, snd_soc_component_update_bits(component, WM8993_INPUTS_CLAMP_REG,
WM8993_INPUTS_CLAMP, 0); WM8993_INPUTS_CLAMP, 0);
break; break;

18
sound/soc/codecs/wm_hubs.h
View File

@ -19,7 +19,7 @@
#include <linux/list.h> #include <linux/list.h>
#include <sound/control.h> #include <sound/control.h>
struct snd_soc_codec; struct snd_soc_component;
extern const unsigned int wm_hubs_spkmix_tlv[]; extern const unsigned int wm_hubs_spkmix_tlv[];
@ -34,7 +34,7 @@ struct wm_hubs_data {
bool no_cache_dac_hp_direct; bool no_cache_dac_hp_direct;
struct list_head dcs_cache; struct list_head dcs_cache;
bool (*check_class_w_digital)(struct snd_soc_codec *); bool (*check_class_w_digital)(struct snd_soc_component *);
int micb1_delay; int micb1_delay;
int micb2_delay; int micb2_delay;
@ -50,12 +50,12 @@ struct wm_hubs_data {
bool dcs_done_irq; bool dcs_done_irq;
struct completion dcs_done; struct completion dcs_done;
struct snd_soc_codec *codec; struct snd_soc_component *component;
}; };
extern int wm_hubs_add_analogue_controls(struct snd_soc_codec *); extern int wm_hubs_add_analogue_controls(struct snd_soc_component *);
extern int wm_hubs_add_analogue_routes(struct snd_soc_codec *, int, int); extern int wm_hubs_add_analogue_routes(struct snd_soc_component *, int, int);
extern int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *, extern int wm_hubs_handle_analogue_pdata(struct snd_soc_component *,
int lineout1_diff, int lineout2_diff, int lineout1_diff, int lineout2_diff,
int lineout1fb, int lineout2fb, int lineout1fb, int lineout2fb,
int jd_scthr, int jd_thr, int jd_scthr, int jd_thr,
@ -63,10 +63,10 @@ extern int wm_hubs_handle_analogue_pdata(struct snd_soc_codec *,
int micbias1_lvl, int micbias2_lvl); int micbias1_lvl, int micbias2_lvl);
extern irqreturn_t wm_hubs_dcs_done(int irq, void *data); extern irqreturn_t wm_hubs_dcs_done(int irq, void *data);
extern void wm_hubs_vmid_ena(struct snd_soc_codec *codec); extern void wm_hubs_vmid_ena(struct snd_soc_component *component);
extern void wm_hubs_set_bias_level(struct snd_soc_codec *codec, extern void wm_hubs_set_bias_level(struct snd_soc_component *component,
enum snd_soc_bias_level level); enum snd_soc_bias_level level);
extern void wm_hubs_update_class_w(struct snd_soc_codec *codec); extern void wm_hubs_update_class_w(struct snd_soc_component *component);
extern const struct snd_kcontrol_new wm_hubs_hpl_mux; extern const struct snd_kcontrol_new wm_hubs_hpl_mux;
extern const struct snd_kcontrol_new wm_hubs_hpr_mux; extern const struct snd_kcontrol_new wm_hubs_hpr_mux;

8
sound/soc/samsung/littlemill.c
View File

@ -258,13 +258,13 @@ static struct snd_soc_jack littlemill_headset;
static int littlemill_late_probe(struct snd_soc_card *card) static int littlemill_late_probe(struct snd_soc_card *card)
{ {
struct snd_soc_pcm_runtime *rtd; struct snd_soc_pcm_runtime *rtd;
struct snd_soc_codec *codec; struct snd_soc_component *component;
struct snd_soc_dai *aif1_dai; struct snd_soc_dai *aif1_dai;
struct snd_soc_dai *aif2_dai; struct snd_soc_dai *aif2_dai;
int ret; int ret;
rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name); rtd = snd_soc_get_pcm_runtime(card, card->dai_link[0].name);
codec = rtd->codec; component = rtd->codec_dai->component;
aif1_dai = rtd->codec_dai; aif1_dai = rtd->codec_dai;
rtd = snd_soc_get_pcm_runtime(card, card->dai_link[1].name); rtd = snd_soc_get_pcm_runtime(card, card->dai_link[1].name);
@ -290,10 +290,10 @@ static int littlemill_late_probe(struct snd_soc_card *card)
return ret; return ret;
/* This will check device compatibility itself */ /* This will check device compatibility itself */
wm8958_mic_detect(codec, &littlemill_headset, NULL, NULL, NULL, NULL); wm8958_mic_detect(component, &littlemill_headset, NULL, NULL, NULL, NULL);
/* As will this */ /* As will this */
wm8994_mic_detect(codec, &littlemill_headset, 1); wm8994_mic_detect(component, &littlemill_headset, 1);
return 0; return 0;
} }