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
9b5b0c01
Commit
9b5b0c01
authored
Apr 20, 2009
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-2.6.30' into for-2.6.31
parents
7154b3e8
b08f7a62
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
40 additions
and
16 deletions
+40
-16
sound/soc/omap/n810.c
sound/soc/omap/n810.c
+2
-2
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-mcbsp.c
+3
-2
sound/soc/omap/omap-mcbsp.h
sound/soc/omap/omap-mcbsp.h
+2
-1
sound/soc/omap/omap-pcm.c
sound/soc/omap/omap-pcm.c
+3
-2
sound/soc/omap/omap-pcm.h
sound/soc/omap/omap-pcm.h
+2
-1
sound/soc/pxa/pxa-ssp.c
sound/soc/pxa/pxa-ssp.c
+28
-8
No files found.
sound/soc/omap/n810.c
View file @
9b5b0c01
...
...
@@ -3,7 +3,7 @@
*
* Copyright (C) 2008 Nokia Corporation
*
* Contact: Jarkko Nikula <j
arkko.nikula@nokia
.com>
* Contact: Jarkko Nikula <j
hnikula@gmail
.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
@@ -416,6 +416,6 @@ static void __exit n810_soc_exit(void)
module_init
(
n810_soc_init
);
module_exit
(
n810_soc_exit
);
MODULE_AUTHOR
(
"Jarkko Nikula <j
arkko.nikula@nokia
.com>"
);
MODULE_AUTHOR
(
"Jarkko Nikula <j
hnikula@gmail
.com>"
);
MODULE_DESCRIPTION
(
"ALSA SoC Nokia N810"
);
MODULE_LICENSE
(
"GPL"
);
sound/soc/omap/omap-mcbsp.c
View file @
9b5b0c01
...
...
@@ -3,7 +3,8 @@
*
* Copyright (C) 2008 Nokia Corporation
*
* Contact: Jarkko Nikula <jarkko.nikula@nokia.com>
* Contact: Jarkko Nikula <jhnikula@gmail.com>
* Peter Ujfalusi <peter.ujfalusi@nokia.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
@@ -546,6 +547,6 @@ static void __exit snd_omap_mcbsp_exit(void)
}
module_exit
(
snd_omap_mcbsp_exit
);
MODULE_AUTHOR
(
"Jarkko Nikula <j
arkko.nikula@nokia
.com>"
);
MODULE_AUTHOR
(
"Jarkko Nikula <j
hnikula@gmail
.com>"
);
MODULE_DESCRIPTION
(
"OMAP I2S SoC Interface"
);
MODULE_LICENSE
(
"GPL"
);
sound/soc/omap/omap-mcbsp.h
View file @
9b5b0c01
...
...
@@ -3,7 +3,8 @@
*
* Copyright (C) 2008 Nokia Corporation
*
* Contact: Jarkko Nikula <jarkko.nikula@nokia.com>
* Contact: Jarkko Nikula <jhnikula@gmail.com>
* Peter Ujfalusi <peter.ujfalusi@nokia.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
sound/soc/omap/omap-pcm.c
View file @
9b5b0c01
...
...
@@ -3,7 +3,8 @@
*
* Copyright (C) 2008 Nokia Corporation
*
* Contact: Jarkko Nikula <jarkko.nikula@nokia.com>
* Contact: Jarkko Nikula <jhnikula@gmail.com>
* Peter Ujfalusi <peter.ujfalusi@nokia.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
@@ -367,6 +368,6 @@ static void __exit omap_soc_platform_exit(void)
}
module_exit
(
omap_soc_platform_exit
);
MODULE_AUTHOR
(
"Jarkko Nikula <j
arkko.nikula@nokia
.com>"
);
MODULE_AUTHOR
(
"Jarkko Nikula <j
hnikula@gmail
.com>"
);
MODULE_DESCRIPTION
(
"OMAP PCM DMA module"
);
MODULE_LICENSE
(
"GPL"
);
sound/soc/omap/omap-pcm.h
View file @
9b5b0c01
...
...
@@ -3,7 +3,8 @@
*
* Copyright (C) 2008 Nokia Corporation
*
* Contact: Jarkko Nikula <jarkko.nikula@nokia.com>
* Contact: Jarkko Nikula <jhnikula@gmail.com>
* Peter Ujfalusi <peter.ujfalusi@nokia.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
sound/soc/pxa/pxa-ssp.c
View file @
9b5b0c01
...
...
@@ -280,12 +280,33 @@ static int pxa_ssp_resume(struct snd_soc_dai *cpu_dai)
* ssp_set_clkdiv - set SSP clock divider
* @div: serial clock rate divider
*/
static
void
ssp_set_scr
(
struct
ssp_dev
*
dev
,
u32
div
)
static
void
ssp_set_scr
(
struct
ssp_dev
ice
*
ssp
,
u32
div
)
{
struct
ssp_device
*
ssp
=
dev
->
ssp
;
u32
sscr0
=
ssp_read_reg
(
dev
->
ssp
,
SSCR0
)
&
~
SSCR0_SCR
;
u32
sscr0
=
ssp_read_reg
(
ssp
,
SSCR0
);
if
(
cpu_is_pxa25x
()
&&
ssp
->
type
==
PXA25x_SSP
)
{
sscr0
&=
~
0x0000ff00
;
sscr0
|=
((
div
-
2
)
/
2
)
<<
8
;
/* 2..512 */
}
else
{
sscr0
&=
~
0x000fff00
;
sscr0
|=
(
div
-
1
)
<<
8
;
/* 1..4096 */
}
ssp_write_reg
(
ssp
,
SSCR0
,
sscr0
);
}
/**
* ssp_get_clkdiv - get SSP clock divider
*/
static
u32
ssp_get_scr
(
struct
ssp_device
*
ssp
)
{
u32
sscr0
=
ssp_read_reg
(
ssp
,
SSCR0
);
u32
div
;
ssp_write_reg
(
ssp
,
SSCR0
,
(
sscr0
|
SSCR0_SerClkDiv
(
div
)));
if
(
cpu_is_pxa25x
()
&&
ssp
->
type
==
PXA25x_SSP
)
div
=
((
sscr0
>>
8
)
&
0xff
)
*
2
+
2
;
else
div
=
((
sscr0
>>
8
)
&
0xfff
)
+
1
;
return
div
;
}
/*
...
...
@@ -326,7 +347,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
break
;
case
PXA_SSP_CLK_AUDIO
:
priv
->
sysclk
=
0
;
ssp_set_scr
(
&
priv
->
dev
,
1
);
ssp_set_scr
(
ssp
,
1
);
sscr0
|=
SSCR0_ACS
;
break
;
default:
...
...
@@ -387,7 +408,7 @@ static int pxa_ssp_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
ssp_write_reg
(
ssp
,
SSACD
,
val
);
break
;
case
PXA_SSP_DIV_SCR
:
ssp_set_scr
(
&
priv
->
dev
,
div
);
ssp_set_scr
(
ssp
,
div
);
break
;
default:
return
-
ENODEV
;
...
...
@@ -683,8 +704,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
case
SND_SOC_DAIFMT_I2S
:
sspsp
=
ssp_read_reg
(
ssp
,
SSPSP
);
if
(((
sscr0
&
SSCR0_SCR
)
==
SSCR0_SerClkDiv
(
4
))
&&
(
width
==
16
))
{
if
((
ssp_get_scr
(
ssp
)
==
4
)
&&
(
width
==
16
))
{
/* This is a special case where the bitclk is 64fs
* and we're not dealing with 2*32 bits of audio
* samples.
...
...
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