git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-omap1
/
mcbsp.c
diff --git
a/arch/arm/mach-omap1/mcbsp.c
b/arch/arm/mach-omap1/mcbsp.c
index
d9af981
..
ab7395d
100644
(file)
--- a/
arch/arm/mach-omap1/mcbsp.c
+++ b/
arch/arm/mach-omap1/mcbsp.c
@@
-38,7
+38,7
@@
static void omap1_mcbsp_request(unsigned int id)
* On 1510, 1610 and 1710, McBSP1 and McBSP3
* are DSP public peripherals.
*/
* On 1510, 1610 and 1710, McBSP1 and McBSP3
* are DSP public peripherals.
*/
- if (id ==
OMAP_MCBSP1 || id == OMAP_MCBSP3
) {
+ if (id ==
0 || id == 2
) {
if (dsp_use++ == 0) {
api_clk = clk_get(NULL, "api_ck");
dsp_clk = clk_get(NULL, "dsp_ck");
if (dsp_use++ == 0) {
api_clk = clk_get(NULL, "api_ck");
dsp_clk = clk_get(NULL, "dsp_ck");
@@
-59,7
+59,7
@@
static void omap1_mcbsp_request(unsigned int id)
static void omap1_mcbsp_free(unsigned int id)
{
static void omap1_mcbsp_free(unsigned int id)
{
- if (id ==
OMAP_MCBSP1 || id == OMAP_MCBSP3
) {
+ if (id ==
0 || id == 2
) {
if (--dsp_use == 0) {
if (!IS_ERR(api_clk)) {
clk_disable(api_clk);
if (--dsp_use == 0) {
if (!IS_ERR(api_clk)) {
clk_disable(api_clk);