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
c6774bcd
Commit
c6774bcd
authored
Aug 11, 2010
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/asoc' into for-linus
parents
6b4e9012
2e2211a3
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
38 additions
and
9 deletions
+38
-9
sound/soc/blackfin/Kconfig
sound/soc/blackfin/Kconfig
+6
-1
sound/soc/blackfin/bf5xx-ad1980.c
sound/soc/blackfin/bf5xx-ad1980.c
+9
-1
sound/soc/codecs/ad1980.c
sound/soc/codecs/ad1980.c
+9
-1
sound/soc/codecs/ad1980.h
sound/soc/codecs/ad1980.h
+6
-0
sound/soc/codecs/wm8580.c
sound/soc/codecs/wm8580.c
+3
-3
sound/soc/imx/Kconfig
sound/soc/imx/Kconfig
+3
-1
sound/soc/soc-cache.c
sound/soc/soc-cache.c
+2
-2
No files found.
sound/soc/blackfin/Kconfig
View file @
c6774bcd
...
...
@@ -105,13 +105,18 @@ config SND_BF5XX_RESET_GPIO_NUM
Set the correct GPIO for RESET the sound chip.
config SND_BF5XX_SOC_AD1980
tristate "SoC AD1980/1 Audio support for BF5xx"
tristate "SoC AD1980/1 Audio support for BF5xx
(Obsolete)
"
depends on SND_BF5XX_AC97
select SND_BF5XX_SOC_AC97
select SND_SOC_AD1980
help
Say Y if you want to add support for SoC audio on BF5xx STAMP/EZKIT.
Warning:
Because Analog Devices Inc. discontinued the ad1980 sound chip since
Sep. 2009, this ad1980 driver is not maintained, tested and supported
by ADI now.
config SND_BF5XX_SOC_SPORT
tristate
...
...
sound/soc/blackfin/bf5xx-ad1980.c
View file @
c6774bcd
...
...
@@ -26,6 +26,14 @@
* 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
/*
* WARNING:
*
* Because Analog Devices Inc. discontinued the ad1980 sound chip since
* Sep. 2009, this ad1980 driver is not maintained, tested and supported
* by ADI now.
*/
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/device.h>
...
...
@@ -109,5 +117,5 @@ module_exit(bf5xx_board_exit);
/* Module information */
MODULE_AUTHOR
(
"Cliff Cai"
);
MODULE_DESCRIPTION
(
"ALSA SoC AD1980/1 BF5xx board"
);
MODULE_DESCRIPTION
(
"ALSA SoC AD1980/1 BF5xx board
(Obsolete)
"
);
MODULE_LICENSE
(
"GPL"
);
sound/soc/codecs/ad1980.c
View file @
c6774bcd
...
...
@@ -11,6 +11,14 @@
* option) any later version.
*/
/*
* WARNING:
*
* Because Analog Devices Inc. discontinued the ad1980 sound chip since
* Sep. 2009, this ad1980 driver is not maintained, tested and supported
* by ADI now.
*/
#include <linux/init.h>
#include <linux/slab.h>
#include <linux/module.h>
...
...
@@ -298,6 +306,6 @@ struct snd_soc_codec_device soc_codec_dev_ad1980 = {
};
EXPORT_SYMBOL_GPL
(
soc_codec_dev_ad1980
);
MODULE_DESCRIPTION
(
"ASoC ad1980 driver"
);
MODULE_DESCRIPTION
(
"ASoC ad1980 driver
(Obsolete)
"
);
MODULE_AUTHOR
(
"Roy Huang, Cliff Cai"
);
MODULE_LICENSE
(
"GPL"
);
sound/soc/codecs/ad1980.h
View file @
c6774bcd
/*
* ad1980.h -- ad1980 Soc Audio driver
*
* WARNING:
*
* Because Analog Devices Inc. discontinued the ad1980 sound chip since
* Sep. 2009, this ad1980 driver is not maintained, tested and supported
* by ADI now.
*/
#ifndef _AD1980_H
...
...
sound/soc/codecs/wm8580.c
View file @
c6774bcd
...
...
@@ -269,9 +269,9 @@ SOC_DOUBLE("DAC2 Invert Switch", WM8580_DAC_CONTROL4, 2, 3, 1, 0),
SOC_DOUBLE
(
"DAC3 Invert Switch"
,
WM8580_DAC_CONTROL4
,
4
,
5
,
1
,
0
),
SOC_SINGLE
(
"DAC ZC Switch"
,
WM8580_DAC_CONTROL5
,
5
,
1
,
0
),
SOC_SINGLE
(
"DAC1 Switch"
,
WM8580_DAC_CONTROL5
,
0
,
1
,
0
),
SOC_SINGLE
(
"DAC2 Switch"
,
WM8580_DAC_CONTROL5
,
1
,
1
,
0
),
SOC_SINGLE
(
"DAC3 Switch"
,
WM8580_DAC_CONTROL5
,
2
,
1
,
0
),
SOC_SINGLE
(
"DAC1 Switch"
,
WM8580_DAC_CONTROL5
,
0
,
1
,
1
),
SOC_SINGLE
(
"DAC2 Switch"
,
WM8580_DAC_CONTROL5
,
1
,
1
,
1
),
SOC_SINGLE
(
"DAC3 Switch"
,
WM8580_DAC_CONTROL5
,
2
,
1
,
1
),
SOC_DOUBLE
(
"ADC Mute Switch"
,
WM8580_ADC_CONTROL1
,
0
,
1
,
1
,
0
),
SOC_SINGLE
(
"ADC High-Pass Filter Switch"
,
WM8580_ADC_CONTROL1
,
4
,
1
,
0
),
...
...
sound/soc/imx/Kconfig
View file @
c6774bcd
...
...
@@ -28,7 +28,9 @@ config SND_SOC_PHYCORE_AC97
config SND_SOC_EUKREA_TLV320
tristate "Eukrea TLV320"
depends on MACH_EUKREA_MBIMX27_BASEBOARD || MACH_EUKREA_MBIMXSD_BASEBOARD
depends on MACH_EUKREA_MBIMX27_BASEBOARD \
|| MACH_EUKREA_MBIMXSD25_BASEBOARD \
|| MACH_EUKREA_MBIMXSD35_BASEBOARD
select SND_SOC_TLV320AIC23
help
Enable I2S based access to the TLV320AIC23B codec attached
...
...
sound/soc/soc-cache.c
View file @
c6774bcd
...
...
@@ -340,7 +340,7 @@ static unsigned int snd_soc_16_8_read_i2c(struct snd_soc_codec *codec,
static
unsigned
int
snd_soc_16_8_read
(
struct
snd_soc_codec
*
codec
,
unsigned
int
reg
)
{
u
16
*
cache
=
codec
->
reg_cache
;
u
8
*
cache
=
codec
->
reg_cache
;
reg
&=
0xff
;
if
(
reg
>=
codec
->
reg_cache_size
)
...
...
@@ -351,7 +351,7 @@ static unsigned int snd_soc_16_8_read(struct snd_soc_codec *codec,
static
int
snd_soc_16_8_write
(
struct
snd_soc_codec
*
codec
,
unsigned
int
reg
,
unsigned
int
value
)
{
u
16
*
cache
=
codec
->
reg_cache
;
u
8
*
cache
=
codec
->
reg_cache
;
u8
data
[
3
];
int
ret
;
...
...
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