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
68d114e1
Commit
68d114e1
authored
Oct 04, 2012
by
Mark Brown
Browse files
Options
Browse Files
Download
Plain Diff
Merge branches 'asoc-twl6040' and 'asoc-omap' into for-3.7
parents
07ac2296
b764de2d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
41 deletions
+45
-41
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-ams-delta.c
+12
-0
sound/soc/omap/ams-delta.c
sound/soc/omap/ams-delta.c
+30
-33
sound/soc/omap/omap-abe-twl6040.c
sound/soc/omap/omap-abe-twl6040.c
+1
-1
sound/soc/omap/omap-mcpdm.c
sound/soc/omap/omap-mcpdm.c
+2
-7
No files found.
arch/arm/mach-omap1/board-ams-delta.c
View file @
68d114e1
...
...
@@ -444,16 +444,28 @@ static struct omap1_cam_platform_data ams_delta_camera_platform_data = {
.
lclk_khz_max
=
1334
,
/* results in 5fps CIF, 10fps QCIF */
};
static
struct
platform_device
ams_delta_audio_device
=
{
.
name
=
"ams-delta-audio"
,
.
id
=
-
1
,
};
static
struct
platform_device
cx20442_codec_device
=
{
.
name
=
"cx20442-codec"
,
.
id
=
-
1
,
};
static
struct
platform_device
*
ams_delta_devices
[]
__initdata
=
{
&
latch1_gpio_device
,
&
latch2_gpio_device
,
&
ams_delta_kp_device
,
&
ams_delta_camera_device
,
&
ams_delta_audio_device
,
};
static
struct
platform_device
*
late_devices
[]
__initdata
=
{
&
ams_delta_nand_device
,
&
ams_delta_lcd_device
,
&
cx20442_codec_device
,
};
static
void
__init
ams_delta_init
(
void
)
...
...
sound/soc/omap/ams-delta.c
View file @
68d114e1
...
...
@@ -575,56 +575,53 @@ static struct snd_soc_card ams_delta_audio_card = {
};
/* Module init/exit */
static
struct
platform_device
*
ams_delta_audio_platform_device
;
static
struct
platform_device
*
cx20442_platform_device
;
static
int
__init
ams_delta_module_init
(
void
)
static
__devinit
int
ams_delta_probe
(
struct
platform_device
*
pdev
)
{
struct
snd_soc_card
*
card
=
&
ams_delta_audio_card
;
int
ret
;
if
(
!
(
machine_is_ams_delta
()))
return
-
ENODEV
;
ams_delta_audio_platform_device
=
platform_device_alloc
(
"soc-audio"
,
-
1
);
if
(
!
ams_delta_audio_platform_device
)
return
-
ENOMEM
;
card
->
dev
=
&
pdev
->
dev
;
platform_set_drvdata
(
ams_delta_audio_platform_device
,
&
ams_delta_audio_card
);
ret
=
platform_device_add
(
ams_delta_audio_platform_device
);
if
(
ret
)
goto
err
;
/*
* Codec platform device could be registered from elsewhere (board?),
* but I do it here as it makes sense only if used with the card.
*/
cx20442_platform_device
=
platform_device_register_simple
(
"cx20442-codec"
,
-
1
,
NULL
,
0
);
ret
=
snd_soc_register_card
(
card
);
if
(
ret
)
{
dev_err
(
&
pdev
->
dev
,
"snd_soc_register_card failed (%d)
\n
"
,
ret
);
card
->
dev
=
NULL
;
return
ret
;
}
return
0
;
err:
platform_device_put
(
ams_delta_audio_platform_device
);
return
ret
;
}
late_initcall
(
ams_delta_module_init
);
static
void
__exit
ams_delta_module_exit
(
void
)
static
int
__devexit
ams_delta_remove
(
struct
platform_device
*
pdev
)
{
struct
snd_soc_card
*
card
=
platform_get_drvdata
(
pdev
);
if
(
tty_unregister_ldisc
(
N_V253
)
!=
0
)
dev_warn
(
&
ams_delta_audio_platform_device
->
dev
,
dev_warn
(
&
pdev
->
dev
,
"failed to unregister V253 line discipline
\n
"
);
snd_soc_jack_free_gpios
(
&
ams_delta_hook_switch
,
ARRAY_SIZE
(
ams_delta_hook_switch_gpios
),
ams_delta_hook_switch_gpios
);
platform_device_unregister
(
cx20442_platform_device
);
platform_device_unregister
(
ams_delta_audio_platform_device
);
snd_soc_unregister_card
(
card
);
card
->
dev
=
NULL
;
return
0
;
}
module_exit
(
ams_delta_module_exit
);
#define DRV_NAME "ams-delta-audio"
static
struct
platform_driver
ams_delta_driver
=
{
.
driver
=
{
.
name
=
DRV_NAME
,
.
owner
=
THIS_MODULE
,
},
.
probe
=
ams_delta_probe
,
.
remove
=
__devexit_p
(
ams_delta_remove
),
};
module_platform_driver
(
ams_delta_driver
);
MODULE_AUTHOR
(
"Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>"
);
MODULE_DESCRIPTION
(
"ALSA SoC driver for Amstrad E3 (Delta) videophone"
);
MODULE_LICENSE
(
"GPL"
);
MODULE_ALIAS
(
"platform:"
DRV_NAME
);
sound/soc/omap/omap-abe-twl6040.c
View file @
68d114e1
...
...
@@ -220,7 +220,7 @@ static int omap_abe_twl6040_init(struct snd_soc_pcm_runtime *rtd)
twl6040_disconnect_pin
(
dapm
,
pdata
->
has_hf
,
"Ext Spk"
);
twl6040_disconnect_pin
(
dapm
,
pdata
->
has_ep
,
"Earphone Spk"
);
twl6040_disconnect_pin
(
dapm
,
pdata
->
has_aux
,
"Line Out"
);
twl6040_disconnect_pin
(
dapm
,
pdata
->
has_vibra
,
"Vi
n
rator"
);
twl6040_disconnect_pin
(
dapm
,
pdata
->
has_vibra
,
"Vi
b
rator"
);
twl6040_disconnect_pin
(
dapm
,
pdata
->
has_hsmic
,
"Headset Mic"
);
twl6040_disconnect_pin
(
dapm
,
pdata
->
has_mainmic
,
"Main Handset Mic"
);
twl6040_disconnect_pin
(
dapm
,
pdata
->
has_submic
,
"Sub Handset Mic"
);
...
...
sound/soc/omap/omap-mcpdm.c
View file @
68d114e1
...
...
@@ -40,7 +40,6 @@
#include <sound/pcm_params.h>
#include <sound/soc.h>
#include <plat/omap_hwmod.h>
#include "omap-mcpdm.h"
#include "omap-pcm.h"
...
...
@@ -258,13 +257,9 @@ static int omap_mcpdm_dai_startup(struct snd_pcm_substream *substream,
mutex_lock
(
&
mcpdm
->
mutex
);
if
(
!
dai
->
active
)
{
/* Enable watch dog for ES above ES 1.0 to avoid saturation */
if
(
omap_rev
()
!=
OMAP4430_REV_ES1_0
)
{
u32
ctrl
=
omap_mcpdm_read
(
mcpdm
,
MCPDM_REG_CTRL
);
u32
ctrl
=
omap_mcpdm_read
(
mcpdm
,
MCPDM_REG_CTRL
);
omap_mcpdm_write
(
mcpdm
,
MCPDM_REG_CTRL
,
ctrl
|
MCPDM_WD_EN
);
}
omap_mcpdm_write
(
mcpdm
,
MCPDM_REG_CTRL
,
ctrl
|
MCPDM_WD_EN
);
omap_mcpdm_open_streams
(
mcpdm
);
}
mutex_unlock
(
&
mcpdm
->
mutex
);
...
...
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