Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
facef868
Commit
facef868
authored
Dec 25, 2008
by
Takashi Iwai
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'topic/aoa' into to-push
parents
4a6908a3
888dcb7c
Changes
22
Hide whitespace changes
Inline
Side-by-side
Showing
22 changed files
with
30 additions
and
24 deletions
+30
-24
sound/aoa/codecs/Makefile
sound/aoa/codecs/Makefile
+4
-0
sound/aoa/codecs/onyx.c
sound/aoa/codecs/onyx.c
+6
-6
sound/aoa/codecs/onyx.h
sound/aoa/codecs/onyx.h
+0
-0
sound/aoa/codecs/tas-basstreble.h
sound/aoa/codecs/tas-basstreble.h
+0
-0
sound/aoa/codecs/tas-gain-table.h
sound/aoa/codecs/tas-gain-table.h
+0
-0
sound/aoa/codecs/tas.c
sound/aoa/codecs/tas.c
+4
-4
sound/aoa/codecs/tas.h
sound/aoa/codecs/tas.h
+0
-0
sound/aoa/codecs/toonie.c
sound/aoa/codecs/toonie.c
+1
-1
sound/aoa/core/Makefile
sound/aoa/core/Makefile
+4
-4
sound/aoa/core/alsa.c
sound/aoa/core/alsa.c
+2
-2
sound/aoa/core/alsa.h
sound/aoa/core/alsa.h
+0
-0
sound/aoa/core/core.c
sound/aoa/core/core.c
+1
-1
sound/aoa/core/gpio-feature.c
sound/aoa/core/gpio-feature.c
+1
-1
sound/aoa/core/gpio-pmf.c
sound/aoa/core/gpio-pmf.c
+0
-0
sound/aoa/fabrics/Makefile
sound/aoa/fabrics/Makefile
+2
-0
sound/aoa/fabrics/layout.c
sound/aoa/fabrics/layout.c
+1
-1
sound/aoa/soundbus/i2sbus/Makefile
sound/aoa/soundbus/i2sbus/Makefile
+1
-1
sound/aoa/soundbus/i2sbus/control.c
sound/aoa/soundbus/i2sbus/control.c
+0
-0
sound/aoa/soundbus/i2sbus/core.c
sound/aoa/soundbus/i2sbus/core.c
+2
-2
sound/aoa/soundbus/i2sbus/i2sbus.h
sound/aoa/soundbus/i2sbus/i2sbus.h
+1
-1
sound/aoa/soundbus/i2sbus/interface.h
sound/aoa/soundbus/i2sbus/interface.h
+0
-0
sound/aoa/soundbus/i2sbus/pcm.c
sound/aoa/soundbus/i2sbus/pcm.c
+0
-0
No files found.
sound/aoa/codecs/Makefile
View file @
facef868
snd-aoa-codec-onyx-objs
:=
onyx.o
snd-aoa-codec-tas-objs
:=
tas.o
snd-aoa-codec-toonie-objs
:=
toonie.o
obj-$(CONFIG_SND_AOA_ONYX)
+=
snd-aoa-codec-onyx.o
obj-$(CONFIG_SND_AOA_TAS)
+=
snd-aoa-codec-tas.o
obj-$(CONFIG_SND_AOA_TOONIE)
+=
snd-aoa-codec-toonie.o
sound/aoa/codecs/
snd-aoa-codec-
onyx.c
→
sound/aoa/codecs/onyx.c
View file @
facef868
...
...
@@ -37,7 +37,7 @@ MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
MODULE_LICENSE
(
"GPL"
);
MODULE_DESCRIPTION
(
"pcm3052 (onyx) codec driver for snd-aoa"
);
#include "
snd-aoa-codec-
onyx.h"
#include "onyx.h"
#include "../aoa.h"
#include "../soundbus/soundbus.h"
...
...
@@ -292,7 +292,7 @@ static int onyx_snd_capture_source_put(struct snd_kcontrol *kcontrol,
static
struct
snd_kcontrol_new
capture_source_control
=
{
.
iface
=
SNDRV_CTL_ELEM_IFACE_MIXER
,
/* If we name this 'Input Source', it properly shows up in
* alsamixer as a selection, * but it's shown under the
* alsamixer as a selection, * but it's shown under the
* 'Playback' category.
* If I name it 'Capture Source', it shows up in strange
* ways (two bools of which one can be selected at a
...
...
@@ -477,7 +477,7 @@ static int onyx_spdif_mask_get(struct snd_kcontrol *kcontrol,
ucontrol
->
value
.
iec958
.
status
[
3
]
=
0x3f
;
ucontrol
->
value
.
iec958
.
status
[
4
]
=
0x0f
;
return
0
;
}
...
...
@@ -682,7 +682,7 @@ static int onyx_usable(struct codec_info_item *cii,
onyx_read_register
(
onyx
,
ONYX_REG_DIG_INFO4
,
&
v
);
spdif_enabled
=
!!
(
v
&
ONYX_SPDIF_ENABLE
);
onyx_read_register
(
onyx
,
ONYX_REG_DAC_CONTROL
,
&
v
);
analog_enabled
=
analog_enabled
=
(
v
&
(
ONYX_MUTE_RIGHT
|
ONYX_MUTE_LEFT
))
!=
(
ONYX_MUTE_RIGHT
|
ONYX_MUTE_LEFT
);
mutex_unlock
(
&
onyx
->
mutex
);
...
...
@@ -882,7 +882,7 @@ static int onyx_init_codec(struct aoa_codec *codec)
msleep
(
1
);
onyx
->
codec
.
gpio
->
methods
->
set_hw_reset
(
onyx
->
codec
.
gpio
,
0
);
msleep
(
1
);
if
(
onyx_register_init
(
onyx
))
{
printk
(
KERN_ERR
PFX
"failed to initialise onyx registers
\n
"
);
return
-
ENODEV
;
...
...
@@ -1069,7 +1069,7 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter)
/* if that didn't work, try desperate mode for older
* machines that have stuff missing from the device tree */
if
(
!
of_device_is_compatible
(
busnode
,
"k2-i2c"
))
return
-
ENODEV
;
...
...
sound/aoa/codecs/
snd-aoa-codec-
onyx.h
→
sound/aoa/codecs/onyx.h
View file @
facef868
File moved
sound/aoa/codecs/
snd-aoa-codec-
tas-basstreble.h
→
sound/aoa/codecs/tas-basstreble.h
View file @
facef868
File moved
sound/aoa/codecs/
snd-aoa-codec-
tas-gain-table.h
→
sound/aoa/codecs/tas-gain-table.h
View file @
facef868
File moved
sound/aoa/codecs/
snd-aoa-codec-
tas.c
→
sound/aoa/codecs/tas.c
View file @
facef868
...
...
@@ -71,9 +71,9 @@ MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
MODULE_LICENSE
(
"GPL"
);
MODULE_DESCRIPTION
(
"tas codec driver for snd-aoa"
);
#include "
snd-aoa-codec-
tas.h"
#include "
snd-aoa-codec-
tas-gain-table.h"
#include "
snd-aoa-codec-
tas-basstreble.h"
#include "tas.h"
#include "tas-gain-table.h"
#include "tas-basstreble.h"
#include "../aoa.h"
#include "../soundbus/soundbus.h"
...
...
@@ -880,7 +880,7 @@ static void tas_exit_codec(struct aoa_codec *codec)
return
;
tas
->
codec
.
soundbus_dev
->
detach_codec
(
tas
->
codec
.
soundbus_dev
,
tas
);
}
static
struct
i2c_driver
tas_driver
;
...
...
sound/aoa/codecs/
snd-aoa-codec-
tas.h
→
sound/aoa/codecs/tas.h
View file @
facef868
File moved
sound/aoa/codecs/
snd-aoa-codec-
toonie.c
→
sound/aoa/codecs/toonie.c
View file @
facef868
...
...
@@ -131,7 +131,7 @@ static int __init toonie_init(void)
toonie
->
codec
.
owner
=
THIS_MODULE
;
toonie
->
codec
.
init
=
toonie_init_codec
;
toonie
->
codec
.
exit
=
toonie_exit_codec
;
if
(
aoa_codec_register
(
&
toonie
->
codec
))
{
kfree
(
toonie
);
return
-
EINVAL
;
...
...
sound/aoa/core/Makefile
View file @
facef868
obj-$(CONFIG_SND_AOA)
+=
snd-aoa.o
snd-aoa-objs
:=
snd-aoa-
core.o
\
snd-aoa-
alsa.o
\
snd-aoa-
gpio-pmf.o
\
snd-aoa-
gpio-feature.o
snd-aoa-objs
:=
core.o
\
alsa.o
\
gpio-pmf.o
\
gpio-feature.o
sound/aoa/core/
snd-aoa-
alsa.c
→
sound/aoa/core/alsa.c
View file @
facef868
...
...
@@ -6,7 +6,7 @@
* GPL v2, can be found in COPYING.
*/
#include <linux/module.h>
#include "
snd-aoa-
alsa.h"
#include "alsa.h"
static
int
index
=
-
1
;
module_param
(
index
,
int
,
0444
);
...
...
@@ -64,7 +64,7 @@ int aoa_snd_device_new(snd_device_type_t type,
{
struct
snd_card
*
card
=
aoa_get_card
();
int
err
;
if
(
!
card
)
return
-
ENOMEM
;
err
=
snd_device_new
(
card
,
type
,
device_data
,
ops
);
...
...
sound/aoa/core/
snd-aoa-
alsa.h
→
sound/aoa/core/alsa.h
View file @
facef868
File moved
sound/aoa/core/
snd-aoa-
core.c
→
sound/aoa/core/core.c
View file @
facef868
...
...
@@ -10,7 +10,7 @@
#include <linux/module.h>
#include <linux/list.h>
#include "../aoa.h"
#include "
snd-aoa-
alsa.h"
#include "alsa.h"
MODULE_DESCRIPTION
(
"Apple Onboard Audio Sound Driver"
);
MODULE_AUTHOR
(
"Johannes Berg <johannes@sipsolutions.net>"
);
...
...
sound/aoa/core/
snd-aoa-
gpio-feature.c
→
sound/aoa/core/gpio-feature.c
View file @
facef868
...
...
@@ -5,7 +5,7 @@
*
* GPL v2, can be found in COPYING.
*
* This file contains the GPIO control routines for
* This file contains the GPIO control routines for
* direct (through feature calls) access to the GPIO
* registers.
*/
...
...
sound/aoa/core/
snd-aoa-
gpio-pmf.c
→
sound/aoa/core/gpio-pmf.c
View file @
facef868
File moved
sound/aoa/fabrics/Makefile
View file @
facef868
snd-aoa-fabric-layout-objs
+=
layout.o
obj-$(CONFIG_SND_AOA_FABRIC_LAYOUT)
+=
snd-aoa-fabric-layout.o
sound/aoa/fabrics/
snd-aoa-fabric-
layout.c
→
sound/aoa/fabrics/layout.c
View file @
facef868
...
...
@@ -66,7 +66,7 @@ struct layout {
unsigned
int
layout_id
;
struct
codec_connect_info
codecs
[
MAX_CODECS_PER_BUS
];
int
flags
;
/* if busname is not assigned, we use 'Master' below,
* so that our layout table doesn't need to be filled
* too much.
...
...
sound/aoa/soundbus/i2sbus/Makefile
View file @
facef868
obj-$(CONFIG_SND_AOA_SOUNDBUS_I2S)
+=
snd-aoa-i2sbus.o
snd-aoa-i2sbus-objs
:=
i2sbus-core.o i2sbus-pcm.o i2sbus-
control.o
snd-aoa-i2sbus-objs
:=
core.o pcm.o
control.o
sound/aoa/soundbus/i2sbus/
i2sbus-
control.c
→
sound/aoa/soundbus/i2sbus/control.c
View file @
facef868
File moved
sound/aoa/soundbus/i2sbus/
i2sbus-
core.c
→
sound/aoa/soundbus/i2sbus/core.c
View file @
facef868
...
...
@@ -64,7 +64,7 @@ static void free_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev,
struct
dbdma_command_mem
*
r
)
{
if
(
!
r
->
space
)
return
;
dma_free_coherent
(
&
macio_get_pci_dev
(
i2sdev
->
macio
)
->
dev
,
r
->
size
,
r
->
space
,
r
->
bus_addr
);
}
...
...
@@ -247,7 +247,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
* but request_resource doesn't know about parents and
* contained resources...
*/
dev
->
allocated_resource
[
i
]
=
dev
->
allocated_resource
[
i
]
=
request_mem_region
(
dev
->
resources
[
i
].
start
,
dev
->
resources
[
i
].
end
-
dev
->
resources
[
i
].
start
+
1
,
...
...
sound/aoa/soundbus/i2sbus/i2sbus.h
View file @
facef868
...
...
@@ -18,7 +18,7 @@
#include <asm/pmac_feature.h>
#include <asm/dbdma.h>
#include "i
2sbus-i
nterface.h"
#include "interface.h"
#include "../soundbus.h"
struct
i2sbus_control
{
...
...
sound/aoa/soundbus/i2sbus/i
2sbus-i
nterface.h
→
sound/aoa/soundbus/i2sbus/interface.h
View file @
facef868
File moved
sound/aoa/soundbus/i2sbus/
i2sbus-
pcm.c
→
sound/aoa/soundbus/i2sbus/pcm.c
View file @
facef868
File moved
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