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
15ad9a53
Commit
15ad9a53
authored
Oct 28, 2008
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/fix/asoc' into topic/asoc
parents
911fc25d
c3e5203b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
12 deletions
+22
-12
sound/soc/blackfin/bf5xx-i2s.c
sound/soc/blackfin/bf5xx-i2s.c
+22
-12
No files found.
sound/soc/blackfin/bf5xx-i2s.c
View file @
15ad9a53
...
...
@@ -70,12 +70,24 @@ static struct sport_param sport_params[2] = {
}
};
static
u16
sport_req
[][
7
]
=
{
{
P_SPORT0_DTPRI
,
P_SPORT0_TSCLK
,
P_SPORT0_RFS
,
P_SPORT0_DRPRI
,
P_SPORT0_RSCLK
,
0
},
{
P_SPORT1_DTPRI
,
P_SPORT1_TSCLK
,
P_SPORT1_RFS
,
P_SPORT1_DRPRI
,
P_SPORT1_RSCLK
,
0
},
};
/*
* Setting the TFS pin selector for SPORT 0 based on whether the selected
* port id F or G. If the port is F then no conflict should exist for the
* TFS. When Port G is selected and EMAC then there is a conflict between
* the PHY interrupt line and TFS. Current settings prevent the conflict
* by ignoring the TFS pin when Port G is selected. This allows both
* ssm2602 using Port G and EMAC concurrently.
*/
#ifdef CONFIG_BF527_SPORT0_PORTF
#define LOCAL_SPORT0_TFS (P_SPORT0_TFS)
#else
#define LOCAL_SPORT0_TFS (0)
#endif
static
u16
sport_req
[][
7
]
=
{
{
P_SPORT0_DTPRI
,
P_SPORT0_TSCLK
,
P_SPORT0_RFS
,
P_SPORT0_DRPRI
,
P_SPORT0_RSCLK
,
LOCAL_SPORT0_TFS
,
0
},
{
P_SPORT1_DTPRI
,
P_SPORT1_TSCLK
,
P_SPORT1_RFS
,
P_SPORT1_DRPRI
,
P_SPORT1_RSCLK
,
P_SPORT1_TFS
,
0
}
};
static
int
bf5xx_i2s_set_dai_fmt
(
struct
snd_soc_dai
*
cpu_dai
,
unsigned
int
fmt
)
...
...
@@ -98,23 +110,21 @@ static int bf5xx_i2s_set_dai_fmt(struct snd_soc_dai *cpu_dai,
ret
=
-
EINVAL
;
break
;
default:
printk
(
KERN_ERR
"%s: Unknown DAI format type
\n
"
,
__func__
);
ret
=
-
EINVAL
;
break
;
}
switch
(
fmt
&
SND_SOC_DAIFMT_MASTER_MASK
)
{
case
SND_SOC_DAIFMT_CBS_CFS
:
ret
=
-
EINVAL
;
break
;
case
SND_SOC_DAIFMT_CBM_CFS
:
ret
=
-
EINVAL
;
break
;
case
SND_SOC_DAIFMT_CBM_CFM
:
break
;
case
SND_SOC_DAIFMT_CBS_CFS
:
case
SND_SOC_DAIFMT_CBM_CFS
:
case
SND_SOC_DAIFMT_CBS_CFM
:
ret
=
-
EINVAL
;
break
;
default:
printk
(
KERN_ERR
"%s: Unknown DAI master type
\n
"
,
__func__
);
ret
=
-
EINVAL
;
break
;
}
...
...
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