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
4038a12e
Commit
4038a12e
authored
Sep 14, 2011
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/asoc' into for-linus
parents
2e1210bc
5013951b
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
20 additions
and
17 deletions
+20
-17
MAINTAINERS
MAINTAINERS
+4
-0
sound/soc/blackfin/bf5xx-ad193x.c
sound/soc/blackfin/bf5xx-ad193x.c
+2
-2
sound/soc/fsl/mpc5200_dma.c
sound/soc/fsl/mpc5200_dma.c
+3
-3
sound/soc/imx/imx-pcm-fiq.c
sound/soc/imx/imx-pcm-fiq.c
+0
-1
sound/soc/kirkwood/kirkwood-i2s.c
sound/soc/kirkwood/kirkwood-i2s.c
+1
-1
sound/soc/soc-cache.c
sound/soc/soc-cache.c
+6
-6
sound/soc/soc-core.c
sound/soc/soc-core.c
+2
-2
sound/soc/soc-dapm.c
sound/soc/soc-dapm.c
+1
-1
sound/soc/soc-jack.c
sound/soc/soc-jack.c
+1
-1
No files found.
MAINTAINERS
View file @
4038a12e
...
@@ -7200,6 +7200,9 @@ W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
...
@@ -7200,6 +7200,9 @@ W: http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices
S: Supported
S: Supported
F: Documentation/hwmon/wm83??
F: Documentation/hwmon/wm83??
F: drivers/leds/leds-wm83*.c
F: drivers/leds/leds-wm83*.c
F: drivers/input/misc/wm831x-on.c
F: drivers/input/touchscreen/wm831x-ts.c
F: drivers/input/touchscreen/wm97*.c
F: drivers/mfd/wm8*.c
F: drivers/mfd/wm8*.c
F: drivers/power/wm83*.c
F: drivers/power/wm83*.c
F: drivers/rtc/rtc-wm83*.c
F: drivers/rtc/rtc-wm83*.c
...
@@ -7209,6 +7212,7 @@ F: drivers/watchdog/wm83*_wdt.c
...
@@ -7209,6 +7212,7 @@ F: drivers/watchdog/wm83*_wdt.c
F: include/linux/mfd/wm831x/
F: include/linux/mfd/wm831x/
F: include/linux/mfd/wm8350/
F: include/linux/mfd/wm8350/
F: include/linux/mfd/wm8400*
F: include/linux/mfd/wm8400*
F: include/linux/wm97xx.h
F: include/sound/wm????.h
F: include/sound/wm????.h
F: sound/soc/codecs/wm*
F: sound/soc/codecs/wm*
...
...
sound/soc/blackfin/bf5xx-ad193x.c
View file @
4038a12e
...
@@ -103,7 +103,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
...
@@ -103,7 +103,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
.
cpu_dai_name
=
"bfin-tdm.0"
,
.
cpu_dai_name
=
"bfin-tdm.0"
,
.
codec_dai_name
=
"ad193x-hifi"
,
.
codec_dai_name
=
"ad193x-hifi"
,
.
platform_name
=
"bfin-tdm-pcm-audio"
,
.
platform_name
=
"bfin-tdm-pcm-audio"
,
.
codec_name
=
"
ad193x
.5"
,
.
codec_name
=
"
spi0
.5"
,
.
ops
=
&
bf5xx_ad193x_ops
,
.
ops
=
&
bf5xx_ad193x_ops
,
},
},
{
{
...
@@ -112,7 +112,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
...
@@ -112,7 +112,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai[] = {
.
cpu_dai_name
=
"bfin-tdm.1"
,
.
cpu_dai_name
=
"bfin-tdm.1"
,
.
codec_dai_name
=
"ad193x-hifi"
,
.
codec_dai_name
=
"ad193x-hifi"
,
.
platform_name
=
"bfin-tdm-pcm-audio"
,
.
platform_name
=
"bfin-tdm-pcm-audio"
,
.
codec_name
=
"
ad193x
.5"
,
.
codec_name
=
"
spi0
.5"
,
.
ops
=
&
bf5xx_ad193x_ops
,
.
ops
=
&
bf5xx_ad193x_ops
,
},
},
};
};
...
...
sound/soc/fsl/mpc5200_dma.c
View file @
4038a12e
...
@@ -369,7 +369,7 @@ static struct snd_soc_platform_driver mpc5200_audio_dma_platform = {
...
@@ -369,7 +369,7 @@ static struct snd_soc_platform_driver mpc5200_audio_dma_platform = {
.
pcm_free
=
&
psc_dma_free
,
.
pcm_free
=
&
psc_dma_free
,
};
};
static
int
mpc5200_hpcd_probe
(
struct
of
_device
*
op
)
static
int
mpc5200_hpcd_probe
(
struct
platform
_device
*
op
)
{
{
phys_addr_t
fifo
;
phys_addr_t
fifo
;
struct
psc_dma
*
psc_dma
;
struct
psc_dma
*
psc_dma
;
...
@@ -487,7 +487,7 @@ static int mpc5200_hpcd_probe(struct of_device *op)
...
@@ -487,7 +487,7 @@ static int mpc5200_hpcd_probe(struct of_device *op)
return
ret
;
return
ret
;
}
}
static
int
mpc5200_hpcd_remove
(
struct
of
_device
*
op
)
static
int
mpc5200_hpcd_remove
(
struct
platform
_device
*
op
)
{
{
struct
psc_dma
*
psc_dma
=
dev_get_drvdata
(
&
op
->
dev
);
struct
psc_dma
*
psc_dma
=
dev_get_drvdata
(
&
op
->
dev
);
...
@@ -519,7 +519,7 @@ MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match);
...
@@ -519,7 +519,7 @@ MODULE_DEVICE_TABLE(of, mpc5200_hpcd_match);
static
struct
platform_driver
mpc5200_hpcd_of_driver
=
{
static
struct
platform_driver
mpc5200_hpcd_of_driver
=
{
.
probe
=
mpc5200_hpcd_probe
,
.
probe
=
mpc5200_hpcd_probe
,
.
remove
=
mpc5200_hpcd_remove
,
.
remove
=
mpc5200_hpcd_remove
,
.
d
ev
=
{
.
d
river
=
{
.
owner
=
THIS_MODULE
,
.
owner
=
THIS_MODULE
,
.
name
=
"mpc5200-pcm-audio"
,
.
name
=
"mpc5200-pcm-audio"
,
.
of_match_table
=
mpc5200_hpcd_match
,
.
of_match_table
=
mpc5200_hpcd_match
,
...
...
sound/soc/imx/imx-pcm-fiq.c
View file @
4038a12e
...
@@ -240,7 +240,6 @@ static int ssi_irq = 0;
...
@@ -240,7 +240,6 @@ static int ssi_irq = 0;
static
int
imx_pcm_fiq_new
(
struct
snd_soc_pcm_runtime
*
rtd
)
static
int
imx_pcm_fiq_new
(
struct
snd_soc_pcm_runtime
*
rtd
)
{
{
struct
snd_card
*
card
=
rtd
->
card
->
snd_card
;
struct
snd_soc_dai
*
dai
=
rtd
->
cpu_dai
;
struct
snd_soc_dai
*
dai
=
rtd
->
cpu_dai
;
struct
snd_pcm
*
pcm
=
rtd
->
pcm
;
struct
snd_pcm
*
pcm
=
rtd
->
pcm
;
int
ret
;
int
ret
;
...
...
sound/soc/kirkwood/kirkwood-i2s.c
View file @
4038a12e
...
@@ -424,7 +424,7 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev)
...
@@ -424,7 +424,7 @@ static __devinit int kirkwood_i2s_dev_probe(struct platform_device *pdev)
if
(
!
priv
->
mem
)
{
if
(
!
priv
->
mem
)
{
dev_err
(
&
pdev
->
dev
,
"request_mem_region failed
\n
"
);
dev_err
(
&
pdev
->
dev
,
"request_mem_region failed
\n
"
);
err
=
-
EBUSY
;
err
=
-
EBUSY
;
goto
err
or
_alloc
;
goto
err_alloc
;
}
}
priv
->
io
=
ioremap
(
priv
->
mem
->
start
,
SZ_16K
);
priv
->
io
=
ioremap
(
priv
->
mem
->
start
,
SZ_16K
);
...
...
sound/soc/soc-cache.c
View file @
4038a12e
...
@@ -203,14 +203,14 @@ static int snd_soc_rbtree_cache_sync(struct snd_soc_codec *codec)
...
@@ -203,14 +203,14 @@ static int snd_soc_rbtree_cache_sync(struct snd_soc_codec *codec)
rbnode
=
rb_entry
(
node
,
struct
snd_soc_rbtree_node
,
node
);
rbnode
=
rb_entry
(
node
,
struct
snd_soc_rbtree_node
,
node
);
for
(
i
=
0
;
i
<
rbnode
->
blklen
;
++
i
)
{
for
(
i
=
0
;
i
<
rbnode
->
blklen
;
++
i
)
{
regtmp
=
rbnode
->
base_reg
+
i
;
regtmp
=
rbnode
->
base_reg
+
i
;
WARN_ON
(
codec
->
writable_register
&&
codec
->
writable_register
(
codec
,
regtmp
));
val
=
snd_soc_rbtree_get_register
(
rbnode
,
i
);
val
=
snd_soc_rbtree_get_register
(
rbnode
,
i
);
def
=
snd_soc_get_cache_val
(
codec
->
reg_def_copy
,
i
,
def
=
snd_soc_get_cache_val
(
codec
->
reg_def_copy
,
i
,
rbnode
->
word_size
);
rbnode
->
word_size
);
if
(
val
==
def
)
if
(
val
==
def
)
continue
;
continue
;
WARN_ON
(
!
snd_soc_codec_writable_register
(
codec
,
regtmp
));
codec
->
cache_bypass
=
1
;
codec
->
cache_bypass
=
1
;
ret
=
snd_soc_write
(
codec
,
regtmp
,
val
);
ret
=
snd_soc_write
(
codec
,
regtmp
,
val
);
codec
->
cache_bypass
=
0
;
codec
->
cache_bypass
=
0
;
...
@@ -563,8 +563,7 @@ static int snd_soc_lzo_cache_sync(struct snd_soc_codec *codec)
...
@@ -563,8 +563,7 @@ static int snd_soc_lzo_cache_sync(struct snd_soc_codec *codec)
lzo_blocks
=
codec
->
reg_cache
;
lzo_blocks
=
codec
->
reg_cache
;
for_each_set_bit
(
i
,
lzo_blocks
[
0
]
->
sync_bmp
,
lzo_blocks
[
0
]
->
sync_bmp_nbits
)
{
for_each_set_bit
(
i
,
lzo_blocks
[
0
]
->
sync_bmp
,
lzo_blocks
[
0
]
->
sync_bmp_nbits
)
{
WARN_ON
(
codec
->
writable_register
&&
WARN_ON
(
!
snd_soc_codec_writable_register
(
codec
,
i
));
codec
->
writable_register
(
codec
,
i
));
ret
=
snd_soc_cache_read
(
codec
,
i
,
&
val
);
ret
=
snd_soc_cache_read
(
codec
,
i
,
&
val
);
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
...
@@ -823,8 +822,6 @@ static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec)
...
@@ -823,8 +822,6 @@ static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec)
codec_drv
=
codec
->
driver
;
codec_drv
=
codec
->
driver
;
for
(
i
=
0
;
i
<
codec_drv
->
reg_cache_size
;
++
i
)
{
for
(
i
=
0
;
i
<
codec_drv
->
reg_cache_size
;
++
i
)
{
WARN_ON
(
codec
->
writable_register
&&
codec
->
writable_register
(
codec
,
i
));
ret
=
snd_soc_cache_read
(
codec
,
i
,
&
val
);
ret
=
snd_soc_cache_read
(
codec
,
i
,
&
val
);
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
...
@@ -832,6 +829,9 @@ static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec)
...
@@ -832,6 +829,9 @@ static int snd_soc_flat_cache_sync(struct snd_soc_codec *codec)
if
(
snd_soc_get_cache_val
(
codec
->
reg_def_copy
,
if
(
snd_soc_get_cache_val
(
codec
->
reg_def_copy
,
i
,
codec_drv
->
reg_word_size
)
==
val
)
i
,
codec_drv
->
reg_word_size
)
==
val
)
continue
;
continue
;
WARN_ON
(
!
snd_soc_codec_writable_register
(
codec
,
i
));
ret
=
snd_soc_write
(
codec
,
i
,
val
);
ret
=
snd_soc_write
(
codec
,
i
,
val
);
if
(
ret
)
if
(
ret
)
return
ret
;
return
ret
;
...
...
sound/soc/soc-core.c
View file @
4038a12e
...
@@ -1633,7 +1633,7 @@ int snd_soc_codec_readable_register(struct snd_soc_codec *codec,
...
@@ -1633,7 +1633,7 @@ int snd_soc_codec_readable_register(struct snd_soc_codec *codec,
if
(
codec
->
readable_register
)
if
(
codec
->
readable_register
)
return
codec
->
readable_register
(
codec
,
reg
);
return
codec
->
readable_register
(
codec
,
reg
);
else
else
return
0
;
return
1
;
}
}
EXPORT_SYMBOL_GPL
(
snd_soc_codec_readable_register
);
EXPORT_SYMBOL_GPL
(
snd_soc_codec_readable_register
);
...
@@ -1651,7 +1651,7 @@ int snd_soc_codec_writable_register(struct snd_soc_codec *codec,
...
@@ -1651,7 +1651,7 @@ int snd_soc_codec_writable_register(struct snd_soc_codec *codec,
if
(
codec
->
writable_register
)
if
(
codec
->
writable_register
)
return
codec
->
writable_register
(
codec
,
reg
);
return
codec
->
writable_register
(
codec
,
reg
);
else
else
return
0
;
return
1
;
}
}
EXPORT_SYMBOL_GPL
(
snd_soc_codec_writable_register
);
EXPORT_SYMBOL_GPL
(
snd_soc_codec_writable_register
);
...
...
sound/soc/soc-dapm.c
View file @
4038a12e
...
@@ -2763,7 +2763,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend);
...
@@ -2763,7 +2763,7 @@ EXPORT_SYMBOL_GPL(snd_soc_dapm_ignore_suspend);
/**
/**
* snd_soc_dapm_free - free dapm resources
* snd_soc_dapm_free - free dapm resources
* @
card: SoC device
* @
dapm: DAPM context
*
*
* Free all dapm widgets and resources.
* Free all dapm widgets and resources.
*/
*/
...
...
sound/soc/soc-jack.c
View file @
4038a12e
...
@@ -105,7 +105,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
...
@@ -105,7 +105,7 @@ void snd_soc_jack_report(struct snd_soc_jack *jack, int status, int mask)
snd_soc_dapm_sync
(
dapm
);
snd_soc_dapm_sync
(
dapm
);
snd_jack_report
(
jack
->
jack
,
status
);
snd_jack_report
(
jack
->
jack
,
jack
->
status
);
out:
out:
mutex_unlock
(
&
codec
->
mutex
);
mutex_unlock
(
&
codec
->
mutex
);
...
...
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