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
723b4cb5
Commit
723b4cb5
authored
Dec 02, 2012
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'asoc/topic/fsl' into asoc-next
parents
546694bc
29df4306
Changes
6
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
418 additions
and
3 deletions
+418
-3
sound/soc/fsl/Kconfig
sound/soc/fsl/Kconfig
+15
-1
sound/soc/fsl/Makefile
sound/soc/fsl/Makefile
+4
-0
sound/soc/fsl/imx-pcm.c
sound/soc/fsl/imx-pcm.c
+4
-0
sound/soc/fsl/imx-sgtl5000.c
sound/soc/fsl/imx-sgtl5000.c
+1
-0
sound/soc/fsl/p1022_rdk.c
sound/soc/fsl/p1022_rdk.c
+392
-0
sound/soc/fsl/pcm030-audio-fabric.c
sound/soc/fsl/pcm030-audio-fabric.c
+2
-2
No files found.
sound/soc/fsl/Kconfig
View file @
723b4cb5
...
@@ -46,6 +46,20 @@ config SND_SOC_P1022_DS
...
@@ -46,6 +46,20 @@ config SND_SOC_P1022_DS
This will also include the Wolfson Microelectronics WM8776 codec
This will also include the Wolfson Microelectronics WM8776 codec
driver.
driver.
config SND_SOC_P1022_RDK
tristate "ALSA SoC support for the Freescale / iVeia P1022 RDK board"
# I2C is necessary for the WM8960 driver
depends on P1022_RDK && I2C
select SND_SOC_FSL_SSI
select SND_SOC_FSL_UTILS
select SND_SOC_POWERPC_DMA
select SND_SOC_WM8960
default y if P1022_RDK
help
Say Y if you want to enable audio on the Freescale / iVeia
P1022 RDK board. This will also include the Wolfson
Microelectronics WM8960 codec driver.
config SND_SOC_MPC5200_I2S
config SND_SOC_MPC5200_I2S
tristate "Freescale MPC5200 PSC in I2S mode driver"
tristate "Freescale MPC5200 PSC in I2S mode driver"
depends on PPC_MPC52xx && PPC_BESTCOMM
depends on PPC_MPC52xx && PPC_BESTCOMM
...
@@ -112,7 +126,7 @@ config SND_SOC_IMX_AUDMUX
...
@@ -112,7 +126,7 @@ config SND_SOC_IMX_AUDMUX
config SND_MXC_SOC_WM1133_EV1
config SND_MXC_SOC_WM1133_EV1
tristate "Audio on the i.MX31ADS with WM1133-EV1 fitted"
tristate "Audio on the i.MX31ADS with WM1133-EV1 fitted"
depends on MACH_MX31ADS_WM1133_EV1
&& EXPERIMENTAL
depends on MACH_MX31ADS_WM1133_EV1
select SND_SOC_WM8350
select SND_SOC_WM8350
select SND_SOC_IMX_PCM_FIQ
select SND_SOC_IMX_PCM_FIQ
select SND_SOC_IMX_AUDMUX
select SND_SOC_IMX_AUDMUX
...
...
sound/soc/fsl/Makefile
View file @
723b4cb5
...
@@ -6,6 +6,10 @@ obj-$(CONFIG_SND_SOC_MPC8610_HPCD) += snd-soc-mpc8610-hpcd.o
...
@@ -6,6 +6,10 @@ obj-$(CONFIG_SND_SOC_MPC8610_HPCD) += snd-soc-mpc8610-hpcd.o
snd-soc-p1022-ds-objs
:=
p1022_ds.o
snd-soc-p1022-ds-objs
:=
p1022_ds.o
obj-$(CONFIG_SND_SOC_P1022_DS)
+=
snd-soc-p1022-ds.o
obj-$(CONFIG_SND_SOC_P1022_DS)
+=
snd-soc-p1022-ds.o
# P1022 RDK Machine Support
snd-soc-p1022-rdk-objs
:=
p1022_rdk.o
obj-$(CONFIG_SND_SOC_P1022_RDK)
+=
snd-soc-p1022-rdk.o
# Freescale PowerPC SSI/DMA Platform Support
# Freescale PowerPC SSI/DMA Platform Support
snd-soc-fsl-ssi-objs
:=
fsl_ssi.o
snd-soc-fsl-ssi-objs
:=
fsl_ssi.o
snd-soc-fsl-utils-objs
:=
fsl_utils.o
snd-soc-fsl-utils-objs
:=
fsl_utils.o
...
...
sound/soc/fsl/imx-pcm.c
View file @
723b4cb5
...
@@ -103,3 +103,7 @@ void imx_pcm_free(struct snd_pcm *pcm)
...
@@ -103,3 +103,7 @@ void imx_pcm_free(struct snd_pcm *pcm)
}
}
}
}
EXPORT_SYMBOL_GPL
(
imx_pcm_free
);
EXPORT_SYMBOL_GPL
(
imx_pcm_free
);
MODULE_DESCRIPTION
(
"Freescale i.MX PCM driver"
);
MODULE_AUTHOR
(
"Sascha Hauer <s.hauer@pengutronix.de>"
);
MODULE_LICENSE
(
"GPL"
);
sound/soc/fsl/imx-sgtl5000.c
View file @
723b4cb5
...
@@ -162,6 +162,7 @@ static int __devinit imx_sgtl5000_probe(struct platform_device *pdev)
...
@@ -162,6 +162,7 @@ static int __devinit imx_sgtl5000_probe(struct platform_device *pdev)
if
(
ret
)
if
(
ret
)
goto
clk_fail
;
goto
clk_fail
;
data
->
card
.
num_links
=
1
;
data
->
card
.
num_links
=
1
;
data
->
card
.
owner
=
THIS_MODULE
;
data
->
card
.
dai_link
=
&
data
->
dai
;
data
->
card
.
dai_link
=
&
data
->
dai
;
data
->
card
.
dapm_widgets
=
imx_sgtl5000_dapm_widgets
;
data
->
card
.
dapm_widgets
=
imx_sgtl5000_dapm_widgets
;
data
->
card
.
num_dapm_widgets
=
ARRAY_SIZE
(
imx_sgtl5000_dapm_widgets
);
data
->
card
.
num_dapm_widgets
=
ARRAY_SIZE
(
imx_sgtl5000_dapm_widgets
);
...
...
sound/soc/fsl/p1022_rdk.c
0 → 100644
View file @
723b4cb5
This diff is collapsed.
Click to expand it.
sound/soc/fsl/pcm030-audio-fabric.c
View file @
723b4cb5
...
@@ -29,14 +29,14 @@ struct pcm030_audio_data {
...
@@ -29,14 +29,14 @@ struct pcm030_audio_data {
static
struct
snd_soc_dai_link
pcm030_fabric_dai
[]
=
{
static
struct
snd_soc_dai_link
pcm030_fabric_dai
[]
=
{
{
{
.
name
=
"AC97"
,
.
name
=
"AC97
.0
"
,
.
stream_name
=
"AC97 Analog"
,
.
stream_name
=
"AC97 Analog"
,
.
codec_dai_name
=
"wm9712-hifi"
,
.
codec_dai_name
=
"wm9712-hifi"
,
.
cpu_dai_name
=
"mpc5200-psc-ac97.0"
,
.
cpu_dai_name
=
"mpc5200-psc-ac97.0"
,
.
codec_name
=
"wm9712-codec"
,
.
codec_name
=
"wm9712-codec"
,
},
},
{
{
.
name
=
"AC97"
,
.
name
=
"AC97
.1
"
,
.
stream_name
=
"AC97 IEC958"
,
.
stream_name
=
"AC97 IEC958"
,
.
codec_dai_name
=
"wm9712-aux"
,
.
codec_dai_name
=
"wm9712-aux"
,
.
cpu_dai_name
=
"mpc5200-psc-ac97.1"
,
.
cpu_dai_name
=
"mpc5200-psc-ac97.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