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
e0938118
Commit
e0938118
authored
Jun 24, 2011
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/asoc' into for-linus
parents
16866741
53dea36c
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
6 additions
and
15 deletions
+6
-15
include/sound/soc.h
include/sound/soc.h
+1
-2
sound/soc/imx/Kconfig
sound/soc/imx/Kconfig
+0
-7
sound/soc/imx/imx-pcm-dma-mx2.c
sound/soc/imx/imx-pcm-dma-mx2.c
+2
-0
sound/soc/imx/imx-ssi.c
sound/soc/imx/imx-ssi.c
+1
-1
sound/soc/pxa/pxa2xx-pcm.c
sound/soc/pxa/pxa2xx-pcm.c
+2
-2
sound/soc/soc-cache.c
sound/soc/soc-cache.c
+0
-3
No files found.
include/sound/soc.h
View file @
e0938118
...
...
@@ -248,8 +248,7 @@ typedef int (*hw_write_t)(void *,const char* ,int);
extern
struct
snd_ac97_bus_ops
soc_ac97_ops
;
enum
snd_soc_control_type
{
SND_SOC_CUSTOM
=
1
,
SND_SOC_I2C
,
SND_SOC_I2C
=
1
,
SND_SOC_SPI
,
};
...
...
sound/soc/imx/Kconfig
View file @
e0938118
...
...
@@ -11,9 +11,6 @@ menuconfig SND_IMX_SOC
if SND_IMX_SOC
config SND_MXC_SOC_SSI
tristate
config SND_MXC_SOC_FIQ
tristate
...
...
@@ -24,7 +21,6 @@ config SND_MXC_SOC_WM1133_EV1
tristate "Audio on the the i.MX31ADS with WM1133-EV1 fitted"
depends on MACH_MX31ADS_WM1133_EV1 && EXPERIMENTAL
select SND_SOC_WM8350
select SND_MXC_SOC_SSI
select SND_MXC_SOC_FIQ
help
Enable support for audio on the i.MX31ADS with the WM1133-EV1
...
...
@@ -34,7 +30,6 @@ config SND_SOC_MX27VIS_AIC32X4
tristate "SoC audio support for Visstrim M10 boards"
depends on MACH_IMX27_VISSTRIM_M10
select SND_SOC_TVL320AIC32X4
select SND_MXC_SOC_SSI
select SND_MXC_SOC_MX2
help
Say Y if you want to add support for SoC audio on Visstrim SM10
...
...
@@ -44,7 +39,6 @@ config SND_SOC_PHYCORE_AC97
tristate "SoC Audio support for Phytec phyCORE (and phyCARD) boards"
depends on MACH_PCM043 || MACH_PCA100
select SND_SOC_WM9712
select SND_MXC_SOC_SSI
select SND_MXC_SOC_FIQ
help
Say Y if you want to add support for SoC audio on Phytec phyCORE
...
...
@@ -57,7 +51,6 @@ config SND_SOC_EUKREA_TLV320
|| MACH_EUKREA_MBIMXSD35_BASEBOARD \
|| MACH_EUKREA_MBIMXSD51_BASEBOARD
select SND_SOC_TLV320AIC23
select SND_MXC_SOC_SSI
select SND_MXC_SOC_FIQ
help
Enable I2S based access to the TLV320AIC23B codec attached
...
...
sound/soc/imx/imx-pcm-dma-mx2.c
View file @
e0938118
...
...
@@ -337,3 +337,5 @@ static void __exit snd_imx_pcm_exit(void)
platform_driver_unregister
(
&
imx_pcm_driver
);
}
module_exit
(
snd_imx_pcm_exit
);
MODULE_LICENSE
(
"GPL"
);
MODULE_ALIAS
(
"platform:imx-pcm-audio"
);
sound/soc/imx/imx-ssi.c
View file @
e0938118
...
...
@@ -774,4 +774,4 @@ module_exit(imx_ssi_exit);
MODULE_AUTHOR
(
"Sascha Hauer, <s.hauer@pengutronix.de>"
);
MODULE_DESCRIPTION
(
"i.MX I2S/ac97 SoC Interface"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_ALIAS
(
"platform:imx-ssi"
);
sound/soc/pxa/pxa2xx-pcm.c
View file @
e0938118
...
...
@@ -95,14 +95,14 @@ static int pxa2xx_soc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai,
if
(
!
card
->
dev
->
coherent_dma_mask
)
card
->
dev
->
coherent_dma_mask
=
DMA_BIT_MASK
(
32
);
if
(
dai
->
driver
->
playback
.
channels_min
)
{
if
(
pcm
->
streams
[
SNDRV_PCM_STREAM_PLAYBACK
].
substream
)
{
ret
=
pxa2xx_pcm_preallocate_dma_buffer
(
pcm
,
SNDRV_PCM_STREAM_PLAYBACK
);
if
(
ret
)
goto
out
;
}
if
(
dai
->
driver
->
capture
.
channels_min
)
{
if
(
pcm
->
streams
[
SNDRV_PCM_STREAM_CAPTURE
].
substream
)
{
ret
=
pxa2xx_pcm_preallocate_dma_buffer
(
pcm
,
SNDRV_PCM_STREAM_CAPTURE
);
if
(
ret
)
...
...
sound/soc/soc-cache.c
View file @
e0938118
...
...
@@ -409,9 +409,6 @@ int snd_soc_codec_set_cache_io(struct snd_soc_codec *codec,
codec
->
bulk_write_raw
=
snd_soc_hw_bulk_write_raw
;
switch
(
control
)
{
case
SND_SOC_CUSTOM
:
break
;
case
SND_SOC_I2C
:
#if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE))
codec
->
hw_write
=
(
hw_write_t
)
i2c_master_send
;
...
...
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