Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
e2cd52e6
Commit
e2cd52e6
authored
Nov 18, 2009
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/asoc' into for-linus
parents
ef4b18e2
bab02124
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
3 deletions
+4
-3
sound/soc/codecs/tlv320aic23.c
sound/soc/codecs/tlv320aic23.c
+1
-1
sound/soc/omap/omap3evm.c
sound/soc/omap/omap3evm.c
+1
-1
sound/soc/omap/omap3pandora.c
sound/soc/omap/omap3pandora.c
+2
-1
No files found.
sound/soc/codecs/tlv320aic23.c
View file @
e2cd52e6
...
...
@@ -265,8 +265,8 @@ static const int bosr_usb_divisor_table[] = {
#define UPPER_GROUP ((1<<8) | (1<<9) | (1<<10) | (1<<11) | (1<<15))
static
const
unsigned
short
sr_valid_mask
[]
=
{
LOWER_GROUP
|
UPPER_GROUP
,
/* Normal, bosr - 0*/
LOWER_GROUP
|
UPPER_GROUP
,
/* Normal, bosr - 1*/
LOWER_GROUP
,
/* Usb, bosr - 0*/
LOWER_GROUP
|
UPPER_GROUP
,
/* Normal, bosr - 1*/
UPPER_GROUP
,
/* Usb, bosr - 1*/
};
/*
...
...
sound/soc/omap/omap3evm.c
View file @
e2cd52e6
...
...
@@ -144,4 +144,4 @@ module_exit(omap3evm_soc_exit);
MODULE_AUTHOR
(
"Anuj Aggarwal <anuj.aggarwal@ti.com>"
);
MODULE_DESCRIPTION
(
"ALSA SoC OMAP3 EVM"
);
MODULE_LICENSE
(
"GPLv2"
);
MODULE_LICENSE
(
"GPL
v2"
);
sound/soc/omap/omap3pandora.c
View file @
e2cd52e6
...
...
@@ -134,7 +134,7 @@ static int omap3pandora_hp_event(struct snd_soc_dapm_widget *w,
* |P| <--- TWL4030 <--------- Line In and MICs
*/
static
const
struct
snd_soc_dapm_widget
omap3pandora_out_dapm_widgets
[]
=
{
SND_SOC_DAPM_DAC
(
"PCM DAC"
,
"Playback"
,
SND_SOC_NOPM
,
0
,
0
),
SND_SOC_DAPM_DAC
(
"PCM DAC"
,
"
HiFi
Playback"
,
SND_SOC_NOPM
,
0
,
0
),
SND_SOC_DAPM_PGA_E
(
"Headphone Amplifier"
,
SND_SOC_NOPM
,
0
,
0
,
NULL
,
0
,
omap3pandora_hp_event
,
SND_SOC_DAPM_POST_PMU
|
SND_SOC_DAPM_PRE_PMD
),
...
...
@@ -181,6 +181,7 @@ static int omap3pandora_out_init(struct snd_soc_codec *codec)
snd_soc_dapm_nc_pin
(
codec
,
"CARKITR"
);
snd_soc_dapm_nc_pin
(
codec
,
"HFL"
);
snd_soc_dapm_nc_pin
(
codec
,
"HFR"
);
snd_soc_dapm_nc_pin
(
codec
,
"VIBRA"
);
ret
=
snd_soc_dapm_new_controls
(
codec
,
omap3pandora_out_dapm_widgets
,
ARRAY_SIZE
(
omap3pandora_out_dapm_widgets
));
...
...
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