Commit facef868 authored by Takashi Iwai's avatar Takashi Iwai

Merge branch 'topic/aoa' into to-push

parents 4a6908a3 888dcb7c
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_ONYX) += snd-aoa-codec-onyx.o
obj-$(CONFIG_SND_AOA_TAS) += snd-aoa-codec-tas.o obj-$(CONFIG_SND_AOA_TAS) += snd-aoa-codec-tas.o
obj-$(CONFIG_SND_AOA_TOONIE) += snd-aoa-codec-toonie.o obj-$(CONFIG_SND_AOA_TOONIE) += snd-aoa-codec-toonie.o
...@@ -37,7 +37,7 @@ MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>"); ...@@ -37,7 +37,7 @@ MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("pcm3052 (onyx) codec driver for snd-aoa"); MODULE_DESCRIPTION("pcm3052 (onyx) codec driver for snd-aoa");
#include "snd-aoa-codec-onyx.h" #include "onyx.h"
#include "../aoa.h" #include "../aoa.h"
#include "../soundbus/soundbus.h" #include "../soundbus/soundbus.h"
...@@ -292,7 +292,7 @@ static int onyx_snd_capture_source_put(struct snd_kcontrol *kcontrol, ...@@ -292,7 +292,7 @@ static int onyx_snd_capture_source_put(struct snd_kcontrol *kcontrol,
static struct snd_kcontrol_new capture_source_control = { static struct snd_kcontrol_new capture_source_control = {
.iface = SNDRV_CTL_ELEM_IFACE_MIXER, .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
/* If we name this 'Input Source', it properly shows up in /* 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. * 'Playback' category.
* If I name it 'Capture Source', it shows up in strange * If I name it 'Capture Source', it shows up in strange
* ways (two bools of which one can be selected at a * 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, ...@@ -477,7 +477,7 @@ static int onyx_spdif_mask_get(struct snd_kcontrol *kcontrol,
ucontrol->value.iec958.status[3] = 0x3f; ucontrol->value.iec958.status[3] = 0x3f;
ucontrol->value.iec958.status[4] = 0x0f; ucontrol->value.iec958.status[4] = 0x0f;
return 0; return 0;
} }
...@@ -682,7 +682,7 @@ static int onyx_usable(struct codec_info_item *cii, ...@@ -682,7 +682,7 @@ static int onyx_usable(struct codec_info_item *cii,
onyx_read_register(onyx, ONYX_REG_DIG_INFO4, &v); onyx_read_register(onyx, ONYX_REG_DIG_INFO4, &v);
spdif_enabled = !!(v & ONYX_SPDIF_ENABLE); spdif_enabled = !!(v & ONYX_SPDIF_ENABLE);
onyx_read_register(onyx, ONYX_REG_DAC_CONTROL, &v); onyx_read_register(onyx, ONYX_REG_DAC_CONTROL, &v);
analog_enabled = analog_enabled =
(v & (ONYX_MUTE_RIGHT|ONYX_MUTE_LEFT)) (v & (ONYX_MUTE_RIGHT|ONYX_MUTE_LEFT))
!= (ONYX_MUTE_RIGHT|ONYX_MUTE_LEFT); != (ONYX_MUTE_RIGHT|ONYX_MUTE_LEFT);
mutex_unlock(&onyx->mutex); mutex_unlock(&onyx->mutex);
...@@ -882,7 +882,7 @@ static int onyx_init_codec(struct aoa_codec *codec) ...@@ -882,7 +882,7 @@ static int onyx_init_codec(struct aoa_codec *codec)
msleep(1); msleep(1);
onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 0); onyx->codec.gpio->methods->set_hw_reset(onyx->codec.gpio, 0);
msleep(1); msleep(1);
if (onyx_register_init(onyx)) { if (onyx_register_init(onyx)) {
printk(KERN_ERR PFX "failed to initialise onyx registers\n"); printk(KERN_ERR PFX "failed to initialise onyx registers\n");
return -ENODEV; return -ENODEV;
...@@ -1069,7 +1069,7 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter) ...@@ -1069,7 +1069,7 @@ static int onyx_i2c_attach(struct i2c_adapter *adapter)
/* if that didn't work, try desperate mode for older /* if that didn't work, try desperate mode for older
* machines that have stuff missing from the device tree */ * machines that have stuff missing from the device tree */
if (!of_device_is_compatible(busnode, "k2-i2c")) if (!of_device_is_compatible(busnode, "k2-i2c"))
return -ENODEV; return -ENODEV;
......
...@@ -71,9 +71,9 @@ MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>"); ...@@ -71,9 +71,9 @@ MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("tas codec driver for snd-aoa"); MODULE_DESCRIPTION("tas codec driver for snd-aoa");
#include "snd-aoa-codec-tas.h" #include "tas.h"
#include "snd-aoa-codec-tas-gain-table.h" #include "tas-gain-table.h"
#include "snd-aoa-codec-tas-basstreble.h" #include "tas-basstreble.h"
#include "../aoa.h" #include "../aoa.h"
#include "../soundbus/soundbus.h" #include "../soundbus/soundbus.h"
...@@ -880,7 +880,7 @@ static void tas_exit_codec(struct aoa_codec *codec) ...@@ -880,7 +880,7 @@ static void tas_exit_codec(struct aoa_codec *codec)
return; return;
tas->codec.soundbus_dev->detach_codec(tas->codec.soundbus_dev, tas); tas->codec.soundbus_dev->detach_codec(tas->codec.soundbus_dev, tas);
} }
static struct i2c_driver tas_driver; static struct i2c_driver tas_driver;
......
...@@ -131,7 +131,7 @@ static int __init toonie_init(void) ...@@ -131,7 +131,7 @@ static int __init toonie_init(void)
toonie->codec.owner = THIS_MODULE; toonie->codec.owner = THIS_MODULE;
toonie->codec.init = toonie_init_codec; toonie->codec.init = toonie_init_codec;
toonie->codec.exit = toonie_exit_codec; toonie->codec.exit = toonie_exit_codec;
if (aoa_codec_register(&toonie->codec)) { if (aoa_codec_register(&toonie->codec)) {
kfree(toonie); kfree(toonie);
return -EINVAL; return -EINVAL;
......
obj-$(CONFIG_SND_AOA) += snd-aoa.o obj-$(CONFIG_SND_AOA) += snd-aoa.o
snd-aoa-objs := snd-aoa-core.o \ snd-aoa-objs := core.o \
snd-aoa-alsa.o \ alsa.o \
snd-aoa-gpio-pmf.o \ gpio-pmf.o \
snd-aoa-gpio-feature.o gpio-feature.o
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
* GPL v2, can be found in COPYING. * GPL v2, can be found in COPYING.
*/ */
#include <linux/module.h> #include <linux/module.h>
#include "snd-aoa-alsa.h" #include "alsa.h"
static int index = -1; static int index = -1;
module_param(index, int, 0444); module_param(index, int, 0444);
...@@ -64,7 +64,7 @@ int aoa_snd_device_new(snd_device_type_t type, ...@@ -64,7 +64,7 @@ int aoa_snd_device_new(snd_device_type_t type,
{ {
struct snd_card *card = aoa_get_card(); struct snd_card *card = aoa_get_card();
int err; int err;
if (!card) return -ENOMEM; if (!card) return -ENOMEM;
err = snd_device_new(card, type, device_data, ops); err = snd_device_new(card, type, device_data, ops);
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/list.h> #include <linux/list.h>
#include "../aoa.h" #include "../aoa.h"
#include "snd-aoa-alsa.h" #include "alsa.h"
MODULE_DESCRIPTION("Apple Onboard Audio Sound Driver"); MODULE_DESCRIPTION("Apple Onboard Audio Sound Driver");
MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>"); MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* GPL v2, can be found in COPYING. * 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 * direct (through feature calls) access to the GPIO
* registers. * registers.
*/ */
......
snd-aoa-fabric-layout-objs += layout.o
obj-$(CONFIG_SND_AOA_FABRIC_LAYOUT) += snd-aoa-fabric-layout.o obj-$(CONFIG_SND_AOA_FABRIC_LAYOUT) += snd-aoa-fabric-layout.o
...@@ -66,7 +66,7 @@ struct layout { ...@@ -66,7 +66,7 @@ struct layout {
unsigned int layout_id; unsigned int layout_id;
struct codec_connect_info codecs[MAX_CODECS_PER_BUS]; struct codec_connect_info codecs[MAX_CODECS_PER_BUS];
int flags; int flags;
/* if busname is not assigned, we use 'Master' below, /* if busname is not assigned, we use 'Master' below,
* so that our layout table doesn't need to be filled * so that our layout table doesn't need to be filled
* too much. * too much.
......
obj-$(CONFIG_SND_AOA_SOUNDBUS_I2S) += snd-aoa-i2sbus.o 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
...@@ -64,7 +64,7 @@ static void free_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev, ...@@ -64,7 +64,7 @@ static void free_dbdma_descriptor_ring(struct i2sbus_dev *i2sdev,
struct dbdma_command_mem *r) struct dbdma_command_mem *r)
{ {
if (!r->space) return; if (!r->space) return;
dma_free_coherent(&macio_get_pci_dev(i2sdev->macio)->dev, dma_free_coherent(&macio_get_pci_dev(i2sdev->macio)->dev,
r->size, r->space, r->bus_addr); r->size, r->space, r->bus_addr);
} }
...@@ -247,7 +247,7 @@ static int i2sbus_add_dev(struct macio_dev *macio, ...@@ -247,7 +247,7 @@ static int i2sbus_add_dev(struct macio_dev *macio,
* but request_resource doesn't know about parents and * but request_resource doesn't know about parents and
* contained resources... * contained resources...
*/ */
dev->allocated_resource[i] = dev->allocated_resource[i] =
request_mem_region(dev->resources[i].start, request_mem_region(dev->resources[i].start,
dev->resources[i].end - dev->resources[i].end -
dev->resources[i].start + 1, dev->resources[i].start + 1,
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
#include <asm/pmac_feature.h> #include <asm/pmac_feature.h>
#include <asm/dbdma.h> #include <asm/dbdma.h>
#include "i2sbus-interface.h" #include "interface.h"
#include "../soundbus.h" #include "../soundbus.h"
struct i2sbus_control { struct i2sbus_control {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment