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
Kirill Smelkov
linux
Commits
42bef686
Commit
42bef686
authored
Aug 12, 2011
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-3.1' into for-3.2
parents
4c54c6de
7ec41ee5
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
492 additions
and
11 deletions
+492
-11
MAINTAINERS
MAINTAINERS
+1
-1
include/sound/tlv320aic3x.h
include/sound/tlv320aic3x.h
+1
-1
sound/soc/omap/n810.c
sound/soc/omap/n810.c
+2
-2
sound/soc/omap/omap-mcbsp.c
sound/soc/omap/omap-mcbsp.c
+2
-2
sound/soc/omap/omap-mcbsp.h
sound/soc/omap/omap-mcbsp.h
+1
-1
sound/soc/omap/omap-pcm.c
sound/soc/omap/omap-pcm.c
+2
-2
sound/soc/omap/omap-pcm.h
sound/soc/omap/omap-pcm.h
+1
-1
sound/soc/omap/rx51.c
sound/soc/omap/rx51.c
+1
-1
sound/soc/samsung/Makefile
sound/soc/samsung/Makefile
+2
-0
sound/soc/samsung/idma.c
sound/soc/samsung/idma.c
+453
-0
sound/soc/samsung/idma.h
sound/soc/samsung/idma.h
+26
-0
No files found.
MAINTAINERS
View file @
42bef686
...
...
@@ -4604,7 +4604,7 @@ F: arch/arm/mach-omap2/clockdomain2xxx_3xxx.c
F: arch/arm/mach-omap2/clockdomain44xx.c
OMAP AUDIO SUPPORT
M: Jarkko Nikula <j
hnikula@gmail
.com>
M: Jarkko Nikula <j
arkko.nikula@bitmer
.com>
L: alsa-devel@alsa-project.org (subscribers-only)
L: linux-omap@vger.kernel.org
S: Maintained
...
...
include/sound/tlv320aic3x.h
View file @
42bef686
/*
* Platform data for Texas Instruments TLV320AIC3x codec
*
* Author: Jarkko Nikula <j
hnikula@gmail
.com>
* Author: Jarkko Nikula <j
arkko.nikula@bitmer
.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
...
...
sound/soc/omap/n810.c
View file @
42bef686
...
...
@@ -3,7 +3,7 @@
*
* Copyright (C) 2008 Nokia Corporation
*
* Contact: Jarkko Nikula <j
hnikula@gmail
.com>
* Contact: Jarkko Nikula <j
arkko.nikula@bitmer
.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
@@ -402,6 +402,6 @@ static void __exit n810_soc_exit(void)
module_init
(
n810_soc_init
);
module_exit
(
n810_soc_exit
);
MODULE_AUTHOR
(
"Jarkko Nikula <j
hnikula@gmail
.com>"
);
MODULE_AUTHOR
(
"Jarkko Nikula <j
arkko.nikula@bitmer
.com>"
);
MODULE_DESCRIPTION
(
"ALSA SoC Nokia N810"
);
MODULE_LICENSE
(
"GPL"
);
sound/soc/omap/omap-mcbsp.c
View file @
42bef686
...
...
@@ -3,7 +3,7 @@
*
* Copyright (C) 2008 Nokia Corporation
*
* Contact: Jarkko Nikula <j
hnikula@gmail
.com>
* Contact: Jarkko Nikula <j
arkko.nikula@bitmer
.com>
* Peter Ujfalusi <peter.ujfalusi@ti.com>
*
* This program is free software; you can redistribute it and/or
...
...
@@ -780,6 +780,6 @@ static void __exit snd_omap_mcbsp_exit(void)
}
module_exit
(
snd_omap_mcbsp_exit
);
MODULE_AUTHOR
(
"Jarkko Nikula <j
hnikula@gmail
.com>"
);
MODULE_AUTHOR
(
"Jarkko Nikula <j
arkko.nikula@bitmer
.com>"
);
MODULE_DESCRIPTION
(
"OMAP I2S SoC Interface"
);
MODULE_LICENSE
(
"GPL"
);
sound/soc/omap/omap-mcbsp.h
View file @
42bef686
...
...
@@ -3,7 +3,7 @@
*
* Copyright (C) 2008 Nokia Corporation
*
* Contact: Jarkko Nikula <j
hnikula@gmail
.com>
* Contact: Jarkko Nikula <j
arkko.nikula@bitmer
.com>
* Peter Ujfalusi <peter.ujfalusi@ti.com>
*
* This program is free software; you can redistribute it and/or
...
...
sound/soc/omap/omap-pcm.c
View file @
42bef686
...
...
@@ -3,7 +3,7 @@
*
* Copyright (C) 2008 Nokia Corporation
*
* Contact: Jarkko Nikula <j
hnikula@gmail
.com>
* Contact: Jarkko Nikula <j
arkko.nikula@bitmer
.com>
* Peter Ujfalusi <peter.ujfalusi@ti.com>
*
* This program is free software; you can redistribute it and/or
...
...
@@ -436,6 +436,6 @@ static void __exit snd_omap_pcm_exit(void)
}
module_exit
(
snd_omap_pcm_exit
);
MODULE_AUTHOR
(
"Jarkko Nikula <j
hnikula@gmail
.com>"
);
MODULE_AUTHOR
(
"Jarkko Nikula <j
arkko.nikula@bitmer
.com>"
);
MODULE_DESCRIPTION
(
"OMAP PCM DMA module"
);
MODULE_LICENSE
(
"GPL"
);
sound/soc/omap/omap-pcm.h
View file @
42bef686
...
...
@@ -3,7 +3,7 @@
*
* Copyright (C) 2008 Nokia Corporation
*
* Contact: Jarkko Nikula <j
hnikula@gmail
.com>
* Contact: Jarkko Nikula <j
arkko.nikula@bitmer
.com>
* Peter Ujfalusi <peter.ujfalusi@ti.com>
*
* This program is free software; you can redistribute it and/or
...
...
sound/soc/omap/rx51.c
View file @
42bef686
...
...
@@ -5,7 +5,7 @@
*
* Contact: Peter Ujfalusi <peter.ujfalusi@ti.com>
* Eduardo Valentin <eduardo.valentin@nokia.com>
* Jarkko Nikula <j
hnikula@gmail
.com>
* Jarkko Nikula <j
arkko.nikula@bitmer
.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/samsung/Makefile
View file @
42bef686
# S3c24XX Platform Support
snd-soc-s3c24xx-objs
:=
dma.o
snd-soc-idma-objs
:=
idma.o
snd-soc-s3c24xx-i2s-objs
:=
s3c24xx-i2s.o
snd-soc-s3c2412-i2s-objs
:=
s3c2412-i2s.o
snd-soc-ac97-objs
:=
ac97.o
...
...
@@ -16,6 +17,7 @@ obj-$(CONFIG_SND_S3C_I2SV2_SOC) += snd-soc-s3c-i2s-v2.o
obj-$(CONFIG_SND_SAMSUNG_SPDIF)
+=
snd-soc-samsung-spdif.o
obj-$(CONFIG_SND_SAMSUNG_PCM)
+=
snd-soc-pcm.o
obj-$(CONFIG_SND_SAMSUNG_I2S)
+=
snd-soc-i2s.o
obj-$(CONFIG_SND_SAMSUNG_I2S)
+=
snd-soc-idma.o
# S3C24XX Machine Support
snd-soc-jive-wm8750-objs
:=
jive_wm8750.o
...
...
sound/soc/samsung/idma.c
0 → 100644
View file @
42bef686
This diff is collapsed.
Click to expand it.
sound/soc/samsung/idma.h
0 → 100644
View file @
42bef686
/*
* sound/soc/samsung/idma.h
*
* Copyright (c) 2011 Samsung Electronics Co., Ltd
* http://www.samsung.com
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
*/
#ifndef __SND_SOC_SAMSUNG_IDMA_H_
#define __SND_SOC_SAMSUNG_IDMA_H_
extern
void
idma_reg_addr_init
(
void
*
regs
,
dma_addr_t
addr
);
/* dma_state */
#define LPAM_DMA_STOP 0
#define LPAM_DMA_START 1
#define MAX_IDMA_PERIOD (128 * 1024)
#define MAX_IDMA_BUFFER (160 * 1024)
#endif
/* __SND_SOC_SAMSUNG_IDMA_H_ */
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