Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
04172c0b
Commit
04172c0b
authored
Oct 31, 2008
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/fix/asoc' into topic/asoc
parents
5b99e6cc
13d622b3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
9 deletions
+12
-9
include/sound/soc.h
include/sound/soc.h
+2
-1
sound/soc/codecs/wm9713.c
sound/soc/codecs/wm9713.c
+1
-1
sound/soc/fsl/mpc5200_psc_i2s.c
sound/soc/fsl/mpc5200_psc_i2s.c
+8
-6
sound/soc/soc-core.c
sound/soc/soc-core.c
+1
-1
No files found.
include/sound/soc.h
View file @
04172c0b
...
@@ -28,7 +28,8 @@
...
@@ -28,7 +28,8 @@
*/
*/
#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \
#define SOC_SINGLE_VALUE(xreg, xshift, xmax, xinvert) \
((unsigned long)&(struct soc_mixer_control) \
((unsigned long)&(struct soc_mixer_control) \
{.reg = xreg, .shift = xshift, .max = xmax, .invert = xinvert})
{.reg = xreg, .shift = xshift, .rshift = xshift, .max = xmax, \
.invert = xinvert})
#define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \
#define SOC_SINGLE_VALUE_EXT(xreg, xmax, xinvert) \
((unsigned long)&(struct soc_mixer_control) \
((unsigned long)&(struct soc_mixer_control) \
{.reg = xreg, .max = xmax, .invert = xinvert})
{.reg = xreg, .max = xmax, .invert = xinvert})
...
...
sound/soc/codecs/wm9713.c
View file @
04172c0b
...
@@ -140,7 +140,7 @@ SOC_SINGLE("Capture ADC Boost (+20dB) Switch", AC97_VIDEO, 6, 1, 0),
...
@@ -140,7 +140,7 @@ SOC_SINGLE("Capture ADC Boost (+20dB) Switch", AC97_VIDEO, 6, 1, 0),
SOC_SINGLE
(
"ALC Target Volume"
,
AC97_CODEC_CLASS_REV
,
12
,
15
,
0
),
SOC_SINGLE
(
"ALC Target Volume"
,
AC97_CODEC_CLASS_REV
,
12
,
15
,
0
),
SOC_SINGLE
(
"ALC Hold Time"
,
AC97_CODEC_CLASS_REV
,
8
,
15
,
0
),
SOC_SINGLE
(
"ALC Hold Time"
,
AC97_CODEC_CLASS_REV
,
8
,
15
,
0
),
SOC_SINGLE
(
"ALC Decay Time
"
,
AC97_CODEC_CLASS_REV
,
4
,
15
,
0
),
SOC_SINGLE
(
"ALC Decay Time"
,
AC97_CODEC_CLASS_REV
,
4
,
15
,
0
),
SOC_SINGLE
(
"ALC Attack Time"
,
AC97_CODEC_CLASS_REV
,
0
,
15
,
0
),
SOC_SINGLE
(
"ALC Attack Time"
,
AC97_CODEC_CLASS_REV
,
0
,
15
,
0
),
SOC_ENUM
(
"ALC Function"
,
wm9713_enum
[
6
]),
SOC_ENUM
(
"ALC Function"
,
wm9713_enum
[
6
]),
SOC_SINGLE
(
"ALC Max Volume"
,
AC97_PCI_SVID
,
11
,
7
,
0
),
SOC_SINGLE
(
"ALC Max Volume"
,
AC97_PCI_SVID
,
11
,
7
,
0
),
...
...
sound/soc/fsl/mpc5200_psc_i2s.c
View file @
04172c0b
...
@@ -277,7 +277,7 @@ static int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd)
...
@@ -277,7 +277,7 @@ static int psc_i2s_trigger(struct snd_pcm_substream *substream, int cmd)
struct
mpc52xx_psc
__iomem
*
regs
=
psc_i2s
->
psc_regs
;
struct
mpc52xx_psc
__iomem
*
regs
=
psc_i2s
->
psc_regs
;
u16
imr
;
u16
imr
;
u8
psc_cmd
;
u8
psc_cmd
;
long
flags
;
unsigned
long
flags
;
if
(
substream
->
pstr
->
stream
==
SNDRV_PCM_STREAM_CAPTURE
)
if
(
substream
->
pstr
->
stream
==
SNDRV_PCM_STREAM_CAPTURE
)
s
=
&
psc_i2s
->
capture
;
s
=
&
psc_i2s
->
capture
;
...
@@ -699,9 +699,11 @@ static ssize_t psc_i2s_stat_store(struct device *dev,
...
@@ -699,9 +699,11 @@ static ssize_t psc_i2s_stat_store(struct device *dev,
return
count
;
return
count
;
}
}
DEVICE_ATTR
(
status
,
0644
,
psc_i2s_status_show
,
NULL
);
static
DEVICE_ATTR
(
status
,
0644
,
psc_i2s_status_show
,
NULL
);
DEVICE_ATTR
(
playback_underrun
,
0644
,
psc_i2s_stat_show
,
psc_i2s_stat_store
);
static
DEVICE_ATTR
(
playback_underrun
,
0644
,
psc_i2s_stat_show
,
DEVICE_ATTR
(
capture_overrun
,
0644
,
psc_i2s_stat_show
,
psc_i2s_stat_store
);
psc_i2s_stat_store
);
static
DEVICE_ATTR
(
capture_overrun
,
0644
,
psc_i2s_stat_show
,
psc_i2s_stat_store
);
/* ---------------------------------------------------------------------
/* ---------------------------------------------------------------------
* OF platform bus binding code:
* OF platform bus binding code:
...
@@ -819,8 +821,8 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
...
@@ -819,8 +821,8 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
/* Register the SYSFS files */
/* Register the SYSFS files */
rc
=
device_create_file
(
psc_i2s
->
dev
,
&
dev_attr_status
);
rc
=
device_create_file
(
psc_i2s
->
dev
,
&
dev_attr_status
);
rc
=
device_create_file
(
psc_i2s
->
dev
,
&
dev_attr_capture_overrun
);
rc
|
=
device_create_file
(
psc_i2s
->
dev
,
&
dev_attr_capture_overrun
);
rc
=
device_create_file
(
psc_i2s
->
dev
,
&
dev_attr_playback_underrun
);
rc
|
=
device_create_file
(
psc_i2s
->
dev
,
&
dev_attr_playback_underrun
);
if
(
rc
)
if
(
rc
)
dev_info
(
psc_i2s
->
dev
,
"error creating sysfs files
\n
"
);
dev_info
(
psc_i2s
->
dev
,
"error creating sysfs files
\n
"
);
...
...
sound/soc/soc-core.c
View file @
04172c0b
...
@@ -1555,7 +1555,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,
...
@@ -1555,7 +1555,7 @@ int snd_soc_info_volsw(struct snd_kcontrol *kcontrol,
struct
soc_mixer_control
*
mc
=
struct
soc_mixer_control
*
mc
=
(
struct
soc_mixer_control
*
)
kcontrol
->
private_value
;
(
struct
soc_mixer_control
*
)
kcontrol
->
private_value
;
int
max
=
mc
->
max
;
int
max
=
mc
->
max
;
unsigned
int
shift
=
mc
->
min
;
unsigned
int
shift
=
mc
->
shift
;
unsigned
int
rshift
=
mc
->
rshift
;
unsigned
int
rshift
=
mc
->
rshift
;
if
(
max
==
1
)
if
(
max
==
1
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment