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
nexedi
linux
Commits
9e8c32ca
Commit
9e8c32ca
authored
Nov 23, 2010
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/asoc' into for-linus
parents
48c88e82
bf86f07e
Changes
32
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
276 additions
and
210 deletions
+276
-210
arch/arm/mach-davinci/dm355.c
arch/arm/mach-davinci/dm355.c
+3
-3
arch/arm/mach-davinci/dm365.c
arch/arm/mach-davinci/dm365.c
+3
-3
arch/arm/mach-davinci/dm644x.c
arch/arm/mach-davinci/dm644x.c
+2
-2
include/linux/mfd/wm8350/audio.h
include/linux/mfd/wm8350/audio.h
+0
-3
sound/soc/atmel/Kconfig
sound/soc/atmel/Kconfig
+3
-2
sound/soc/codecs/max98088.c
sound/soc/codecs/max98088.c
+10
-1
sound/soc/codecs/uda134x.c
sound/soc/codecs/uda134x.c
+1
-0
sound/soc/codecs/wm8350.c
sound/soc/codecs/wm8350.c
+8
-1
sound/soc/codecs/wm8776.c
sound/soc/codecs/wm8776.c
+0
-1
sound/soc/codecs/wm8962.c
sound/soc/codecs/wm8962.c
+4
-1
sound/soc/codecs/wm8994.c
sound/soc/codecs/wm8994.c
+2
-0
sound/soc/davinci/davinci-evm.c
sound/soc/davinci/davinci-evm.c
+29
-11
sound/soc/davinci/davinci-i2s.c
sound/soc/davinci/davinci-i2s.c
+11
-4
sound/soc/davinci/davinci-mcasp.c
sound/soc/davinci/davinci-mcasp.c
+10
-3
sound/soc/davinci/davinci-sffsdr.c
sound/soc/davinci/davinci-sffsdr.c
+1
-1
sound/soc/davinci/davinci-vcif.c
sound/soc/davinci/davinci-vcif.c
+10
-3
sound/soc/fsl/mpc5200_psc_i2s.c
sound/soc/fsl/mpc5200_psc_i2s.c
+1
-1
sound/soc/imx/eukrea-tlv320.c
sound/soc/imx/eukrea-tlv320.c
+4
-4
sound/soc/imx/imx-pcm-dma-mx2.c
sound/soc/imx/imx-pcm-dma-mx2.c
+98
-123
sound/soc/imx/imx-ssi.c
sound/soc/imx/imx-ssi.c
+29
-15
sound/soc/imx/imx-ssi.h
sound/soc/imx/imx-ssi.h
+4
-0
sound/soc/imx/phycore-ac97.c
sound/soc/imx/phycore-ac97.c
+1
-4
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-mcbsp.c
+8
-0
sound/soc/pxa/corgi.c
sound/soc/pxa/corgi.c
+5
-0
sound/soc/pxa/magician.c
sound/soc/pxa/magician.c
+4
-0
sound/soc/pxa/poodle.c
sound/soc/pxa/poodle.c
+5
-0
sound/soc/pxa/spitz.c
sound/soc/pxa/spitz.c
+5
-0
sound/soc/pxa/tosa.c
sound/soc/pxa/tosa.c
+5
-0
sound/soc/s3c24xx/Kconfig
sound/soc/s3c24xx/Kconfig
+1
-0
sound/soc/s3c24xx/rx1950_uda1380.c
sound/soc/s3c24xx/rx1950_uda1380.c
+3
-17
sound/soc/soc-core.c
sound/soc/soc-core.c
+4
-5
sound/soc/soc-dapm.c
sound/soc/soc-dapm.c
+2
-2
No files found.
arch/arm/mach-davinci/dm355.c
View file @
9e8c32ca
...
@@ -359,8 +359,8 @@ static struct clk_lookup dm355_clks[] = {
...
@@ -359,8 +359,8 @@ static struct clk_lookup dm355_clks[] = {
CLK
(
NULL
,
"uart1"
,
&
uart1_clk
),
CLK
(
NULL
,
"uart1"
,
&
uart1_clk
),
CLK
(
NULL
,
"uart2"
,
&
uart2_clk
),
CLK
(
NULL
,
"uart2"
,
&
uart2_clk
),
CLK
(
"i2c_davinci.1"
,
NULL
,
&
i2c_clk
),
CLK
(
"i2c_davinci.1"
,
NULL
,
&
i2c_clk
),
CLK
(
"davinci-
a
sp.0"
,
NULL
,
&
asp0_clk
),
CLK
(
"davinci-
mcb
sp.0"
,
NULL
,
&
asp0_clk
),
CLK
(
"davinci-
a
sp.1"
,
NULL
,
&
asp1_clk
),
CLK
(
"davinci-
mcb
sp.1"
,
NULL
,
&
asp1_clk
),
CLK
(
"davinci_mmc.0"
,
NULL
,
&
mmcsd0_clk
),
CLK
(
"davinci_mmc.0"
,
NULL
,
&
mmcsd0_clk
),
CLK
(
"davinci_mmc.1"
,
NULL
,
&
mmcsd1_clk
),
CLK
(
"davinci_mmc.1"
,
NULL
,
&
mmcsd1_clk
),
CLK
(
"spi_davinci.0"
,
NULL
,
&
spi0_clk
),
CLK
(
"spi_davinci.0"
,
NULL
,
&
spi0_clk
),
...
@@ -664,7 +664,7 @@ static struct resource dm355_asp1_resources[] = {
...
@@ -664,7 +664,7 @@ static struct resource dm355_asp1_resources[] = {
};
};
static
struct
platform_device
dm355_asp1_device
=
{
static
struct
platform_device
dm355_asp1_device
=
{
.
name
=
"davinci-
a
sp"
,
.
name
=
"davinci-
mcb
sp"
,
.
id
=
1
,
.
id
=
1
,
.
num_resources
=
ARRAY_SIZE
(
dm355_asp1_resources
),
.
num_resources
=
ARRAY_SIZE
(
dm355_asp1_resources
),
.
resource
=
dm355_asp1_resources
,
.
resource
=
dm355_asp1_resources
,
...
...
arch/arm/mach-davinci/dm365.c
View file @
9e8c32ca
...
@@ -459,7 +459,7 @@ static struct clk_lookup dm365_clks[] = {
...
@@ -459,7 +459,7 @@ static struct clk_lookup dm365_clks[] = {
CLK
(
NULL
,
"usb"
,
&
usb_clk
),
CLK
(
NULL
,
"usb"
,
&
usb_clk
),
CLK
(
"davinci_emac.1"
,
NULL
,
&
emac_clk
),
CLK
(
"davinci_emac.1"
,
NULL
,
&
emac_clk
),
CLK
(
"davinci_voicecodec"
,
NULL
,
&
voicecodec_clk
),
CLK
(
"davinci_voicecodec"
,
NULL
,
&
voicecodec_clk
),
CLK
(
"davinci-
asp.0
"
,
NULL
,
&
asp0_clk
),
CLK
(
"davinci-
mcbsp
"
,
NULL
,
&
asp0_clk
),
CLK
(
NULL
,
"rto"
,
&
rto_clk
),
CLK
(
NULL
,
"rto"
,
&
rto_clk
),
CLK
(
NULL
,
"mjcp"
,
&
mjcp_clk
),
CLK
(
NULL
,
"mjcp"
,
&
mjcp_clk
),
CLK
(
NULL
,
NULL
,
NULL
),
CLK
(
NULL
,
NULL
,
NULL
),
...
@@ -922,8 +922,8 @@ static struct resource dm365_asp_resources[] = {
...
@@ -922,8 +922,8 @@ static struct resource dm365_asp_resources[] = {
};
};
static
struct
platform_device
dm365_asp_device
=
{
static
struct
platform_device
dm365_asp_device
=
{
.
name
=
"davinci-
a
sp"
,
.
name
=
"davinci-
mcb
sp"
,
.
id
=
0
,
.
id
=
-
1
,
.
num_resources
=
ARRAY_SIZE
(
dm365_asp_resources
),
.
num_resources
=
ARRAY_SIZE
(
dm365_asp_resources
),
.
resource
=
dm365_asp_resources
,
.
resource
=
dm365_asp_resources
,
};
};
...
...
arch/arm/mach-davinci/dm644x.c
View file @
9e8c32ca
...
@@ -302,7 +302,7 @@ static struct clk_lookup dm644x_clks[] = {
...
@@ -302,7 +302,7 @@ static struct clk_lookup dm644x_clks[] = {
CLK
(
"davinci_emac.1"
,
NULL
,
&
emac_clk
),
CLK
(
"davinci_emac.1"
,
NULL
,
&
emac_clk
),
CLK
(
"i2c_davinci.1"
,
NULL
,
&
i2c_clk
),
CLK
(
"i2c_davinci.1"
,
NULL
,
&
i2c_clk
),
CLK
(
"palm_bk3710"
,
NULL
,
&
ide_clk
),
CLK
(
"palm_bk3710"
,
NULL
,
&
ide_clk
),
CLK
(
"davinci-
a
sp"
,
NULL
,
&
asp_clk
),
CLK
(
"davinci-
mcb
sp"
,
NULL
,
&
asp_clk
),
CLK
(
"davinci_mmc.0"
,
NULL
,
&
mmcsd_clk
),
CLK
(
"davinci_mmc.0"
,
NULL
,
&
mmcsd_clk
),
CLK
(
NULL
,
"spi"
,
&
spi_clk
),
CLK
(
NULL
,
"spi"
,
&
spi_clk
),
CLK
(
NULL
,
"gpio"
,
&
gpio_clk
),
CLK
(
NULL
,
"gpio"
,
&
gpio_clk
),
...
@@ -580,7 +580,7 @@ static struct resource dm644x_asp_resources[] = {
...
@@ -580,7 +580,7 @@ static struct resource dm644x_asp_resources[] = {
};
};
static
struct
platform_device
dm644x_asp_device
=
{
static
struct
platform_device
dm644x_asp_device
=
{
.
name
=
"davinci-
a
sp"
,
.
name
=
"davinci-
mcb
sp"
,
.
id
=
-
1
,
.
id
=
-
1
,
.
num_resources
=
ARRAY_SIZE
(
dm644x_asp_resources
),
.
num_resources
=
ARRAY_SIZE
(
dm644x_asp_resources
),
.
resource
=
dm644x_asp_resources
,
.
resource
=
dm644x_asp_resources
,
...
...
include/linux/mfd/wm8350/audio.h
View file @
9e8c32ca
...
@@ -522,9 +522,6 @@
...
@@ -522,9 +522,6 @@
#define WM8350_MCLK_SEL_PLL_32K 3
#define WM8350_MCLK_SEL_PLL_32K 3
#define WM8350_MCLK_SEL_MCLK 5
#define WM8350_MCLK_SEL_MCLK 5
#define WM8350_MCLK_DIR_OUT 0
#define WM8350_MCLK_DIR_IN 1
/* clock divider id's */
/* clock divider id's */
#define WM8350_ADC_CLKDIV 0
#define WM8350_ADC_CLKDIV 0
#define WM8350_DAC_CLKDIV 1
#define WM8350_DAC_CLKDIV 1
...
...
sound/soc/atmel/Kconfig
View file @
9e8c32ca
...
@@ -16,7 +16,8 @@ config SND_ATMEL_SOC_SSC
...
@@ -16,7 +16,8 @@ config SND_ATMEL_SOC_SSC
config SND_AT91_SOC_SAM9G20_WM8731
config SND_AT91_SOC_SAM9G20_WM8731
tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"
tristate "SoC Audio support for WM8731-based At91sam9g20 evaluation board"
depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC
depends on ATMEL_SSC && ARCH_AT91SAM9G20 && SND_ATMEL_SOC && \
AT91_PROGRAMMABLE_CLOCKS
select SND_ATMEL_SOC_SSC
select SND_ATMEL_SOC_SSC
select SND_SOC_WM8731
select SND_SOC_WM8731
help
help
...
@@ -25,7 +26,7 @@ config SND_AT91_SOC_SAM9G20_WM8731
...
@@ -25,7 +26,7 @@ config SND_AT91_SOC_SAM9G20_WM8731
config SND_AT32_SOC_PLAYPAQ
config SND_AT32_SOC_PLAYPAQ
tristate "SoC Audio support for PlayPaq with WM8510"
tristate "SoC Audio support for PlayPaq with WM8510"
depends on SND_ATMEL_SOC && BOARD_PLAYPAQ
depends on SND_ATMEL_SOC && BOARD_PLAYPAQ
&& AT91_PROGRAMMABLE_CLOCKS
select SND_ATMEL_SOC_SSC
select SND_ATMEL_SOC_SSC
select SND_SOC_WM8510
select SND_SOC_WM8510
help
help
...
...
sound/soc/codecs/max98088.c
View file @
9e8c32ca
...
@@ -28,6 +28,11 @@
...
@@ -28,6 +28,11 @@
#include <sound/max98088.h>
#include <sound/max98088.h>
#include "max98088.h"
#include "max98088.h"
enum
max98088_type
{
MAX98088
,
MAX98089
,
};
struct
max98088_cdata
{
struct
max98088_cdata
{
unsigned
int
rate
;
unsigned
int
rate
;
unsigned
int
fmt
;
unsigned
int
fmt
;
...
@@ -36,6 +41,7 @@ struct max98088_cdata {
...
@@ -36,6 +41,7 @@ struct max98088_cdata {
struct
max98088_priv
{
struct
max98088_priv
{
u8
reg_cache
[
M98088_REG_CNT
];
u8
reg_cache
[
M98088_REG_CNT
];
enum
max98088_type
devtype
;
void
*
control_data
;
void
*
control_data
;
struct
max98088_pdata
*
pdata
;
struct
max98088_pdata
*
pdata
;
unsigned
int
sysclk
;
unsigned
int
sysclk
;
...
@@ -2040,6 +2046,8 @@ static int max98088_i2c_probe(struct i2c_client *i2c,
...
@@ -2040,6 +2046,8 @@ static int max98088_i2c_probe(struct i2c_client *i2c,
if
(
max98088
==
NULL
)
if
(
max98088
==
NULL
)
return
-
ENOMEM
;
return
-
ENOMEM
;
max98088
->
devtype
=
id
->
driver_data
;
i2c_set_clientdata
(
i2c
,
max98088
);
i2c_set_clientdata
(
i2c
,
max98088
);
max98088
->
control_data
=
i2c
;
max98088
->
control_data
=
i2c
;
max98088
->
pdata
=
i2c
->
dev
.
platform_data
;
max98088
->
pdata
=
i2c
->
dev
.
platform_data
;
...
@@ -2059,7 +2067,8 @@ static int __devexit max98088_i2c_remove(struct i2c_client *client)
...
@@ -2059,7 +2067,8 @@ static int __devexit max98088_i2c_remove(struct i2c_client *client)
}
}
static
const
struct
i2c_device_id
max98088_i2c_id
[]
=
{
static
const
struct
i2c_device_id
max98088_i2c_id
[]
=
{
{
"max98088"
,
0
},
{
"max98088"
,
MAX98088
},
{
"max98089"
,
MAX98089
},
{
}
{
}
};
};
MODULE_DEVICE_TABLE
(
i2c
,
max98088_i2c_id
);
MODULE_DEVICE_TABLE
(
i2c
,
max98088_i2c_id
);
...
...
sound/soc/codecs/uda134x.c
View file @
9e8c32ca
...
@@ -597,6 +597,7 @@ static struct snd_soc_codec_driver soc_codec_dev_uda134x = {
...
@@ -597,6 +597,7 @@ static struct snd_soc_codec_driver soc_codec_dev_uda134x = {
.
resume
=
uda134x_soc_resume
,
.
resume
=
uda134x_soc_resume
,
.
reg_cache_size
=
sizeof
(
uda134x_reg
),
.
reg_cache_size
=
sizeof
(
uda134x_reg
),
.
reg_word_size
=
sizeof
(
u8
),
.
reg_word_size
=
sizeof
(
u8
),
.
reg_cache_default
=
uda134x_reg
,
.
reg_cache_step
=
1
,
.
reg_cache_step
=
1
,
.
read
=
uda134x_read_reg_cache
,
.
read
=
uda134x_read_reg_cache
,
.
write
=
uda134x_write
,
.
write
=
uda134x_write
,
...
...
sound/soc/codecs/wm8350.c
View file @
9e8c32ca
...
@@ -831,7 +831,7 @@ static int wm8350_set_dai_sysclk(struct snd_soc_dai *codec_dai,
...
@@ -831,7 +831,7 @@ static int wm8350_set_dai_sysclk(struct snd_soc_dai *codec_dai,
}
}
/* MCLK direction */
/* MCLK direction */
if
(
dir
==
WM8350_MCLK_DIR
_OUT
)
if
(
dir
==
SND_SOC_CLOCK
_OUT
)
wm8350_set_bits
(
wm8350
,
WM8350_CLOCK_CONTROL_2
,
wm8350_set_bits
(
wm8350
,
WM8350_CLOCK_CONTROL_2
,
WM8350_MCLK_DIR
);
WM8350_MCLK_DIR
);
else
else
...
@@ -1586,6 +1586,13 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec)
...
@@ -1586,6 +1586,13 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec)
wm8350_set_bits
(
wm8350
,
WM8350_ROUT2_VOLUME
,
wm8350_set_bits
(
wm8350
,
WM8350_ROUT2_VOLUME
,
WM8350_OUT2_VU
|
WM8350_OUT2R_MUTE
);
WM8350_OUT2_VU
|
WM8350_OUT2R_MUTE
);
/* Make sure AIF tristating is disabled by default */
wm8350_clear_bits
(
wm8350
,
WM8350_AI_FORMATING
,
WM8350_AIF_TRI
);
/* Make sure we've got a sane companding setup too */
wm8350_clear_bits
(
wm8350
,
WM8350_ADC_DAC_COMP
,
WM8350_DAC_COMP
|
WM8350_LOOPBACK
);
/* Make sure jack detect is disabled to start off with */
/* Make sure jack detect is disabled to start off with */
wm8350_clear_bits
(
wm8350
,
WM8350_JACK_DETECT
,
wm8350_clear_bits
(
wm8350
,
WM8350_JACK_DETECT
,
WM8350_JDL_ENA
|
WM8350_JDR_ENA
);
WM8350_JDL_ENA
|
WM8350_JDR_ENA
);
...
...
sound/soc/codecs/wm8776.c
View file @
9e8c32ca
...
@@ -34,7 +34,6 @@
...
@@ -34,7 +34,6 @@
/* codec private data */
/* codec private data */
struct
wm8776_priv
{
struct
wm8776_priv
{
enum
snd_soc_control_type
control_type
;
enum
snd_soc_control_type
control_type
;
u16
reg_cache
[
WM8776_CACHEREGNUM
];
int
sysclk
[
2
];
int
sysclk
[
2
];
};
};
...
...
sound/soc/codecs/wm8962.c
View file @
9e8c32ca
...
@@ -3500,8 +3500,11 @@ static ssize_t wm8962_beep_set(struct device *dev,
...
@@ -3500,8 +3500,11 @@ static ssize_t wm8962_beep_set(struct device *dev,
{
{
struct
wm8962_priv
*
wm8962
=
dev_get_drvdata
(
dev
);
struct
wm8962_priv
*
wm8962
=
dev_get_drvdata
(
dev
);
long
int
time
;
long
int
time
;
int
ret
;
strict_strtol
(
buf
,
10
,
&
time
);
ret
=
strict_strtol
(
buf
,
10
,
&
time
);
if
(
ret
!=
0
)
return
ret
;
input_event
(
wm8962
->
beep
,
EV_SND
,
SND_TONE
,
time
);
input_event
(
wm8962
->
beep
,
EV_SND
,
SND_TONE
,
time
);
...
...
sound/soc/codecs/wm8994.c
View file @
9e8c32ca
...
@@ -3903,6 +3903,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
...
@@ -3903,6 +3903,8 @@ static int wm8994_codec_probe(struct snd_soc_codec *codec)
return
-
ENOMEM
;
return
-
ENOMEM
;
snd_soc_codec_set_drvdata
(
codec
,
wm8994
);
snd_soc_codec_set_drvdata
(
codec
,
wm8994
);
codec
->
reg_cache
=
&
wm8994
->
reg_cache
;
wm8994
->
pdata
=
dev_get_platdata
(
codec
->
dev
->
parent
);
wm8994
->
pdata
=
dev_get_platdata
(
codec
->
dev
->
parent
);
wm8994
->
codec
=
codec
;
wm8994
->
codec
=
codec
;
...
...
sound/soc/davinci/davinci-evm.c
View file @
9e8c32ca
...
@@ -157,12 +157,23 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
...
@@ -157,12 +157,23 @@ static int evm_aic3x_init(struct snd_soc_pcm_runtime *rtd)
}
}
/* davinci-evm digital audio interface glue - connects codec <--> CPU */
/* davinci-evm digital audio interface glue - connects codec <--> CPU */
static
struct
snd_soc_dai_link
evm_dai
=
{
static
struct
snd_soc_dai_link
dm6446_
evm_dai
=
{
.
name
=
"TLV320AIC3X"
,
.
name
=
"TLV320AIC3X"
,
.
stream_name
=
"AIC3X"
,
.
stream_name
=
"AIC3X"
,
.
cpu_dai_name
=
"davinci-mc
asp.0
"
,
.
cpu_dai_name
=
"davinci-mc
bsp
"
,
.
codec_dai_name
=
"tlv320aic3x-hifi"
,
.
codec_dai_name
=
"tlv320aic3x-hifi"
,
.
codec_name
=
"tlv320aic3x-codec.0-001a"
,
.
codec_name
=
"tlv320aic3x-codec.1-001b"
,
.
platform_name
=
"davinci-pcm-audio"
,
.
init
=
evm_aic3x_init
,
.
ops
=
&
evm_ops
,
};
static
struct
snd_soc_dai_link
dm355_evm_dai
=
{
.
name
=
"TLV320AIC3X"
,
.
stream_name
=
"AIC3X"
,
.
cpu_dai_name
=
"davinci-mcbsp.1"
,
.
codec_dai_name
=
"tlv320aic3x-hifi"
,
.
codec_name
=
"tlv320aic3x-codec.1-001b"
,
.
platform_name
=
"davinci-pcm-audio"
,
.
platform_name
=
"davinci-pcm-audio"
,
.
init
=
evm_aic3x_init
,
.
init
=
evm_aic3x_init
,
.
ops
=
&
evm_ops
,
.
ops
=
&
evm_ops
,
...
@@ -172,10 +183,10 @@ static struct snd_soc_dai_link dm365_evm_dai = {
...
@@ -172,10 +183,10 @@ static struct snd_soc_dai_link dm365_evm_dai = {
#ifdef CONFIG_SND_DM365_AIC3X_CODEC
#ifdef CONFIG_SND_DM365_AIC3X_CODEC
.
name
=
"TLV320AIC3X"
,
.
name
=
"TLV320AIC3X"
,
.
stream_name
=
"AIC3X"
,
.
stream_name
=
"AIC3X"
,
.
cpu_dai_name
=
"davinci-
i2s
"
,
.
cpu_dai_name
=
"davinci-
mcbsp
"
,
.
codec_dai_name
=
"tlv320aic3x-hifi"
,
.
codec_dai_name
=
"tlv320aic3x-hifi"
,
.
init
=
evm_aic3x_init
,
.
init
=
evm_aic3x_init
,
.
codec_name
=
"tlv320aic3x-codec.
0-001a
"
,
.
codec_name
=
"tlv320aic3x-codec.
1-0018
"
,
.
ops
=
&
evm_ops
,
.
ops
=
&
evm_ops
,
#elif defined(CONFIG_SND_DM365_VOICE_CODEC)
#elif defined(CONFIG_SND_DM365_VOICE_CODEC)
.
name
=
"Voice Codec - CQ93VC"
,
.
name
=
"Voice Codec - CQ93VC"
,
...
@@ -219,10 +230,17 @@ static struct snd_soc_dai_link da8xx_evm_dai = {
...
@@ -219,10 +230,17 @@ static struct snd_soc_dai_link da8xx_evm_dai = {
.
ops
=
&
evm_ops
,
.
ops
=
&
evm_ops
,
};
};
/* davinci dm6446, dm355 evm audio machine driver */
/* davinci dm6446 evm audio machine driver */
static
struct
snd_soc_card
snd_soc_card_evm
=
{
static
struct
snd_soc_card
dm6446_snd_soc_card_evm
=
{
.
name
=
"DaVinci EVM"
,
.
name
=
"DaVinci DM6446 EVM"
,
.
dai_link
=
&
evm_dai
,
.
dai_link
=
&
dm6446_evm_dai
,
.
num_links
=
1
,
};
/* davinci dm355 evm audio machine driver */
static
struct
snd_soc_card
dm355_snd_soc_card_evm
=
{
.
name
=
"DaVinci DM355 EVM"
,
.
dai_link
=
&
dm355_evm_dai
,
.
num_links
=
1
,
.
num_links
=
1
,
};
};
...
@@ -261,10 +279,10 @@ static int __init evm_init(void)
...
@@ -261,10 +279,10 @@ static int __init evm_init(void)
int
ret
;
int
ret
;
if
(
machine_is_davinci_evm
())
{
if
(
machine_is_davinci_evm
())
{
evm_snd_dev_data
=
&
snd_soc_card_evm
;
evm_snd_dev_data
=
&
dm6446_
snd_soc_card_evm
;
index
=
0
;
index
=
0
;
}
else
if
(
machine_is_davinci_dm355_evm
())
{
}
else
if
(
machine_is_davinci_dm355_evm
())
{
evm_snd_dev_data
=
&
snd_soc_card_evm
;
evm_snd_dev_data
=
&
dm355_
snd_soc_card_evm
;
index
=
1
;
index
=
1
;
}
else
if
(
machine_is_davinci_dm365_evm
())
{
}
else
if
(
machine_is_davinci_dm365_evm
())
{
evm_snd_dev_data
=
&
dm365_snd_soc_card_evm
;
evm_snd_dev_data
=
&
dm365_snd_soc_card_evm
;
...
...
sound/soc/davinci/davinci-i2s.c
View file @
9e8c32ca
...
@@ -426,9 +426,6 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream,
...
@@ -426,9 +426,6 @@ static int davinci_i2s_hw_params(struct snd_pcm_substream *substream,
snd_pcm_format_t
fmt
;
snd_pcm_format_t
fmt
;
unsigned
element_cnt
=
1
;
unsigned
element_cnt
=
1
;
dai
->
capture_dma_data
=
dev
->
dma_params
;
dai
->
playback_dma_data
=
dev
->
dma_params
;
/* general line settings */
/* general line settings */
spcr
=
davinci_mcbsp_read_reg
(
dev
,
DAVINCI_MCBSP_SPCR_REG
);
spcr
=
davinci_mcbsp_read_reg
(
dev
,
DAVINCI_MCBSP_SPCR_REG
);
if
(
substream
->
stream
==
SNDRV_PCM_STREAM_CAPTURE
)
{
if
(
substream
->
stream
==
SNDRV_PCM_STREAM_CAPTURE
)
{
...
@@ -601,6 +598,15 @@ static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
...
@@ -601,6 +598,15 @@ static int davinci_i2s_trigger(struct snd_pcm_substream *substream, int cmd,
return
ret
;
return
ret
;
}
}
static
int
davinci_i2s_startup
(
struct
snd_pcm_substream
*
substream
,
struct
snd_soc_dai
*
dai
)
{
struct
davinci_mcbsp_dev
*
dev
=
snd_soc_dai_get_drvdata
(
dai
);
snd_soc_dai_set_dma_data
(
dai
,
substream
,
dev
->
dma_params
);
return
0
;
}
static
void
davinci_i2s_shutdown
(
struct
snd_pcm_substream
*
substream
,
static
void
davinci_i2s_shutdown
(
struct
snd_pcm_substream
*
substream
,
struct
snd_soc_dai
*
dai
)
struct
snd_soc_dai
*
dai
)
{
{
...
@@ -612,6 +618,7 @@ static void davinci_i2s_shutdown(struct snd_pcm_substream *substream,
...
@@ -612,6 +618,7 @@ static void davinci_i2s_shutdown(struct snd_pcm_substream *substream,
#define DAVINCI_I2S_RATES SNDRV_PCM_RATE_8000_96000
#define DAVINCI_I2S_RATES SNDRV_PCM_RATE_8000_96000
static
struct
snd_soc_dai_ops
davinci_i2s_dai_ops
=
{
static
struct
snd_soc_dai_ops
davinci_i2s_dai_ops
=
{
.
startup
=
davinci_i2s_startup
,
.
shutdown
=
davinci_i2s_shutdown
,
.
shutdown
=
davinci_i2s_shutdown
,
.
prepare
=
davinci_i2s_prepare
,
.
prepare
=
davinci_i2s_prepare
,
.
trigger
=
davinci_i2s_trigger
,
.
trigger
=
davinci_i2s_trigger
,
...
@@ -749,7 +756,7 @@ static struct platform_driver davinci_mcbsp_driver = {
...
@@ -749,7 +756,7 @@ static struct platform_driver davinci_mcbsp_driver = {
.
probe
=
davinci_i2s_probe
,
.
probe
=
davinci_i2s_probe
,
.
remove
=
davinci_i2s_remove
,
.
remove
=
davinci_i2s_remove
,
.
driver
=
{
.
driver
=
{
.
name
=
"davinci-
i2s
"
,
.
name
=
"davinci-
mcbsp
"
,
.
owner
=
THIS_MODULE
,
.
owner
=
THIS_MODULE
,
},
},
};
};
...
...
sound/soc/davinci/davinci-mcasp.c
View file @
9e8c32ca
...
@@ -715,9 +715,6 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
...
@@ -715,9 +715,6 @@ static int davinci_mcasp_hw_params(struct snd_pcm_substream *substream,
int
word_length
;
int
word_length
;
u8
fifo_level
;
u8
fifo_level
;
cpu_dai
->
capture_dma_data
=
dev
->
dma_params
;
cpu_dai
->
playback_dma_data
=
dev
->
dma_params
;
davinci_hw_common_param
(
dev
,
substream
->
stream
);
davinci_hw_common_param
(
dev
,
substream
->
stream
);
if
(
substream
->
stream
==
SNDRV_PCM_STREAM_PLAYBACK
)
if
(
substream
->
stream
==
SNDRV_PCM_STREAM_PLAYBACK
)
fifo_level
=
dev
->
txnumevt
;
fifo_level
=
dev
->
txnumevt
;
...
@@ -799,7 +796,17 @@ static int davinci_mcasp_trigger(struct snd_pcm_substream *substream,
...
@@ -799,7 +796,17 @@ static int davinci_mcasp_trigger(struct snd_pcm_substream *substream,
return
ret
;
return
ret
;
}
}
static
int
davinci_mcasp_startup
(
struct
snd_pcm_substream
*
substream
,
struct
snd_soc_dai
*
dai
)
{
struct
davinci_audio_dev
*
dev
=
snd_soc_dai_get_drvdata
(
dai
);
snd_soc_dai_set_dma_data
(
dai
,
substream
,
dev
->
dma_params
);
return
0
;
}
static
struct
snd_soc_dai_ops
davinci_mcasp_dai_ops
=
{
static
struct
snd_soc_dai_ops
davinci_mcasp_dai_ops
=
{
.
startup
=
davinci_mcasp_startup
,
.
trigger
=
davinci_mcasp_trigger
,
.
trigger
=
davinci_mcasp_trigger
,
.
hw_params
=
davinci_mcasp_hw_params
,
.
hw_params
=
davinci_mcasp_hw_params
,
.
set_fmt
=
davinci_mcasp_set_dai_fmt
,
.
set_fmt
=
davinci_mcasp_set_dai_fmt
,
...
...
sound/soc/davinci/davinci-sffsdr.c
View file @
9e8c32ca
...
@@ -84,7 +84,7 @@ static struct snd_soc_ops sffsdr_ops = {
...
@@ -84,7 +84,7 @@ static struct snd_soc_ops sffsdr_ops = {
static
struct
snd_soc_dai_link
sffsdr_dai
=
{
static
struct
snd_soc_dai_link
sffsdr_dai
=
{
.
name
=
"PCM3008"
,
/* Codec name */
.
name
=
"PCM3008"
,
/* Codec name */
.
stream_name
=
"PCM3008 HiFi"
,
.
stream_name
=
"PCM3008 HiFi"
,
.
cpu_dai_name
=
"davinci-
asp.0
"
,
.
cpu_dai_name
=
"davinci-
mcbsp
"
,
.
codec_dai_name
=
"pcm3008-hifi"
,
.
codec_dai_name
=
"pcm3008-hifi"
,
.
codec_name
=
"pcm3008-codec"
,
.
codec_name
=
"pcm3008-codec"
,
.
platform_name
=
"davinci-pcm-audio"
,
.
platform_name
=
"davinci-pcm-audio"
,
...
...
sound/soc/davinci/davinci-vcif.c
View file @
9e8c32ca
...
@@ -97,9 +97,6 @@ static int davinci_vcif_hw_params(struct snd_pcm_substream *substream,
...
@@ -97,9 +97,6 @@ static int davinci_vcif_hw_params(struct snd_pcm_substream *substream,
&
davinci_vcif_dev
->
dma_params
[
substream
->
stream
];
&
davinci_vcif_dev
->
dma_params
[
substream
->
stream
];
u32
w
;
u32
w
;
dai
->
capture_dma_data
=
davinci_vcif_dev
->
dma_params
;
dai
->
playback_dma_data
=
davinci_vcif_dev
->
dma_params
;
/* Restart the codec before setup */
/* Restart the codec before setup */
davinci_vcif_stop
(
substream
);
davinci_vcif_stop
(
substream
);
davinci_vcif_start
(
substream
);
davinci_vcif_start
(
substream
);
...
@@ -174,9 +171,19 @@ static int davinci_vcif_trigger(struct snd_pcm_substream *substream, int cmd,
...
@@ -174,9 +171,19 @@ static int davinci_vcif_trigger(struct snd_pcm_substream *substream, int cmd,
return
ret
;
return
ret
;
}
}
static
int
davinci_vcif_startup
(
struct
snd_pcm_substream
*
substream
,
struct
snd_soc_dai
*
dai
)
{
struct
davinci_vcif_dev
*
dev
=
snd_soc_dai_get_drvdata
(
dai
);
snd_soc_dai_set_dma_data
(
dai
,
substream
,
dev
->
dma_params
);
return
0
;
}
#define DAVINCI_VCIF_RATES SNDRV_PCM_RATE_8000_48000
#define DAVINCI_VCIF_RATES SNDRV_PCM_RATE_8000_48000
static
struct
snd_soc_dai_ops
davinci_vcif_dai_ops
=
{
static
struct
snd_soc_dai_ops
davinci_vcif_dai_ops
=
{
.
startup
=
davinci_vcif_startup
,
.
trigger
=
davinci_vcif_trigger
,
.
trigger
=
davinci_vcif_trigger
,
.
hw_params
=
davinci_vcif_hw_params
,
.
hw_params
=
davinci_vcif_hw_params
,
};
};
...
...
sound/soc/fsl/mpc5200_psc_i2s.c
View file @
9e8c32ca
...
@@ -160,7 +160,7 @@ static int __devinit psc_i2s_of_probe(struct platform_device *op,
...
@@ -160,7 +160,7 @@ static int __devinit psc_i2s_of_probe(struct platform_device *op,
rc
=
snd_soc_register_dais
(
&
op
->
dev
,
psc_i2s_dai
,
ARRAY_SIZE
(
psc_i2s_dai
));
rc
=
snd_soc_register_dais
(
&
op
->
dev
,
psc_i2s_dai
,
ARRAY_SIZE
(
psc_i2s_dai
));
if
(
rc
!=
0
)
{
if
(
rc
!=
0
)
{
pr_err
(
"Failed to register DAI
\n
"
);
pr_err
(
"Failed to register DAI
\n
"
);
return
0
;
return
rc
;
}
}
psc_dma
=
dev_get_drvdata
(
&
op
->
dev
);
psc_dma
=
dev_get_drvdata
(
&
op
->
dev
);
...
...
sound/soc/imx/eukrea-tlv320.c
View file @
9e8c32ca
...
@@ -34,8 +34,8 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream,
...
@@ -34,8 +34,8 @@ static int eukrea_tlv320_hw_params(struct snd_pcm_substream *substream,
struct
snd_pcm_hw_params
*
params
)
struct
snd_pcm_hw_params
*
params
)
{
{
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_dai
*
codec_dai
=
rtd
->
dai
->
codec_dai
;
struct
snd_soc_dai
*
codec_dai
=
rtd
->
codec_dai
;
struct
snd_soc_dai
*
cpu_dai
=
rtd
->
dai
->
cpu_dai
;
struct
snd_soc_dai
*
cpu_dai
=
rtd
->
cpu_dai
;
int
ret
;
int
ret
;
ret
=
snd_soc_dai_set_fmt
(
cpu_dai
,
SND_SOC_DAIFMT_I2S
|
ret
=
snd_soc_dai_set_fmt
(
cpu_dai
,
SND_SOC_DAIFMT_I2S
|
...
@@ -79,10 +79,10 @@ static struct snd_soc_ops eukrea_tlv320_snd_ops = {
...
@@ -79,10 +79,10 @@ static struct snd_soc_ops eukrea_tlv320_snd_ops = {
static
struct
snd_soc_dai_link
eukrea_tlv320_dai
=
{
static
struct
snd_soc_dai_link
eukrea_tlv320_dai
=
{
.
name
=
"tlv320aic23"
,
.
name
=
"tlv320aic23"
,
.
stream_name
=
"TLV320AIC23"
,
.
stream_name
=
"TLV320AIC23"
,
.
codec_dai
=
"tlv320aic23-hifi"
,
.
codec_dai
_name
=
"tlv320aic23-hifi"
,
.
platform_name
=
"imx-pcm-audio.0"
,
.
platform_name
=
"imx-pcm-audio.0"
,
.
codec_name
=
"tlv320aic23-codec.0-001a"
,
.
codec_name
=
"tlv320aic23-codec.0-001a"
,
.
cpu_dai
=
"imx-ssi.0"
,
.
cpu_dai
_name
=
"imx-ssi.0"
,
.
ops
=
&
eukrea_tlv320_snd_ops
,
.
ops
=
&
eukrea_tlv320_snd_ops
,
};
};
...
...
sound/soc/imx/imx-pcm-dma-mx2.c
View file @
9e8c32ca
This diff is collapsed.
Click to expand it.
sound/soc/imx/imx-ssi.c
View file @
9e8c32ca
...
@@ -439,7 +439,22 @@ void imx_pcm_free(struct snd_pcm *pcm)
...
@@ -439,7 +439,22 @@ void imx_pcm_free(struct snd_pcm *pcm)
}
}
EXPORT_SYMBOL_GPL
(
imx_pcm_free
);
EXPORT_SYMBOL_GPL
(
imx_pcm_free
);
static
int
imx_ssi_dai_probe
(
struct
snd_soc_dai
*
dai
)
{
struct
imx_ssi
*
ssi
=
dev_get_drvdata
(
dai
->
dev
);
uint32_t
val
;
snd_soc_dai_set_drvdata
(
dai
,
ssi
);
val
=
SSI_SFCSR_TFWM0
(
ssi
->
dma_params_tx
.
burstsize
)
|
SSI_SFCSR_RFWM0
(
ssi
->
dma_params_rx
.
burstsize
);
writel
(
val
,
ssi
->
base
+
SSI_SFCSR
);
return
0
;
}
static
struct
snd_soc_dai_driver
imx_ssi_dai
=
{
static
struct
snd_soc_dai_driver
imx_ssi_dai
=
{
.
probe
=
imx_ssi_dai_probe
,
.
playback
=
{
.
playback
=
{
.
channels_min
=
2
,
.
channels_min
=
2
,
.
channels_max
=
2
,
.
channels_max
=
2
,
...
@@ -455,20 +470,6 @@ static struct snd_soc_dai_driver imx_ssi_dai = {
...
@@ -455,20 +470,6 @@ static struct snd_soc_dai_driver imx_ssi_dai = {
.
ops
=
&
imx_ssi_pcm_dai_ops
,
.
ops
=
&
imx_ssi_pcm_dai_ops
,
};
};
static
int
imx_ssi_dai_probe
(
struct
snd_soc_dai
*
dai
)
{
struct
imx_ssi
*
ssi
=
dev_get_drvdata
(
dai
->
dev
);
uint32_t
val
;
snd_soc_dai_set_drvdata
(
dai
,
ssi
);
val
=
SSI_SFCSR_TFWM0
(
ssi
->
dma_params_tx
.
burstsize
)
|
SSI_SFCSR_RFWM0
(
ssi
->
dma_params_rx
.
burstsize
);
writel
(
val
,
ssi
->
base
+
SSI_SFCSR
);
return
0
;
}
static
struct
snd_soc_dai_driver
imx_ac97_dai
=
{
static
struct
snd_soc_dai_driver
imx_ac97_dai
=
{
.
probe
=
imx_ssi_dai_probe
,
.
probe
=
imx_ssi_dai_probe
,
.
ac97_control
=
1
,
.
ac97_control
=
1
,
...
@@ -677,7 +678,17 @@ static int imx_ssi_probe(struct platform_device *pdev)
...
@@ -677,7 +678,17 @@ static int imx_ssi_probe(struct platform_device *pdev)
goto
failed_register
;
goto
failed_register
;
}
}
ssi
->
soc_platform_pdev
=
platform_device_alloc
(
"imx-fiq-pcm-audio"
,
pdev
->
id
);
ssi
->
soc_platform_pdev_fiq
=
platform_device_alloc
(
"imx-fiq-pcm-audio"
,
pdev
->
id
);
if
(
!
ssi
->
soc_platform_pdev_fiq
)
goto
failed_pdev_fiq_alloc
;
platform_set_drvdata
(
ssi
->
soc_platform_pdev_fiq
,
ssi
);
ret
=
platform_device_add
(
ssi
->
soc_platform_pdev_fiq
);
if
(
ret
)
{
dev_err
(
&
pdev
->
dev
,
"failed to add platform device
\n
"
);
goto
failed_pdev_fiq_add
;
}
ssi
->
soc_platform_pdev
=
platform_device_alloc
(
"imx-pcm-audio"
,
pdev
->
id
);
if
(
!
ssi
->
soc_platform_pdev
)
if
(
!
ssi
->
soc_platform_pdev
)
goto
failed_pdev_alloc
;
goto
failed_pdev_alloc
;
platform_set_drvdata
(
ssi
->
soc_platform_pdev
,
ssi
);
platform_set_drvdata
(
ssi
->
soc_platform_pdev
,
ssi
);
...
@@ -692,6 +703,9 @@ static int imx_ssi_probe(struct platform_device *pdev)
...
@@ -692,6 +703,9 @@ static int imx_ssi_probe(struct platform_device *pdev)
failed_pdev_add:
failed_pdev_add:
platform_device_put
(
ssi
->
soc_platform_pdev
);
platform_device_put
(
ssi
->
soc_platform_pdev
);
failed_pdev_alloc:
failed_pdev_alloc:
failed_pdev_fiq_add:
platform_device_put
(
ssi
->
soc_platform_pdev_fiq
);
failed_pdev_fiq_alloc:
snd_soc_unregister_dai
(
&
pdev
->
dev
);
snd_soc_unregister_dai
(
&
pdev
->
dev
);
failed_register:
failed_register:
failed_ac97:
failed_ac97:
...
...
sound/soc/imx/imx-ssi.h
View file @
9e8c32ca
...
@@ -185,6 +185,9 @@
...
@@ -185,6 +185,9 @@
#define DRV_NAME "imx-ssi"
#define DRV_NAME "imx-ssi"
#include <linux/dmaengine.h>
#include <mach/dma.h>
struct
imx_pcm_dma_params
{
struct
imx_pcm_dma_params
{
int
dma
;
int
dma
;
unsigned
long
dma_addr
;
unsigned
long
dma_addr
;
...
@@ -212,6 +215,7 @@ struct imx_ssi {
...
@@ -212,6 +215,7 @@ struct imx_ssi {
int
enabled
;
int
enabled
;
struct
platform_device
*
soc_platform_pdev
;
struct
platform_device
*
soc_platform_pdev
;
struct
platform_device
*
soc_platform_pdev_fiq
;
};
};
struct
snd_soc_platform
*
imx_ssi_fiq_init
(
struct
platform_device
*
pdev
,
struct
snd_soc_platform
*
imx_ssi_fiq_init
(
struct
platform_device
*
pdev
,
...
...
sound/soc/imx/phycore-ac97.c
View file @
9e8c32ca
...
@@ -20,9 +20,6 @@
...
@@ -20,9 +20,6 @@
#include <sound/soc-dapm.h>
#include <sound/soc-dapm.h>
#include <asm/mach-types.h>
#include <asm/mach-types.h>
#include "../codecs/wm9712.h"
#include "imx-ssi.h"
static
struct
snd_soc_card
imx_phycore
;
static
struct
snd_soc_card
imx_phycore
;
static
struct
snd_soc_ops
imx_phycore_hifi_ops
=
{
static
struct
snd_soc_ops
imx_phycore_hifi_ops
=
{
...
@@ -41,7 +38,7 @@ static struct snd_soc_dai_link imx_phycore_dai_ac97[] = {
...
@@ -41,7 +38,7 @@ static struct snd_soc_dai_link imx_phycore_dai_ac97[] = {
};
};
static
struct
snd_soc_card
imx_phycore
=
{
static
struct
snd_soc_card
imx_phycore
=
{
.
name
=
"PhyCORE-audio"
,
.
name
=
"PhyCORE-a
c97-a
udio"
,
.
dai_link
=
imx_phycore_dai_ac97
,
.
dai_link
=
imx_phycore_dai_ac97
,
.
num_links
=
ARRAY_SIZE
(
imx_phycore_dai_ac97
),
.
num_links
=
ARRAY_SIZE
(
imx_phycore_dai_ac97
),
};
};
...
...
sound/soc/omap/omap-mcbsp.c
View file @
9e8c32ca
...
@@ -644,15 +644,23 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
...
@@ -644,15 +644,23 @@ static int omap_mcbsp_dai_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
case
OMAP_MCBSP_CLKR_SRC_CLKR
:
case
OMAP_MCBSP_CLKR_SRC_CLKR
:
if
(
cpu_class_is_omap1
())
break
;
omap2_mcbsp1_mux_clkr_src
(
CLKR_SRC_CLKR
);
omap2_mcbsp1_mux_clkr_src
(
CLKR_SRC_CLKR
);
break
;
break
;
case
OMAP_MCBSP_CLKR_SRC_CLKX
:
case
OMAP_MCBSP_CLKR_SRC_CLKX
:
if
(
cpu_class_is_omap1
())
break
;
omap2_mcbsp1_mux_clkr_src
(
CLKR_SRC_CLKX
);
omap2_mcbsp1_mux_clkr_src
(
CLKR_SRC_CLKX
);
break
;
break
;
case
OMAP_MCBSP_FSR_SRC_FSR
:
case
OMAP_MCBSP_FSR_SRC_FSR
:
if
(
cpu_class_is_omap1
())
break
;
omap2_mcbsp1_mux_fsr_src
(
FSR_SRC_FSR
);
omap2_mcbsp1_mux_fsr_src
(
FSR_SRC_FSR
);
break
;
break
;
case
OMAP_MCBSP_FSR_SRC_FSX
:
case
OMAP_MCBSP_FSR_SRC_FSX
:
if
(
cpu_class_is_omap1
())
break
;
omap2_mcbsp1_mux_fsr_src
(
FSR_SRC_FSX
);
omap2_mcbsp1_mux_fsr_src
(
FSR_SRC_FSX
);
break
;
break
;
default:
default:
...
...
sound/soc/pxa/corgi.c
View file @
9e8c32ca
...
@@ -100,8 +100,13 @@ static int corgi_startup(struct snd_pcm_substream *substream)
...
@@ -100,8 +100,13 @@ static int corgi_startup(struct snd_pcm_substream *substream)
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_codec
*
codec
=
rtd
->
codec
;
struct
snd_soc_codec
*
codec
=
rtd
->
codec
;
mutex_lock
(
&
codec
->
mutex
);
/* check the jack status at stream startup */
/* check the jack status at stream startup */
corgi_ext_control
(
codec
);
corgi_ext_control
(
codec
);
mutex_unlock
(
&
codec
->
mutex
);
return
0
;
return
0
;
}
}
...
...
sound/soc/pxa/magician.c
View file @
9e8c32ca
...
@@ -72,9 +72,13 @@ static int magician_startup(struct snd_pcm_substream *substream)
...
@@ -72,9 +72,13 @@ static int magician_startup(struct snd_pcm_substream *substream)
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_codec
*
codec
=
rtd
->
codec
;
struct
snd_soc_codec
*
codec
=
rtd
->
codec
;
mutex_lock
(
&
codec
->
mutex
);
/* check the jack status at stream startup */
/* check the jack status at stream startup */
magician_ext_control
(
codec
);
magician_ext_control
(
codec
);
mutex_unlock
(
&
codec
->
mutex
);
return
0
;
return
0
;
}
}
...
...
sound/soc/pxa/poodle.c
View file @
9e8c32ca
...
@@ -77,8 +77,13 @@ static int poodle_startup(struct snd_pcm_substream *substream)
...
@@ -77,8 +77,13 @@ static int poodle_startup(struct snd_pcm_substream *substream)
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_codec
*
codec
=
rtd
->
codec
;
struct
snd_soc_codec
*
codec
=
rtd
->
codec
;
mutex_lock
(
&
codec
->
mutex
);
/* check the jack status at stream startup */
/* check the jack status at stream startup */
poodle_ext_control
(
codec
);
poodle_ext_control
(
codec
);
mutex_unlock
(
&
codec
->
mutex
);
return
0
;
return
0
;
}
}
...
...
sound/soc/pxa/spitz.c
View file @
9e8c32ca
...
@@ -108,8 +108,13 @@ static int spitz_startup(struct snd_pcm_substream *substream)
...
@@ -108,8 +108,13 @@ static int spitz_startup(struct snd_pcm_substream *substream)
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_codec
*
codec
=
rtd
->
codec
;
struct
snd_soc_codec
*
codec
=
rtd
->
codec
;
mutex_lock
(
&
codec
->
mutex
);
/* check the jack status at stream startup */
/* check the jack status at stream startup */
spitz_ext_control
(
codec
);
spitz_ext_control
(
codec
);
mutex_unlock
(
&
codec
->
mutex
);
return
0
;
return
0
;
}
}
...
...
sound/soc/pxa/tosa.c
View file @
9e8c32ca
...
@@ -81,8 +81,13 @@ static int tosa_startup(struct snd_pcm_substream *substream)
...
@@ -81,8 +81,13 @@ static int tosa_startup(struct snd_pcm_substream *substream)
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_pcm_runtime
*
rtd
=
substream
->
private_data
;
struct
snd_soc_codec
*
codec
=
rtd
->
codec
;
struct
snd_soc_codec
*
codec
=
rtd
->
codec
;
mutex_lock
(
&
codec
->
mutex
);
/* check the jack status at stream startup */
/* check the jack status at stream startup */
tosa_ext_control
(
codec
);
tosa_ext_control
(
codec
);
mutex_unlock
(
&
codec
->
mutex
);
return
0
;
return
0
;
}
}
...
...
sound/soc/s3c24xx/Kconfig
View file @
9e8c32ca
...
@@ -2,6 +2,7 @@ config SND_S3C24XX_SOC
...
@@ -2,6 +2,7 @@ config SND_S3C24XX_SOC
tristate "SoC Audio for the Samsung S3CXXXX chips"
tristate "SoC Audio for the Samsung S3CXXXX chips"
depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210
depends on ARCH_S3C2410 || ARCH_S3C64XX || ARCH_S5PC100 || ARCH_S5PV210
select S3C64XX_DMA if ARCH_S3C64XX
select S3C64XX_DMA if ARCH_S3C64XX
select S3C2410_DMA if ARCH_S3C2410
help
help
Say Y or M if you want to add support for codecs attached to
Say Y or M if you want to add support for codecs attached to
the S3C24XX AC97 or I2S interfaces. You will also need to
the S3C24XX AC97 or I2S interfaces. You will also need to
...
...
sound/soc/s3c24xx/rx1950_uda1380.c
View file @
9e8c32ca
...
@@ -50,7 +50,6 @@ static unsigned int rates[] = {
...
@@ -50,7 +50,6 @@ static unsigned int rates[] = {
16000
,
16000
,
44100
,
44100
,
48000
,
48000
,
88200
,
};
};
static
struct
snd_pcm_hw_constraint_list
hw_rates
=
{
static
struct
snd_pcm_hw_constraint_list
hw_rates
=
{
...
@@ -130,7 +129,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
...
@@ -130,7 +129,6 @@ static const struct snd_soc_dapm_route audio_map[] = {
};
};
static
struct
platform_device
*
s3c24xx_snd_device
;
static
struct
platform_device
*
s3c24xx_snd_device
;
static
struct
clk
*
xtal
;
static
int
rx1950_startup
(
struct
snd_pcm_substream
*
substream
)
static
int
rx1950_startup
(
struct
snd_pcm_substream
*
substream
)
{
{
...
@@ -179,10 +177,8 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,
...
@@ -179,10 +177,8 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,
case
44100
:
case
44100
:
case
88200
:
case
88200
:
clk_source
=
S3C24XX_CLKSRC_MPLL
;
clk_source
=
S3C24XX_CLKSRC_MPLL
;
fs_mode
=
S3C2410_IISMOD_256FS
;
fs_mode
=
S3C2410_IISMOD_384FS
;
div
=
clk_get_rate
(
xtal
)
/
(
256
*
rate
);
div
=
1
;
if
(
clk_get_rate
(
xtal
)
%
(
256
*
rate
)
>
(
128
*
rate
))
div
++
;
break
;
break
;
default:
default:
printk
(
KERN_ERR
"%s: rate %d is not supported
\n
"
,
printk
(
KERN_ERR
"%s: rate %d is not supported
\n
"
,
...
@@ -210,7 +206,7 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,
...
@@ -210,7 +206,7 @@ static int rx1950_hw_params(struct snd_pcm_substream *substream,
/* set MCLK division for sample rate */
/* set MCLK division for sample rate */
ret
=
snd_soc_dai_set_clkdiv
(
cpu_dai
,
S3C24XX_DIV_MCLK
,
ret
=
snd_soc_dai_set_clkdiv
(
cpu_dai
,
S3C24XX_DIV_MCLK
,
S3C2410_IISMOD_384FS
);
fs_mode
);
if
(
ret
<
0
)
if
(
ret
<
0
)
return
ret
;
return
ret
;
...
@@ -295,17 +291,8 @@ static int __init rx1950_init(void)
...
@@ -295,17 +291,8 @@ static int __init rx1950_init(void)
goto
err_plat_add
;
goto
err_plat_add
;
}
}
xtal
=
clk_get
(
&
s3c24xx_snd_device
->
dev
,
"xtal"
);
if
(
IS_ERR
(
xtal
))
{
ret
=
PTR_ERR
(
xtal
);
platform_device_unregister
(
s3c24xx_snd_device
);
goto
err_clk
;
}
return
0
;
return
0
;
err_clk:
err_plat_add:
err_plat_add:
err_plat_alloc:
err_plat_alloc:
err_gpio_conf:
err_gpio_conf:
...
@@ -320,7 +307,6 @@ static void __exit rx1950_exit(void)
...
@@ -320,7 +307,6 @@ static void __exit rx1950_exit(void)
platform_device_unregister
(
s3c24xx_snd_device
);
platform_device_unregister
(
s3c24xx_snd_device
);
snd_soc_jack_free_gpios
(
&
hp_jack
,
ARRAY_SIZE
(
hp_jack_gpios
),
snd_soc_jack_free_gpios
(
&
hp_jack
,
ARRAY_SIZE
(
hp_jack_gpios
),
hp_jack_gpios
);
hp_jack_gpios
);
clk_put
(
xtal
);
gpio_free
(
S3C2410_GPA
(
1
));
gpio_free
(
S3C2410_GPA
(
1
));
}
}
...
...
sound/soc/soc-core.c
View file @
9e8c32ca
...
@@ -3043,8 +3043,10 @@ int snd_soc_register_dais(struct device *dev,
...
@@ -3043,8 +3043,10 @@ int snd_soc_register_dais(struct device *dev,
for
(
i
=
0
;
i
<
count
;
i
++
)
{
for
(
i
=
0
;
i
<
count
;
i
++
)
{
dai
=
kzalloc
(
sizeof
(
struct
snd_soc_dai
),
GFP_KERNEL
);
dai
=
kzalloc
(
sizeof
(
struct
snd_soc_dai
),
GFP_KERNEL
);
if
(
dai
==
NULL
)
if
(
dai
==
NULL
)
{
return
-
ENOMEM
;
ret
=
-
ENOMEM
;
goto
err
;
}
/* create DAI component name */
/* create DAI component name */
dai
->
name
=
fmt_multiple_name
(
dev
,
&
dai_drv
[
i
]);
dai
->
name
=
fmt_multiple_name
(
dev
,
&
dai_drv
[
i
]);
...
@@ -3263,9 +3265,6 @@ int snd_soc_register_codec(struct device *dev,
...
@@ -3263,9 +3265,6 @@ int snd_soc_register_codec(struct device *dev,
return
0
;
return
0
;
error:
error:
for
(
i
--
;
i
>=
0
;
i
--
)
snd_soc_unregister_dai
(
dev
);
if
(
codec
->
reg_cache
)
if
(
codec
->
reg_cache
)
kfree
(
codec
->
reg_cache
);
kfree
(
codec
->
reg_cache
);
kfree
(
codec
->
name
);
kfree
(
codec
->
name
);
...
...
sound/soc/soc-dapm.c
View file @
9e8c32ca
...
@@ -683,12 +683,12 @@ static int dapm_seq_compare(struct snd_soc_dapm_widget *a,
...
@@ -683,12 +683,12 @@ static int dapm_seq_compare(struct snd_soc_dapm_widget *a,
struct
snd_soc_dapm_widget
*
b
,
struct
snd_soc_dapm_widget
*
b
,
int
sort
[])
int
sort
[])
{
{
if
(
a
->
codec
!=
b
->
codec
)
return
(
unsigned
long
)
a
-
(
unsigned
long
)
b
;
if
(
sort
[
a
->
id
]
!=
sort
[
b
->
id
])
if
(
sort
[
a
->
id
]
!=
sort
[
b
->
id
])
return
sort
[
a
->
id
]
-
sort
[
b
->
id
];
return
sort
[
a
->
id
]
-
sort
[
b
->
id
];
if
(
a
->
reg
!=
b
->
reg
)
if
(
a
->
reg
!=
b
->
reg
)
return
a
->
reg
-
b
->
reg
;
return
a
->
reg
-
b
->
reg
;
if
(
a
->
codec
!=
b
->
codec
)
return
(
unsigned
long
)
a
->
codec
-
(
unsigned
long
)
b
->
codec
;
return
0
;
return
0
;
}
}
...
...
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