projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'driver-core-5.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
sound
/
soc
/
codecs
/
pcm512x.c
diff --git
a/sound/soc/codecs/pcm512x.c
b/sound/soc/codecs/pcm512x.c
index
60dee41
..
a3ff4a0
100644
(file)
--- a/
sound/soc/codecs/pcm512x.c
+++ b/
sound/soc/codecs/pcm512x.c
@@
-652,12
+652,12
@@
static int pcm512x_dai_startup(struct snd_pcm_substream *substream,
struct snd_soc_component *component = dai->component;
struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
struct snd_soc_component *component = dai->component;
struct pcm512x_priv *pcm512x = snd_soc_component_get_drvdata(component);
- switch (pcm512x->fmt & SND_SOC_DAIFMT_
MAST
ER_MASK) {
- case SND_SOC_DAIFMT_CB
M_CFM
:
- case SND_SOC_DAIFMT_CB
M_CFS
:
+ switch (pcm512x->fmt & SND_SOC_DAIFMT_
CLOCK_PROVID
ER_MASK) {
+ case SND_SOC_DAIFMT_CB
P_CFP
:
+ case SND_SOC_DAIFMT_CB
P_CFC
:
return pcm512x_dai_startup_master(substream, dai);
return pcm512x_dai_startup_master(substream, dai);
- case SND_SOC_DAIFMT_CB
S_CFS
:
+ case SND_SOC_DAIFMT_CB
C_CFC
:
return pcm512x_dai_startup_slave(substream, dai);
default:
return pcm512x_dai_startup_slave(substream, dai);
default:
@@
-1202,8
+1202,8
@@
static int pcm512x_hw_params(struct snd_pcm_substream *substream,
return ret;
}
return ret;
}
- if ((pcm512x->fmt & SND_SOC_DAIFMT_
MAST
ER_MASK) ==
- SND_SOC_DAIFMT_CB
S_CFS
) {
+ if ((pcm512x->fmt & SND_SOC_DAIFMT_
CLOCK_PROVID
ER_MASK) ==
+ SND_SOC_DAIFMT_CB
C_CFC
) {
ret = regmap_update_bits(pcm512x->regmap, PCM512x_ERROR_DETECT,
PCM512x_DCAS, 0);
if (ret != 0) {
ret = regmap_update_bits(pcm512x->regmap, PCM512x_ERROR_DETECT,
PCM512x_DCAS, 0);
if (ret != 0) {
@@
-1340,21
+1340,21
@@
static int pcm512x_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
int afmt;
int offset = 0;
int clock_output;
int afmt;
int offset = 0;
int clock_output;
- int
mast
er_mode;
+ int
provid
er_mode;
int ret;
int ret;
- switch (fmt & SND_SOC_DAIFMT_
MAST
ER_MASK) {
- case SND_SOC_DAIFMT_CB
S_CFS
:
+ switch (fmt & SND_SOC_DAIFMT_
CLOCK_PROVID
ER_MASK) {
+ case SND_SOC_DAIFMT_CB
C_CFC
:
clock_output = 0;
clock_output = 0;
-
mast
er_mode = 0;
+
provid
er_mode = 0;
break;
break;
- case SND_SOC_DAIFMT_CB
M_CFM
:
+ case SND_SOC_DAIFMT_CB
P_CFP
:
clock_output = PCM512x_BCKO | PCM512x_LRKO;
clock_output = PCM512x_BCKO | PCM512x_LRKO;
-
mast
er_mode = PCM512x_RLRK | PCM512x_RBCK;
+
provid
er_mode = PCM512x_RLRK | PCM512x_RBCK;
break;
break;
- case SND_SOC_DAIFMT_CB
M_CFS
:
+ case SND_SOC_DAIFMT_CB
P_CFC
:
clock_output = PCM512x_BCKO;
clock_output = PCM512x_BCKO;
-
mast
er_mode = PCM512x_RBCK;
+
provid
er_mode = PCM512x_RBCK;
break;
default:
return -EINVAL;
break;
default:
return -EINVAL;
@@
-1370,9
+1370,9
@@
static int pcm512x_set_fmt(struct snd_soc_dai *dai, unsigned int fmt)
ret = regmap_update_bits(pcm512x->regmap, PCM512x_MASTER_MODE,
PCM512x_RLRK | PCM512x_RBCK,
ret = regmap_update_bits(pcm512x->regmap, PCM512x_MASTER_MODE,
PCM512x_RLRK | PCM512x_RBCK,
-
mast
er_mode);
+
provid
er_mode);
if (ret != 0) {
if (ret != 0) {
- dev_err(component->dev, "Failed to enable
mast
er mode: %d\n", ret);
+ dev_err(component->dev, "Failed to enable
provid
er mode: %d\n", ret);
return ret;
}
return ret;
}